Merge branch 'feature/1020-tencent-im' into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.google.common.collect.Lists;
+import com.microsvc.toolkit.middleware.common.http.DateUtil;
 import com.microsvc.toolkit.middleware.common.http.ImageUtil;
 import com.microsvc.toolkit.middleware.im.ImPluginContext;
 import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
@@ -1770,6 +1771,18 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         if (CollectionUtils.isEmpty(rows)) {
             return pageInfo;
         }
+
+        for (HistoryMessageTencentWrapper.HistoryMessageTencent row : rows) {
+            // 时间戳 转换
+            Long msgTime = row.getMsgTimestamp();
+            if (msgTime != null) {
+                String dateTime = String.valueOf(msgTime);
+                if (dateTime.length() == 10) {
+                    dateTime = dateTime + "000";
+                }
+                row.setMsgTime(Long.parseLong(DateUtil.format(new Date(Long.parseLong(dateTime)), "yyyyMMddHH")));
+            }
+        }
         // 发送人信息
         List<Integer> fromAccountList = rows.stream()
             .map(HistoryMessageTencentWrapper.HistoryMessageTencent::getFromAccount)

mec-common/audit-log/src/main/java/com/yonge/log/service/impl/HistoryMessageTenantServiceImpl.java

@@ -143,7 +143,7 @@ public class HistoryMessageTenantServiceImpl extends BaseServiceImplWithMongo<St
 
 
         query.addCriteria(criteria);
-        query.with(Sort.by(Sort.Order.asc("msg_timestamp"))); // 以升序方式按字段排序
+        query.with(Sort.by(Sort.Order.desc("msg_timestamp"))); // 以升序方式按字段排序
 
         return query;
     }