Skip to content

E
event
提交 52a1d494 作者: 925993793@qq.com
操作

提示词编辑bug修改

上级 a6fddc46
正在显示 包含 88 行增加 和 26 行删除
src/main/java/com/zzsn/event/controller/EventAnalysisController.java
......@@ -452,7 +452,13 @@ public class EventAnalysisController {
}
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));
List<JSONObject> data = null;
try {
data = JSON.parseArray(versionData, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK(data);
}
/**
......@@ -477,7 +483,13 @@ public class EventAnalysisController {
}
String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.DRIVING_FACTORS.getCode());
//String result = analysisService.llmResult(eventId, startTime, endTime, AnalysisColumnEnum.DRIVING_FACTORS.getCode());
return Result.OK(versionData);
JSONObject data = null;
try {
data = JSON.parseObject(versionData, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK(data);
}
/**
......@@ -527,7 +539,13 @@ public class EventAnalysisController {
}
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));
List<JSONObject> data = null;
try {
data = JSON.parseArray(versionData, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK(data);
}
/**
......@@ -552,7 +570,13 @@ public class EventAnalysisController {
}
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));
List<JSONObject> data = null;
try {
data = JSON.parseArray(versionData, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK(data);
}
/**
......@@ -577,7 +601,13 @@ public class EventAnalysisController {
}
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));
List<JSONObject> data = null;
try {
data = JSON.parseArray(versionData, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK(data);
}
/**
......@@ -629,12 +659,24 @@ public class EventAnalysisController {
Map<String,Object> domestic = new HashMap<>();
String domesticSimilarEvent = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.DOMESTIC_SIMILAR_EVENT.getCode());
domestic.put("type",AnalysisColumnEnum.DOMESTIC_SIMILAR_EVENT.getName());
domestic.put("data",JSON.parseArray(domesticSimilarEvent,JSONObject.class));
List<JSONObject> domesticSimilarEventList = new ArrayList<>();
try {
domesticSimilarEventList = JSON.parseArray(domesticSimilarEvent, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
domestic.put("data", domesticSimilarEventList);
dataList.add(domestic);
Map<String,Object> foreign = new HashMap<>();
String foreignSimilarEvent = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.FOREIGN_SIMILAR_EVENT.getCode());
foreign.put("type",AnalysisColumnEnum.FOREIGN_SIMILAR_EVENT.getName());
foreign.put("data",JSON.parseArray(foreignSimilarEvent,JSONObject.class));
List<JSONObject> foreignSimilarEventList = new ArrayList<>();
try {
foreignSimilarEventList = JSON.parseArray(foreignSimilarEvent, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
foreign.put("data", foreignSimilarEventList);
dataList.add(foreign);
return Result.OK(dataList);
}
......@@ -661,7 +703,13 @@ public class EventAnalysisController {
}
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));
List<JSONObject> data = null;
try {
data = JSON.parseArray(versionData, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK(data);
}
/**
......@@ -686,7 +734,13 @@ public class EventAnalysisController {
}
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));
List<JSONObject> data = null;
try {
data = JSON.parseArray(versionData, JSONObject.class);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK(data);
}
......
src/main/java/com/zzsn/event/controller/common/LLmConfigController.java
......@@ -8,6 +8,7 @@ import com.zzsn.event.enums.AnalysisColumnEnum;
import com.zzsn.event.service.*;
import com.zzsn.event.util.DateUtil;
import com.zzsn.event.vo.EventVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -21,6 +22,7 @@ import java.util.concurrent.CompletableFuture;
* @author lkg
* @date 2025/7/28
*/
@Slf4j
@RestController
@RequestMapping("/llm/config")
public class LLmConfigController {
......@@ -72,25 +74,31 @@ public class LLmConfigController {
public Result<?> modifySingle(@RequestBody EventLlmConfig eventLlmConfig) {
llmConfigService.modifySingle(eventLlmConfig);
CompletableFuture.runAsync(() ->{
String eventId = eventLlmConfig.getEventId();
EventVO event = eventService.queryInfo(eventId);
String eventName = event.getEventName();
String content = "事件标题；" + eventName + "\n事件摘要:" + event.getEventDescribe();
//调用大模型更细结果
String llmResult = analysisService.llmResult(eventId,content, null, null, eventLlmConfig.getColumnCode());
EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
String versionId;
if (eventAnalysisVersion == null) {
eventAnalysisVersion = new EventAnalysisVersion();
eventAnalysisVersion.setEventId(eventId);
eventAnalysisVersion.setVersionName("版本" + DateUtil.dateToString(new Date()));
eventAnalysisVersionService.save(eventAnalysisVersion);
versionId = eventAnalysisVersion.getId();
AnalysisColumnEnum analysisColumnEnum = AnalysisColumnEnum.getByCode(eventLlmConfig.getColumnCode());
if (analysisColumnEnum != null) {
String eventId = eventLlmConfig.getEventId();
EventVO event = eventService.queryInfo(eventId);
String eventName = event.getEventName();
String content = "事件标题；" + eventName + "\n事件摘要:" + event.getEventDescribe();
//调用大模型更细结果
String llmResult = analysisService.llmResult(eventId,content, null, null, eventLlmConfig.getColumnCode());
EventAnalysisVersion eventAnalysisVersion = eventAnalysisVersionService.latestVersion(eventId);
String versionId;
if (eventAnalysisVersion == null) {
eventAnalysisVersion = new EventAnalysisVersion();
eventAnalysisVersion.setEventId(eventId);
eventAnalysisVersion.setVersionName("版本" + DateUtil.dateToString(new Date()));
eventAnalysisVersionService.save(eventAnalysisVersion);
versionId = eventAnalysisVersion.getId();
} else {
versionId = eventAnalysisVersion.getId();
}
EventAnalysisVersionRecord versionRecord = EventAnalysisVersionRecord.of(versionId, analysisColumnEnum, llmResult);
eventAnalysisVersionRecordService.save(versionRecord);
log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, analysisColumnEnum.getName());
} else {
versionId = eventAnalysisVersion.getId();
log.info("未找到对应的事件栏目【{}】", eventLlmConfig.getColumnCode());
}
EventAnalysisVersionRecord versionRecord = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.CORE_SUMMARY, llmResult);
eventAnalysisVersionRecordService.save(versionRecord);
});
return Result.OK();
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论