liujc 1 年之前
父節點
當前提交
a821a48f19

+ 2 - 1
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;
@@ -85,7 +86,7 @@ public class ImHistoryMessageController extends BaseController {
                     // 过滤 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));
+                    Map<String, List<HistoryMessage>> map = footer.stream().collect(Collectors.groupingBy(HistoryMessage::getGroupId, LinkedHashMap::new, Collectors.toList()));
 
                     List<Future<?>> list = new ArrayList<>();
                     for (Map.Entry<String, List<HistoryMessage>> entry : map.entrySet()) {

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

@@ -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();