调试bug修改

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

@@ -587,7 +587,7 @@ public class EventAnalysisController {
      * @author lkg
      * @date 2024/4/12
      */
-    @GetMapping("/countryPolicy")
+    /*@GetMapping("/countryPolicy")
     public Result<?> countryPolicy(@RequestParam String eventId,
                                    @RequestParam(required = false) String startTime,
                                    @RequestParam(required = false) String endTime,
@@ -601,7 +601,7 @@ public class EventAnalysisController {
         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));
-    }
+    }*/
 
     /**
      * 类似事件

src/main/java/com/zzsn/event/enums/AnalysisColumnEnum.java

@@ -27,7 +27,7 @@ public enum AnalysisColumnEnum {
 
     ENTERPRISE_CASE(8, "企业案例", "array", 1),
 
-    COUNTRY_POLICY(9, "各国政策", "array", 1),
+    //COUNTRY_POLICY(9, "各国政策", "array", 1),
 
     DOMESTIC_SIMILAR_EVENT(10, "中国类似事件", "array", 1),
 

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

@@ -321,7 +321,7 @@ public class AnalysisServiceImpl implements AnalysisService {
                 result = result.substring(7, result.length() - 3);
             } else if (result.startsWith("```")) {
                 result = result.substring(3, result.length() - 3);
-            } else {
+            } else if (result.contains(startHeader)){
                 result = result.substring(result.indexOf(startHeader));
             }
         }
@@ -384,26 +384,33 @@ public class AnalysisServiceImpl implements AnalysisService {
         //    log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.EVENT_CONTEXT.getName());
         //}
         //关键词趋势分析
-        List<CountVO> wordTrend = this.wordTrend(eventId, null, null);
-        if (CollectionUtils.isNotEmpty(wordTrend)) {
-            EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.KEYWORD_TREND, JSON.toJSONString(wordTrend));
-            eventAnalysisVersionRecordService.save(record);
-            log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.KEYWORD_TREND.getName());
-        }
-        //关键词共现关系
-        List<CoOccurrenceVO> coOccurrenceVOS = this.coOccurrence(eventId, null, null);
-        if (CollectionUtils.isNotEmpty(coOccurrenceVOS)) {
-            EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.CO_OCCURRENCE, JSON.toJSONString(coOccurrenceVOS));
-            eventAnalysisVersionRecordService.save(record);
-            log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.CO_OCCURRENCE.getName());
+        int count = esService.count(eventId, null, null);
+        if (count > 0) {
+            List<CountVO> wordTrend = this.wordTrend(eventId, null, null);
+            if (CollectionUtils.isNotEmpty(wordTrend)) {
+                EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.KEYWORD_TREND, JSON.toJSONString(wordTrend));
+                eventAnalysisVersionRecordService.save(record);
+                log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.KEYWORD_TREND.getName());
+            }
+            //关键词共现关系
+            List<CoOccurrenceVO> coOccurrenceVOS = this.coOccurrence(eventId, null, null);
+            if (CollectionUtils.isNotEmpty(coOccurrenceVOS)) {
+                EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.CO_OCCURRENCE, JSON.toJSONString(coOccurrenceVOS));
+                eventAnalysisVersionRecordService.save(record);
+                log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.CO_OCCURRENCE.getName());
+            }
         }
         //大模型相关逻辑生成的结果(影响评估,举措建议等)
         List<EventLlmConfig> collect = configList.stream().filter(e -> !e.getColumnCode().equals(AnalysisColumnEnum.CORE_SUMMARY.getCode())).collect(Collectors.toList());
         for (EventLlmConfig config : collect) {
-            String llmResult = this.llmResult(eventName,content, null, null, config);
-            EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, Objects.requireNonNull(AnalysisColumnEnum.getByCode(config.getColumnCode())), llmResult);
-            eventAnalysisVersionRecordService.save(record);
-            log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, config.getColumnName());
+            try {
+                String llmResult = this.llmResult(eventName,content, null, null, config);
+                EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, Objects.requireNonNull(AnalysisColumnEnum.getByCode(config.getColumnCode())), llmResult);
+                eventAnalysisVersionRecordService.save(record);
+                log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, config.getColumnName());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         log.info("{}-事件分析重新生成逻辑完成。", eventName);
     }