重新生成逻辑优化

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zzsn.event.constant.Constants;
 import com.zzsn.event.constant.Result;
 import com.zzsn.event.entity.*;
 import com.zzsn.event.enums.AnalysisColumnEnum;
@@ -173,17 +172,19 @@ public class EventManageController {
             //新增关键词
             keyWordsService.saveBaseAndMap(event, keywordsVO.getKeyword(), keywordsVO.getExclusionWord());
             CompletableFuture.runAsync(() -> {
-                //插入xxlJob
-                log.info("新增事件，插入xxlJob，事件id：{}", event.getId());
-                iXxlJobInfoService.eventInsert(event);
-                //通知采集
-                log.info("新增事件，通知采集，事件id：{}", event.getId());
-                configurationMessageService.bindKeyWordsEventSend(event.getId());
-                //事件分析
-                log.info("新增事件，事件分析，事件id：{}", event.getId());
-                kafkaTemplate.send(EVENT_MODEL_KAFKA_CHANNEL, event.getEventCode());
-            });
-            CompletableFuture.runAsync(() -> {
+                try {
+                    //插入xxlJob
+                    log.info("新增事件，插入xxlJob，事件id：{}", event.getId());
+                    iXxlJobInfoService.eventInsert(event);
+                    //通知采集
+                    log.info("新增事件，通知采集，事件id：{}", event.getId());
+                    configurationMessageService.bindKeyWordsEventSend(event.getId());
+                    //事件分析
+                    log.info("新增事件，事件分析，事件id：{}", event.getId());
+                    kafkaTemplate.send(EVENT_MODEL_KAFKA_CHANNEL, event.getEventCode());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 //立马执行一次事件分析
                 analysisService.regenerate(event.getId());
             });

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

@@ -24,12 +24,10 @@ import com.zzsn.event.util.ppt.ProgressResponse;
 import com.zzsn.event.vo.*;
 import com.zzsn.event.vo.es.SpecialInformation;
 import lombok.extern.slf4j.Slf4j;
-import net.bytebuddy.implementation.bytecode.Throw;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -353,7 +351,6 @@ public class AnalysisServiceImpl implements AnalysisService {
     @Override
     public void regenerate(String eventId) {
         List<EventLlmConfig> configList = eventLlmConfigService.getConfigList(eventId);
-        List<EventAnalysisVersionRecord> records = new ArrayList<>();
         String today = DateUtil.dateToString(new Date());
         //保存版本信息
         String versionId = saveVersion(eventId, today);
@@ -377,7 +374,7 @@ public class AnalysisServiceImpl implements AnalysisService {
             }
         }
         EventAnalysisVersionRecord coreSummaryRecord = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.CORE_SUMMARY, eventDescribe);
-        records.add(coreSummaryRecord);
+        eventAnalysisVersionRecordService.save(coreSummaryRecord);
         log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.CORE_SUMMARY.getName());
         //事件脉络
         //List<Map<String, Object>> eventContext = eventContextService.eventContext(eventId);
@@ -390,14 +387,14 @@ public class AnalysisServiceImpl implements AnalysisService {
         List<CountVO> wordTrend = this.wordTrend(eventId, null, null);
         if (CollectionUtils.isNotEmpty(wordTrend)) {
             EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.KEYWORD_TREND, JSON.toJSONString(wordTrend));
-            records.add(record);
+            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));
-            records.add(record);
+            eventAnalysisVersionRecordService.save(record);
             log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.CO_OCCURRENCE.getName());
         }
         //大模型相关逻辑生成的结果(影响评估,举措建议等)
@@ -405,11 +402,9 @@ public class AnalysisServiceImpl implements AnalysisService {
         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);
-            records.add(record);
+            eventAnalysisVersionRecordService.save(record);
             log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, config.getColumnName());
         }
-        //保存版本记录信息
-        eventAnalysisVersionRecordService.saveBatch(records);
         log.info("{}-事件分析重新生成逻辑完成。", eventName);
     }