合并分支 'event_fusion_dev' 到 'event_fusion'

【事件分析】-企业案例增加标记功能bug修改

查看合并请求 !23

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

@@ -454,6 +454,7 @@ public class AnalysisServiceImpl implements AnalysisService {
         //额外的输入参数
         Map<Integer,String> extraContentParams = new HashMap<>();
         for (EventLlmConfig config : collect) {
+            String realContent = content;
             try {
                 Integer columnCode = config.getColumnCode();
                 AnalysisColumnEnum analysisColumnEnum = AnalysisColumnEnum.getByCode(columnCode);
@@ -463,10 +464,10 @@ public class AnalysisServiceImpl implements AnalysisService {
                 //应对建议需要把 驱动因素和影响评估作为输入
                 if (Objects.equals(columnCode, AnalysisColumnEnum.MEASURE_SUGGEST.getCode())) {
                     if (extraContentParams.containsKey(AnalysisColumnEnum.IMPACT_ASSESSMENT.getCode())) {
-                        content += "\n影响评估:" + extraContentParams.get(AnalysisColumnEnum.IMPACT_ASSESSMENT.getCode());
+                        realContent += "\n影响评估:" + extraContentParams.get(AnalysisColumnEnum.IMPACT_ASSESSMENT.getCode());
                     }
                     if (extraContentParams.containsKey(AnalysisColumnEnum.DRIVING_FACTORS.getCode())) {
-                        content += "\n驱动因素:" + extraContentParams.get(AnalysisColumnEnum.DRIVING_FACTORS.getCode());
+                        realContent += "\n驱动因素:" + extraContentParams.get(AnalysisColumnEnum.DRIVING_FACTORS.getCode());
                     }
                 }
                 boolean webSearch = true;
@@ -474,10 +475,10 @@ public class AnalysisServiceImpl implements AnalysisService {
                     webSearch = false;
                     List<SpecialInformation> informationList = modelAnalysisInformationList(eventId, eventName);
                     if (CollectionUtils.isNotEmpty(informationList)) {
-                        content += "\n参考资讯:" + JSON.toJSONString(informationList);
+                        realContent += "\n参考资讯:" + JSON.toJSONString(informationList);
                     }
                 }
-                String llmResult = this.llmResult(event,content, webSearch,null, null, config,extraContentParams);
+                String llmResult = this.llmResult(event,realContent, webSearch,null, null, config,extraContentParams);
                 eventAnalysisVersionRecordService.modify(versionId, analysisColumnEnum, llmResult);
                 log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, config.getColumnName());
             } catch (Exception e) {
@@ -509,6 +510,7 @@ public class AnalysisServiceImpl implements AnalysisService {
         searchCondition.setFetchFields(fetchFields);
         searchCondition.setSubjectId(eventId);
         searchCondition.setCategory(2);
+        //企业资讯标签
         searchCondition.setComposeSearchLabelIds("1947596156752150530");
         searchCondition.setPageSize(50);
         for (int i = 1; ; i++) {