调试bug修改

src/main/java/com/zzsn/event/controller/EventMaintenanceController.java

@@ -3,7 +3,6 @@ package com.zzsn.event.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.event.constant.Result;
 import com.zzsn.event.entity.Event;
 import com.zzsn.event.entity.EventContext;
@@ -13,8 +12,6 @@ import com.zzsn.event.vo.EventContextModifyVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 事件相关分析维护
  *

src/main/java/com/zzsn/event/kafka/KafkaConsumer.java

@@ -80,7 +80,6 @@ public class KafkaConsumer {
                     eventContext.setEventId(eventId);
                     eventContext.setParentId(keyNodeId);
                     eventContext.setSortNumber(maxSortNumber + i);
-                    eventContext.setCreateWay(2);
                 }
                 eventContextService.saveBatch(eventContextList);
             }

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

@@ -31,7 +31,7 @@ public class EventContextServiceImpl extends ServiceImpl<EventContextMapper, Eve
     public List<Map<String, Object>> eventContext(String eventId) {
         List<Map<String, Object>> dataList = new ArrayList<>();
         LambdaQueryWrapper<EventContext> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.orderByDesc(EventContext::getSortNumber);
+        queryWrapper.eq(EventContext::getEventId, eventId).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());
@@ -56,11 +56,13 @@ public class EventContextServiceImpl extends ServiceImpl<EventContextMapper, Eve
         Integer maxSortNumber = this.getMaxSortNumber(eventId);
         if (keyNode != null) {
             String id = keyNode.getId();
+            keyNode.setCreateWay(2);
             if (StringUtils.isEmpty(id)) {
                 maxSortNumber = maxSortNumber + 1;
                 keyNode.setSortNumber(maxSortNumber);
                 keyNode.setParentId("0");
                 keyNode.setEventId(eventId);
+                keyNode.setYnKeyNode(1);
                 baseMapper.insert(keyNode);
                 parentId = keyNode.getId();
             } else {
@@ -69,18 +71,20 @@ public class EventContextServiceImpl extends ServiceImpl<EventContextMapper, Eve
         }
         List<EventContext> saveList = eventContextModifyVO.getSaveList();
         if (CollectionUtils.isNotEmpty(saveList)) {
-            for (int i = 1; i <= saveList.size(); i++) {
+            for (int i = 0; i < saveList.size(); i++) {
                 EventContext eventContext = saveList.get(i);
                 if (parentId != null) {
                     eventContext.setParentId(parentId);
                 }
+                eventContext.setCreateWay(2);
                 eventContext.setEventId(eventId);
-                eventContext.setSortNumber(maxSortNumber + i);
+                eventContext.setSortNumber(maxSortNumber + i + 1);
             }
             this.saveBatch(saveList);
         }
         List<EventContext> updateList = eventContextModifyVO.getUpdateList();
         if (CollectionUtils.isNotEmpty(updateList)) {
+            updateList.forEach(e->e.setCreateWay(2));
             this.updateBatchById(updateList);
         }
     }

src/main/java/com/zzsn/event/task/AnalysisTask.java

 package com.zzsn.event.task;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;