fix

mec-application/src/main/java/com/ym/mec/web/controller/ImHistoryMessageController.java

@@ -75,7 +75,7 @@ public class ImHistoryMessageController extends BaseController {
     public void imToTencent() throws Exception {
 
         // 删除旧数据
-        historyMessageTenantService.deleteOld();
+//        historyMessageTenantService.deleteOld();
 
         com.yonge.mongodb.PageInfo<HistoryMessage> info;
 //        historyMessageService.updateAllStatus(0);
@@ -88,7 +88,7 @@ public class ImHistoryMessageController extends BaseController {
             int size =100;
             //获取融云消息
             //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
-            info = historyMessageService.getImToTencent(i,size);
+            info = historyMessageService.getImToTencent(1,size);
             List<HistoryMessage> footer = info.getRows();
             if (CollectionUtils.isEmpty(footer)) {
                 break;

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

@@ -1316,6 +1316,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         imPluginContext.getPluginService().importPrivateMessage(privateImportMessage);
                         //为已导入数据更改标识
                         updateStatus(i,1);
+                        log.info("导入私聊消息成功：{}", i);
                     } catch (Exception e) {
                         updateStatus(i,2);
                         log.error("导入私聊IM消息失败 msg:{},entity:{}", list, i, e);
@@ -1392,11 +1393,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         imPluginContext.getPluginService().importGroupMessage(groupImportMessage);
                         //为已导入数据更改标识
                         updateStatus(i,1);
+                        log.info("导入消息成功：{}", i);
                     } catch (Exception e) {
                         updateStatus(i,2);
                         log.error("导入群组IM消息失败 msg:{},entity:{}", list, i, e);
                     }
-                    log.info("导入消息成功：{}", i);
                 }
             }catch (Exception e) {
                 log.error("导入消息失败:", e);
@@ -1432,14 +1433,22 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 tencent.setGroupId(historyMessage.getGroupId());
                 bodyList = getGroupMessage(historyMessage,jsonObject);
             } else {
+
+                historyMessage.setSyncFlag(1);
+                historyMessageService.updateSyncFlag(historyMessage.getMsgUID(),1);
                 continue;
             }
 
             if (CollectionUtils.isEmpty(bodyList)) {
+
+                historyMessage.setSyncFlag(1);
+                historyMessageService.updateSyncFlag(historyMessage.getMsgUID(),1);
                 continue;
             }
             bodyList = bodyList.stream().filter(Objects::nonNull).collect(Collectors.toList());
             if (CollectionUtils.isEmpty(bodyList)) {
+                historyMessage.setSyncFlag(1);
+                historyMessageService.updateSyncFlag(historyMessage.getMsgUID(),1);
                 continue;
             }
             // 发送人

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

@@ -78,7 +78,7 @@ public class HistoryMessageTenantServiceImpl extends BaseServiceImplWithMongo<St
     @Override
     public int initMsgBodyJsonCount() {
         Query query = new Query();
-        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("syncFlag").is(null));
+        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("json_flag").is(null));
         query.addCriteria(criteria);
         return Long.valueOf(mongoTemplate.count(query,HistoryMessageTencent.class)).intValue();
     }
@@ -86,7 +86,7 @@ public class HistoryMessageTenantServiceImpl extends BaseServiceImplWithMongo<St
     @Override
     public void initMsgBodyJson(int page, int size) {
         Query query = new Query();
-        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("syncFlag").is(null));
+        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("json_flag").is(null));
         query.addCriteria(criteria);
         query.skip(page).limit(size);
         List<HistoryMessageTencent> historyMessageTencents = mongoTemplate.find(query, HistoryMessageTencent.class);

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -749,7 +749,7 @@ public class RoomServiceImpl implements RoomService {
         }
 
         //记录用户实际选择的房间
-        String roomId = "";
+        String roomId = courseSchedule.getId().toString();
         if (courseSchedule.getGroupType() == GroupType.COMM) {
             roomId = "I" + roomId;
         } else {