From 0a702eed7f20f9c70b4c169503a981ff077e6f5f Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 21 五月 2025 08:51:35 +0800
Subject: [PATCH] 建议部分保存方案id和模型id

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
index abde570..7933e5d 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
@@ -4,7 +4,6 @@
 import com.alibaba.fastjson.JSONObject;
 import com.iailab.framework.common.util.date.DateUtils;
 import com.iailab.module.model.api.mcs.McsApi;
-import com.iailab.module.model.api.mcs.dto.AlarmMessageRespDTO;
 import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO;
 import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
 import com.iailab.module.model.api.mdk.MdkApi;
@@ -138,17 +137,17 @@
                     mdkApi.scheduleModelOut(mdkScheduleRespDTO);
 
                     // 保存调度建议
-                    saveScheduleSuggest("高炉煤气", result.get("adviceBFG"), "BFG", predictTime, result.get("adjustValueBFG"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("焦炉煤气", result.get("adviceCOG"), "COG", predictTime, result.get("adjustValueCOG"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime, result.get("adjustValueLDG13W"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime, result.get("adjustValueLDG12W"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime, result.get("adjustValueLDG12WT"), stScheduleSchemeDTO.getAdjustRate());
+                    saveScheduleSuggest("高炉煤气", result.get("adviceBFG"), "BFG", predictTime, result.get("adjustValueBFG"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("焦炉煤气", result.get("adviceCOG"), "COG", predictTime, result.get("adjustValueCOG"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime, result.get("adjustValueLDG13W"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime, result.get("adjustValueLDG12W"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime, result.get("adjustValueLDG12WT"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
 
-                    saveScheduleSuggest("高炉煤气预警", result.get("BFG_warning_advice"), "BFG_ALARM", predictTime, result.get("adjustValueBFG"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("焦炉煤气预警", result.get("COG_warning_advice"), "COG_ALARM", predictTime, result.get("adjustValueCOG"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("转炉5W+8W煤气柜预警", result.get("LDG_1_warning_advice"), "LDG1_ALARM", predictTime, result.get("adjustValueLDG13W"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("宏发12W煤气柜预警", result.get("LDG_2_warning_advice"), "LDG2_ALARM", predictTime, result.get("adjustValueLDG12W"), stScheduleSchemeDTO.getAdjustRate());
-                    saveScheduleSuggest("转炉特钢12W煤气柜预警", result.get("LDG_3_warning_advice"), "LDGt_ALARM", predictTime, result.get("adjustValueLDG12WT"), stScheduleSchemeDTO.getAdjustRate());
+                    saveScheduleSuggest("高炉煤气预警", result.get("BFG_warning_advice"), "BFG_ALARM", predictTime, result.get("adjustValueBFG"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("焦炉煤气预警", result.get("COG_warning_advice"), "COG_ALARM", predictTime, result.get("adjustValueCOG"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("转炉5W+8W煤气柜预警", result.get("LDG_1_warning_advice"), "LDG1_ALARM", predictTime, result.get("adjustValueLDG13W"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("宏发12W煤气柜预警", result.get("LDG_2_warning_advice"), "LDG2_ALARM", predictTime, result.get("adjustValueLDG12W"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
+                    saveScheduleSuggest("转炉特钢12W煤气柜预警", result.get("LDG_3_warning_advice"), "LDGt_ALARM", predictTime, result.get("adjustValueLDG12WT"), stScheduleSchemeDTO.getAdjustRate(), stScheduleSchemeDTO.getModelId(),  stScheduleSchemeDTO.getId());
 
                     // 模拟调整
                     MdkPredictSimAdjustReqDTO simAdjustReqDTO = new MdkPredictSimAdjustReqDTO();
@@ -314,7 +313,7 @@
      * @param scheduleObj
      * @param scheduleTime
      */
-    private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime, Object adjustObj, int adjustRate) {
+    private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime, Object adjustObj, int adjustRate, String modelId,  String schemeId) {
         if (content == null || StringUtils.isBlank(content.toString()) || "0".equals(content.toString())) {
             log.info(title + "content为空");
             return;
@@ -337,6 +336,8 @@
         suggest.setAdjustValue(adjustValue);
         suggest.setScheduleObj(scheduleObj);
         suggest.setScheduleTime(scheduleTime);
+        suggest.setModelId(modelId);
+        suggest.setSchemeId(schemeId);
         suggest.setSort(0);
         mcsApi.createScheduleSuggest(suggest);
     }

--
Gitblit v1.9.3