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

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -63,7 +64,6 @@ public class ImHistoryMessageController extends BaseController {
         executor.execute(() -> {
 
             // 100个线程的无界线程池
-            ExecutorService executorService = Executors.newFixedThreadPool(100);
             com.yonge.mongodb.PageInfo<HistoryMessage> info;
 //        historyMessageService.updateAllStatus(0);
             //计算总数据量
@@ -84,37 +84,12 @@ public class ImHistoryMessageController extends BaseController {
                 try {
                     // 过滤 groupId为空的
                     footer = footer.stream().filter(o -> StringUtils.isNotBlank(o.getGroupId())).collect(Collectors.toList());
-                    // 根据 groupId 分组
-                    Map<String, List<HistoryMessage>> map = footer.stream().collect(Collectors.groupingBy(HistoryMessage::getGroupId));
-
-                    List<Future<?>> list = new ArrayList<>();
-                    for (Map.Entry<String, List<HistoryMessage>> entry : map.entrySet()) {
-                        String k = entry.getKey();
-                        List<HistoryMessage> v = entry.getValue();
-
-                        list.add(executorService.submit(() -> {
-                            try {
-                                imGroupService.importInfo(v);
-                            } catch (Exception e) {
-
-                                log.error("群聊导入失败",e);
-                            }
-
-                        }));
-                    }
-                    for (Future<?> future : list) {
-                        try {
-                            future.get();
-                        } catch (Exception e){
-                            log.error("群聊导入失败",e);
-                        }
-                    }
+                    imGroupService.importInfo(footer);
                 } catch (Exception e) {
                     log.error("IM导入失败",e);
                 }
                 log.info("已导入：" + (i + 1) * size);
             }
-            executorService.shutdown();
         });
     }
 

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

@@ -1448,7 +1448,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     privateImportMessage.setTencentMessageBody(list);
                     privateImportMessage.setCloudCustomData(jsonObject.getString("extra"));
 
-                    log.info("导入私聊消息：{}", JSON.toJSONString(privateImportMessage));
+//                    log.info("导入私聊消息：{}", JSON.toJSONString(privateImportMessage));
                     try {
                         imPluginContext.getPluginService().importPrivateMessage(privateImportMessage);
                         //为已导入数据更改标识
@@ -1457,7 +1457,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         log.info("导入私聊消息成功");
                     } catch (Exception e) {
                         updateStatus(i,2);
-                        log.error("导入私聊IM消息失败 msg:{},entity:{}", list, i, e);
+                        log.error("导入私聊IM消息失败 msg:{},entity:{}", JSON.toJSONString(privateImportMessage), i, e);
                     }
                 } else if (type == 3) {
                     //群组会话
@@ -1483,7 +1483,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
                     data1.setFromAccount(imUserId);
                     //设置随机数
-                    data1.setRandom(new Random().nextInt());
+                    data1.setRandom(Math.abs(new Random().nextInt()));
                     //设置发送时间
 
                     String time = i.getDateTime();
@@ -1526,7 +1526,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     list.add(data1);
                     //导入消息列表
                     groupImportMessage.setMsgList(list);
-                    log.info("导入群聊消息：{}", JSON.toJSONString(groupImportMessage));
+//                    log.info("导入群聊消息：{}", JSON.toJSONString(groupImportMessage));
                     try {
                         imPluginContext.getPluginService().importGroupMessage(groupImportMessage);
                         //为已导入数据更改标识
@@ -1534,7 +1534,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         log.info("导入消息成功");
                     } catch (Exception e) {
                         updateStatus(i,2);
-                        log.error("导入群组IM消息失败 msg:{},entity:{}", list, i, e);
+                        log.error("导入群组IM消息失败 msg:{},entity:{}", JSON.toJSONString(groupImportMessage), i, e);
                     }
                 }
             }catch (Exception e) {