From 64e8b50d1af6048c21ce191b2a5d1f2841e3c7ea Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 08 一月 2025 18:25:01 +0800
Subject: [PATCH] 调度建议与预警信息

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java |    4 ++++
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java          |    9 +++++++++
 2 files changed, 13 insertions(+), 0 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 5da7ffa..6e0cdce 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
@@ -89,30 +89,35 @@
                         if ("faAdvice".equals(key) && !"".equals(result.get("faAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("faAdvice").toString());//法夜空建议送出量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("yingDiAdvice".equals(key) && !"".equals(result.get("yingDiAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("yingDiAdvice").toString());//盈德低压建议送出量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("yingZhongAdvice".equals(key) && !"".equals(result.get("yingZhongAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("yingZhongAdvice").toString());//盈德中压建议送出量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("hongAdvice".equals(key) && !"".equals(result.get("hongAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("hongAdvice").toString());//宏昌建议送出量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("RunAdvice".equals(key) && !"".equals(result.get("RunAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("RunAdvice").toString());//润忠建议送出量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
@@ -128,24 +133,28 @@
                         if ("yingdiAdvice".equals(key) && !"".equals(result.get("yingdiAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("yingdiAdvice").toString());//盈德中压建议调整量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("faAdvice".equals(key) && !"".equals(result.get("faAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("faAdvice").toString());//法夜空建议调整量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("hongAdvice".equals(key) && !"".equals(result.get("hongAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("hongAdvice").toString());//宏昌建议调整量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("RunAdvice".equals(key) && !"".equals(result.get("RunAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("RunAdvice").toString());//润忠建议调整量建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
index e3626c7..60df985 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
@@ -87,12 +87,14 @@
                         }else if("dispatchStart".equals(key) && !"".equals(result.get("dispatchStart").toString())){
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("dispatchStart").toString());//空压机启动调度建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if("dispatchEnd".equals(key) && !"".equals(result.get("dispatchEnd").toString())){
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("dispatchClose").toString());//空压机关停调度建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
@@ -132,12 +134,14 @@
                         }else if ("jinfengAdvice".equals(key) && !"".equals(result.get("jinfengAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("jinfengAdvice").toString());//锦丰调度建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);
                         }else if ("daxinAdvice".equals(key) && !"".equals(result.get("daxinAdvice").toString())) {
                             ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
                             suggestRespDTO.setId(UUID.randomUUID().toString());
+                            suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
                             suggestRespDTO.setContent(result.get("daxinAdvice").toString());//大新调度建议
                             suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
                             mcsApi.createScheduleSuggest(suggestRespDTO);

--
Gitblit v1.9.3