按照前端要求 做的优化

slibra-admin/src/main/java/com/slibra/web/controller/business/GRPCController.java

@@ -88,6 +88,7 @@ public class GRPCController extends BaseController {
         //决策和问答不一样 没有历史的概念 所以sessionId都是新的  次数都是1
         String sessionId = IdUtils.simpleUUID();
         String feedback = chatReq.getFeedback();
+        String warningId = String.valueOf(chatReq.getWarningId());
         //决策请求的业务参数
 //        List<HashMap<String, Object>> list = this.xinyiIndustryMapper.selectLast10RecordsForDecision();
         //2024年5月21日15:23:07 这里不能用关联查询处理，日报要获取最新的一条而不是今日的数据。
@@ -186,10 +187,14 @@ public class GRPCController extends BaseController {
             chatReq.setType(1);//0问答 1决策
             chatReq.setModule(3);//0=专家问答,1=智能工单,2=智能体助手,3.告警
 //            String showVal = this.buildShowValue(tXinyiWarningRecord, tXinyiIndustry, normConfig);
-            chatReq.setShowVal(feedback);//前端展示的数据和提问的数据不一致
+//            chatReq.setShowVal(feedback);//前端展示的数据和提问的数据不一致
+            //如果主动调用决策  showVal应该是最新的那条历史记录对应的数据
+            List<TXinyiChatRecord> tXinyiChatRecords = this.xinyiChatRecordMapper.selectTXinyiChatRecordList(TXinyiChatRecord.builder().warningId(warningId).build());
+            if(!CollectionUtils.isEmpty(tXinyiChatRecords))
+                chatReq.setShowVal(tXinyiChatRecords.get(0).getShowVal());
             chatReq.setQuestion(dataJson);
             chatReq.setAnswer(JSON.toJSONString(resultData));
-            chatReq.setWarningId(String.valueOf(chatReq.getWarningId()));
+            chatReq.setWarningId(warningId);
             chatReq.setCounts(1);//问答次数
             String userId = SecurityUtils.getUserId().toString();
             String username = SecurityUtils.getUsername();

slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -539,7 +539,7 @@ public class RyTask
         Integer status = tXinyiWarningRecord.getStatus();
         Date warningTime = tXinyiWarningRecord.getTime();
         int count = DateUtils.differentHoursByMillisecond(warningTime, DateUtils.getNowDate()) + 1;
-        basic.put(tXinyiWarningRecord.getReason(), tXinyiWarningRecord.getReason());
+        basic.put("title", tXinyiWarningRecord.getReason());
         basic.put("报警时间", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM ,warningTime));
         basic.put("报警值", tXinyiWarningRecord.getWarningVal());
         basic.put("标准值", tXinyiWarningRecord.getDesignVal());