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