事件分析-脉络排序规则优化

src/main/java/com/zzsn/event/service/impl/EventContextServiceImpl.java

 package com.zzsn.event.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,10 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ConcurrentModel;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -41,7 +39,17 @@ public class EventContextServiceImpl extends ServiceImpl<EventContextMapper, Eve
                 .orderByDesc(EventContext::getSortNumber);
         List<EventContext> eventContexts = baseMapper.selectList(queryWrapper);
         if (CollectionUtils.isNotEmpty(eventContexts)) {
-            List<EventContext> keyNodeList = eventContexts.stream().filter(eventContext -> eventContext.getYnKeyNode() == 1).collect(Collectors.toList());
+            List<EventContext> keyNodeList = eventContexts.stream()
+                    .filter(eventContext -> eventContext.getYnKeyNode() == 1).collect(Collectors.toList());
+            keyNodeList.sort((p1,p2) ->{
+                String publishDate = p1.getPublishDate();
+                String publishDate2 = p2.getPublishDate();
+                int compare = DateUtil.parse(publishDate2).compareTo(DateUtil.parse(publishDate));
+                if (compare != 0) {
+                    return compare;
+                }
+                return p2.getSortNumber() - p1.getSortNumber();
+            });
             for (EventContext eventContext : keyNodeList) {
                 Map<String,Object> map = new HashMap<>();
                 List<EventContext> childList = eventContexts.stream().filter(e -> e.getParentId().equals(eventContext.getId())).collect(Collectors.toList());