From 6cce675bb26ab0ffbdc19fe7f48cb3fcbd9890e3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 07 一月 2025 16:01:18 +0800
Subject: [PATCH] 压缩空气优化调度

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java |  131 +++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 66 deletions(-)

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 869b18c..0234ae1 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
@@ -10,9 +10,8 @@
 import com.iailab.module.model.api.mdk.MdkApi;
 import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
 import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
+import com.iailab.module.model.enums.ScheduleTriggerMethodEnum;
 import com.iailab.module.shasteel.mq.common.constant.CommonConstant;
-import com.iailab.module.shasteel.mq.common.enums.TriggerConditionEnum;
-import com.iailab.module.shasteel.mq.config.QueueModelAlarmConfig;
 import com.iailab.module.shasteel.mq.config.QueuePredictFinishConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -59,10 +58,7 @@
             return;
         }
         // 查找需要执行的调度方案
-        Map<String, Object> params = new HashMap<>();
-        params.put("trigger_method", TriggerConditionEnum.EVENT);
-        params.put("trigger_condition", routingKey);
-        List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(params);//根据触发条件获取调度方案列表
+        List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.EVENT.getCode(), routingKey);
         for(StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList){
             MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO();
             mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
@@ -74,71 +70,74 @@
             Map<String, Object> result = mdkScheduleRespDTO.getResult();
             switch (mdkScheduleRespDTO.getScheduleCode()) {
                 case CommonConstant.COMPRESSOR_CODE://压缩空气调度方案
-                    if(result.containsKey("pressureWarning") && !"".equals(result.get("pressureWarning").toString())){
-                        AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
-                        alarmRespDTO.setId(UUID.randomUUID().toString());
-                        alarmRespDTO.setContent(result.get("pressureWarning").toString());//压力预警信息
-                        alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-                        mcsApi.createAlarmMessage(alarmRespDTO);
+                    if(!result.containsKey("pressureWarning") || !result.containsKey("dispatchStart") || !result.containsKey("dispatchEnd")){
+                        return;
                     }
-                    if(result.containsKey("dispatchStart") && !"".equals(result.get("dispatchStart").toString())){
-                        ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
-                        suggestRespDTO.setId(UUID.randomUUID().toString());
-                        suggestRespDTO.setContent(result.get("dispatchStart").toString());//空压机启动调度建议
-                        suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
-                        mcsApi.createScheduleSuggest(suggestRespDTO);
+                    for (String key : result.keySet()) {
+                        if("pressureWarning".equals(key) && !"".equals(result.get("pressureWarning").toString())){
+                            AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+                            alarmRespDTO.setId(UUID.randomUUID().toString());
+                            alarmRespDTO.setContent(result.get("pressureWarning").toString());//压力预警信息
+                            alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+                            mcsApi.createAlarmMessage(alarmRespDTO);
+                        }else if("dispatchStart".equals(key) && !"".equals(result.get("dispatchStart").toString())){
+                            ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+                            suggestRespDTO.setId(UUID.randomUUID().toString());
+                            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.setContent(result.get("dispatchClose").toString());//空压机关停调度建议
+                            suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+                            mcsApi.createScheduleSuggest(suggestRespDTO);
+                        }
                     }
-                    if(result.containsKey("dispatchClose") && !"".equals(result.get("dispatchClose").toString())){
-                        ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
-                        suggestRespDTO.setId(UUID.randomUUID().toString());
-                        suggestRespDTO.setContent(result.get("dispatchClose").toString());//空压机关停调度建议
-                        suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
-                        mcsApi.createScheduleSuggest(suggestRespDTO);
-                    }
-
                     break;
                 case CommonConstant.STEAM_CODE://蒸汽调度方案
-                    if(result.containsKey("daxinWarning") && !"".equals(result.get("daxinWarning").toString())){
-                        AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
-                        alarmRespDTO.setId(UUID.randomUUID().toString());
-                        alarmRespDTO.setContent(result.get("daxinWarning").toString());//大新预警
-                        alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-                        mcsApi.createAlarmMessage(alarmRespDTO);
+                    if(!result.containsKey("daxinWarning") || !result.containsKey("jinfengWarning") || !result.containsKey("zhuanlu1Warning")
+                            || !result.containsKey("zhuanlu2Warning") || !result.containsKey("jinfengAdvice") || !result.containsKey("daxinAdvice")){
+                        return;
                     }
-                    if(result.containsKey("jinfengWarning") && !"".equals(result.get("jinfengWarning").toString())){
-                        AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
-                        alarmRespDTO.setId(UUID.randomUUID().toString());
-                        alarmRespDTO.setContent(result.get("jinfengWarning").toString());//锦丰预警
-                        alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-                        mcsApi.createAlarmMessage(alarmRespDTO);
-                    }
-                    if(result.containsKey("zhuanlu1Warning") && !"".equals(result.get("zhuanlu1Warning").toString())){
-                        AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
-                        alarmRespDTO.setId(UUID.randomUUID().toString());
-                        alarmRespDTO.setContent(result.get("zhuanlu1Warning").toString());//转炉一预警
-                        alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-                        mcsApi.createAlarmMessage(alarmRespDTO);
-                    }
-                    if(result.containsKey("zhuanlu2Warning") && !"".equals(result.get("zhuanlu2Warning").toString())){
-                        AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
-                        alarmRespDTO.setId(UUID.randomUUID().toString());
-                        alarmRespDTO.setContent(result.get("zhuanlu2Warning").toString());//转炉二预警
-                        alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-                        mcsApi.createAlarmMessage(alarmRespDTO);
-                    }
-                    if(result.containsKey("jinfengAdvice") && !"".equals(result.get("jinfengAdvice").toString())){
-                        ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
-                        suggestRespDTO.setId(UUID.randomUUID().toString());
-                        suggestRespDTO.setContent(result.get("jinfengAdvice").toString());//锦丰调度建议
-                        suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
-                        mcsApi.createScheduleSuggest(suggestRespDTO);
-                    }
-                    if(result.containsKey("daxinAdvice") && !"".equals(result.get("daxinAdvice").toString())){
-                        ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
-                        suggestRespDTO.setId(UUID.randomUUID().toString());
-                        suggestRespDTO.setContent(result.get("daxinAdvice").toString());//大新调度建议
-                        suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
-                        mcsApi.createScheduleSuggest(suggestRespDTO);
+                    for (String key : result.keySet()) {
+                        if ("daxinWarning".equals(key) && !"".equals(result.get("daxinWarning").toString())) {
+                            AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+                            alarmRespDTO.setId(UUID.randomUUID().toString());
+                            alarmRespDTO.setContent(result.get("daxinWarning").toString());//大新预警
+                            alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+                            mcsApi.createAlarmMessage(alarmRespDTO);
+                        }else if ("jinfengWarning".equals(key) && !"".equals(result.get("jinfengWarning").toString())) {
+                            AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+                            alarmRespDTO.setId(UUID.randomUUID().toString());
+                            alarmRespDTO.setContent(result.get("jinfengWarning").toString());//锦丰预警
+                            alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+                            mcsApi.createAlarmMessage(alarmRespDTO);
+                        }else if ("zhuanlu1Warning".equals(key) && !"".equals(result.get("zhuanlu1Warning").toString())) {
+                            AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+                            alarmRespDTO.setId(UUID.randomUUID().toString());
+                            alarmRespDTO.setContent(result.get("zhuanlu1Warning").toString());//转炉一预警
+                            alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+                            mcsApi.createAlarmMessage(alarmRespDTO);
+                        }else if ("zhuanlu2Warning".equals(key) && !"".equals(result.get("zhuanlu2Warning").toString())) {
+                            AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+                            alarmRespDTO.setId(UUID.randomUUID().toString());
+                            alarmRespDTO.setContent(result.get("zhuanlu2Warning").toString());//转炉二预警
+                            alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+                            mcsApi.createAlarmMessage(alarmRespDTO);
+                        }else if ("jinfengAdvice".equals(key) && !"".equals(result.get("jinfengAdvice").toString())) {
+                            ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+                            suggestRespDTO.setId(UUID.randomUUID().toString());
+                            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.setContent(result.get("daxinAdvice").toString());//大新调度建议
+                            suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+                            mcsApi.createScheduleSuggest(suggestRespDTO);
+                        }
                     }
                     break;
                 default:

--
Gitblit v1.9.3