调试bug修改

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

@@ -440,8 +440,10 @@ public class EventAnalysisController {
                                       @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.IMPACT_ASSESSMENT.getCode());
         //String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.IMPACT_ASSESSMENT.getCode());
         return Result.OK(JSON.parseArray(versionData,JSONObject.class));
@@ -463,8 +465,10 @@ public class EventAnalysisController {
                                     @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.MEASURE_SUGGEST.getCode());
         //String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.MEASURE_SUGGEST.getCode());
         return Result.OK(JSON.parseArray(versionData,JSONObject.class));
@@ -486,8 +490,10 @@ public class EventAnalysisController {
                                     @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.KNOWLEDGE_ENTRY.getCode());
         //String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.KNOWLEDGE_ENTRY.getCode());
         return Result.OK(JSON.parseArray(versionData,JSONObject.class));
@@ -509,8 +515,10 @@ public class EventAnalysisController {
                                     @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.ENTERPRISE_CASE.getCode());
         //String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.ENTERPRISE_CASE.getCode());
         return Result.OK(JSON.parseArray(versionData,JSONObject.class));
@@ -532,8 +540,10 @@ public class EventAnalysisController {
                                    @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.COUNTRY_POLICY.getCode());
         //String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.COUNTRY_POLICY.getCode());
         return Result.OK(JSON.parseArray(versionData,JSONObject.class));
@@ -555,8 +565,10 @@ public class EventAnalysisController {
                                           @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         List<Map<String,Object>> dataList = new ArrayList<>();
         Map<String,Object> domestic = new HashMap<>();
         String domesticSimilarEvent = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.DOMESTIC_SIMILAR_EVENT.getCode());
@@ -587,8 +599,10 @@ public class EventAnalysisController {
                                           @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.DOMESTIC_SIMILAR_EVENT.getCode());
         //String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.DOMESTIC_SIMILAR_EVENT.getCode());
         return Result.OK(JSON.parseArray(versionData,JSONObject.class));
@@ -610,8 +624,10 @@ public class EventAnalysisController {
                                          @RequestParam(required = false) String versionId) {
         if (StringUtils.isEmpty(versionId)) {
             EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
+            if (eventAnalysisVersion != null) {
                 versionId = eventAnalysisVersion.getId();
             }
+        }
         String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.FOREIGN_SIMILAR_EVENT.getCode());
         //String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.FOREIGN_SIMILAR_EVENT.getCode());
         return Result.OK(JSON.parseArray(versionData,JSONObject.class));

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

@@ -65,14 +65,20 @@ public class KafkaConsumer {
             }
             List<EventContext> eventContextList = contextKafkaVO.getRelatedArticles();
             if (CollectionUtils.isNotEmpty(eventContextList)) {
-                for (int i = 1; i <= eventContextList.size(); i++) {
+                for (int i = 0; i < eventContextList.size(); i++) {
                     EventContext eventContext = eventContextList.get(i);
+                    LambdaQueryWrapper<EventContext> query = Wrappers.lambdaQuery();
+                    query.eq(EventContext::getEventId, eventId).eq(EventContext::getArticleId, eventContext.getArticleId());
+                    int count = eventContextService.count(query);
+                    if (count == 0) {
                         eventContext.setEventId(eventId);
                         eventContext.setParentId(keyNodeId);
-                    eventContext.setSortNumber(maxSortNumber + i);
+                        eventContext.setSortNumber(maxSortNumber + i + 1);
+                    }
                 }
                 eventContextService.saveBatch(eventContextList);
             }
         }
+        log.info("事件-{}，本次事件脉络更新完成",eventContextKafkaList.get(0).getEventId());
     }
 }

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

@@ -148,7 +148,7 @@ public class AnalysisServiceImpl implements AnalysisService {
         Event event = eventService.getById(eventId);
         Date beginTime = event.getStartTime();
         if (StringUtils.isNotEmpty(startTime)) {
-            beginTime = DateUtil.stringToDate(startTime, "yyyy-mm-dd HH:mm:ss");
+            beginTime = DateUtil.stringToDate(startTime, "yyyy-MM-dd HH:mm:ss");
         }
         Date finishTime;
         if (StringUtils.isEmpty(endTime)) {
@@ -157,7 +157,7 @@ public class AnalysisServiceImpl implements AnalysisService {
                 finishTime = new Date();
             }
         } else {
-            finishTime = DateUtil.stringToDate(endTime, "yyyy-mm-dd HH:mm:ss");
+            finishTime = DateUtil.stringToDate(endTime, "yyyy-MM-dd HH:mm:ss");
         }
         long between = DateUtil.betweenTwoDate(beginTime, finishTime);
         String groupType;

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

@@ -99,6 +99,7 @@ public class EventLlmConfigServiceImpl extends ServiceImpl<EventLlmConfigMapper,
                 config.setEventId(eventId);
                 config.setYnDefault(0);
             }
+            eventLlmConfig.setYnDefault(0);
             collect.add(eventLlmConfig);
             this.saveBatch(collect);
         } else {