From 8153a3fc84b249b808aee7ad049b9a7034ff5e75 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 14 二月 2025 09:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 cb2cfcc..c4b608d 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
@@ -79,7 +79,7 @@
             lastRunGasSchedule = runKey;
             MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO();
             mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
-            mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime());
+            mdkScheduleReqDTO.setScheduleTime(predictTime);
             //执行调度方案
             MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);
             if (mdkScheduleRespDTO == null) {
@@ -93,12 +93,11 @@
                     mdkApi.scheduleModelOut(mdkScheduleRespDTO);
 
                     // 保存调度建议
-                    String sch_obj_gas = "GAS";
-                    saveScheduleSuggest("adviceBFG", result.get("adviceBFG"), sch_obj_gas, predictTime);
-                    saveScheduleSuggest("adviceCOG", result.get("adviceCOG"), sch_obj_gas, predictTime);
-                    saveScheduleSuggest("adviceLDG13W", result.get("adviceLDG13W"), sch_obj_gas, predictTime);
-                    saveScheduleSuggest("adviceLDG12W", result.get("adviceLDG12W"), sch_obj_gas, predictTime);
-                    saveScheduleSuggest("adviceLDG12WT", result.get("adviceLDG12WT"), sch_obj_gas, predictTime);
+                    saveScheduleSuggest("高炉煤气", result.get("adviceBFG"), "BFG", predictTime);
+                    saveScheduleSuggest("焦炉煤气", result.get("adviceCOG"), "COG", predictTime);
+                    saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime);
+                    saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime);
+                    saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime);
                     break;
                 case CommonConstant.OXYGEN_ONE_CODE:
                     if (!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")

--
Gitblit v1.9.3