From cf56ebbecf2c8fc695e95c4d84949182260ee082 Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期五, 20 十二月 2024 10:27:51 +0800 Subject: [PATCH] 调度建议与预警信息 --- shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java | 149 +++++++++++++++++++++++++++++++++++++ shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java | 2 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 29 ++++--- shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/RoutingConstant.java | 2 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueueModelAlarmConfig.java | 2 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/enums/TriggerConditionEnum.java | 20 +++++ shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueuePredictFinishConfig.java | 2 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java | 2 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java | 16 ++++ 9 files changed, 207 insertions(+), 17 deletions(-) diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java index 4675dd5..507a523 100644 --- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java @@ -3,7 +3,7 @@ import com.iailab.module.model.api.mdk.MdkApi; import com.iailab.module.model.api.mdk.dto.MdkPredictModuleRespDTO; import com.iailab.module.model.api.mdk.dto.MdkPredictReqDTO; -import com.iailab.module.shasteel.mq.common.RoutingConstant; +import com.iailab.module.shasteel.mq.common.constant.RoutingConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java new file mode 100644 index 0000000..60ea0f3 --- /dev/null +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java @@ -0,0 +1,16 @@ +package com.iailab.module.shasteel.mq.common.constant; + + +import java.math.BigDecimal; + +/** + * @Description: 通用常量 + */ +public interface CommonConstant { + + //压缩空气调度方案code + String COMPRESSOR_CODE = "Air"; + + //蒸汽调度方案code + String STEAM_CODE = "sha01"; +} diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/RoutingConstant.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/RoutingConstant.java similarity index 82% rename from shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/RoutingConstant.java rename to shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/RoutingConstant.java index e53fee3..fa56dfe 100644 --- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/RoutingConstant.java +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/RoutingConstant.java @@ -1,4 +1,4 @@ -package com.iailab.module.shasteel.mq.common; +package com.iailab.module.shasteel.mq.common.constant; public interface RoutingConstant { diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/enums/TriggerConditionEnum.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/enums/TriggerConditionEnum.java new file mode 100644 index 0000000..7057ea8 --- /dev/null +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/enums/TriggerConditionEnum.java @@ -0,0 +1,20 @@ +package com.iailab.module.shasteel.mq.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author lirm + * @Description + * @createTime 2024年12月19日 + */ +@Getter +@AllArgsConstructor +public enum TriggerConditionEnum { + + EVENT("1"), + + REGULAR("2"); + + private String code; +} diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueueModelAlarmConfig.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueueModelAlarmConfig.java index 45edacc..de7b7b0 100644 --- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueueModelAlarmConfig.java +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueueModelAlarmConfig.java @@ -1,6 +1,6 @@ package com.iailab.module.shasteel.mq.config; -import com.iailab.module.shasteel.mq.common.RoutingConstant; +import com.iailab.module.shasteel.mq.common.constant.RoutingConstant; import org.springframework.amqp.core.Binding; import org.springframework.amqp.core.BindingBuilder; import org.springframework.amqp.core.Queue; diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueuePredictFinishConfig.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueuePredictFinishConfig.java index 148bcc4..334bdd7 100644 --- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueuePredictFinishConfig.java +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/config/QueuePredictFinishConfig.java @@ -1,6 +1,6 @@ package com.iailab.module.shasteel.mq.config; -import com.iailab.module.shasteel.mq.common.RoutingConstant; +import com.iailab.module.shasteel.mq.common.constant.RoutingConstant; import org.springframework.amqp.core.Binding; import org.springframework.amqp.core.BindingBuilder; import org.springframework.amqp.core.Queue; 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 48fece0..4621a2b 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 @@ -1,15 +1,19 @@ package com.iailab.module.shasteel.mq.consumer; +import com.alibaba.fastjson.JSONObject; 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.StScheduleSchemeDTO; import com.iailab.module.model.api.mdk.MdkApi; import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO; -import com.iailab.module.shasteel.mq.common.RoutingConstant; +import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO; +import com.iailab.module.shasteel.mq.common.enums.TriggerConditionEnum; import com.iailab.module.shasteel.mq.config.QueueModelAlarmConfig; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.HashMap; @@ -49,25 +53,26 @@ log.info("routingKey:" + routingKey); String messageBody = new String(message.getBody()); log.info("messageBody:" + messageBody); + JSONObject messageJson = JSONObject.parseObject(messageBody); + if (CollectionUtils.isEmpty(messageJson)) { + return; + } // 查找需要执行的调度方案 Map<String, Object> params = new HashMap<>(); + params.put("trigger_method", TriggerConditionEnum.EVENT); params.put("trigger_condition", routingKey); List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(params);//根据触发条件获取调度方案列表 for(StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList){ MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO(); mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode()); mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime()); -// MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);//执行调度方案 -// String result = mdkScheduleRespDTO.getResult().toString(); -// System.out.println(result); -// AlarmMessageRespDTO alarmMessageRespDTO = new AlarmMessageRespDTO(); -// mcsApi.createAlarmMessage(alarmMessageRespDTO); + MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);//执行调度方案 + String result = mdkScheduleRespDTO.getResult().toString(); + System.out.println(result); + AlarmMessageRespDTO alarmMessageRespDTO = (AlarmMessageRespDTO)messageJson.get("AlarmMessageRespDTO"); + alarmMessageRespDTO.setContent(result); + // 根据模型返回结果,保存调度建议 + mcsApi.createAlarmMessage(alarmMessageRespDTO); } -// AlarmMessageRespDTO alarmMessageRespDTO = alarmMessage.getAlarmMessageRespDTO(); -// JSONObject contentJson = JSONObject.parseObject(alarmMessageRespDTO.getContent()); -// String overLimitTime = contentJson.get("overLimitTime").toString(); - - // 根据模型返回结果,保存调度建议 - } } \ No newline at end of file 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 new file mode 100644 index 0000000..869b18c --- /dev/null +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java @@ -0,0 +1,149 @@ +package com.iailab.module.shasteel.mq.consumer; + +import com.alibaba.fastjson.JSON; +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; +import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO; +import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO; +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; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + * 监听报警信息 + * + * @author PanZhibao + * @Description + * @createTime 2024年12月11日 + */ +@Slf4j +@Component +public class ModelPredictFinish2Consumer { + + @Resource + private McsApi mcsApi; + + @Resource + private MdkApi mdkApi; + + /** + * 监听预测完成,执行调度 + * + * @param message + */ + @RabbitListener(queues = QueuePredictFinishConfig.QUEUE_NAME) + public void listen(Message message) { + String routingKey = message.getMessageProperties().getReceivedRoutingKey(); + log.info("routingKey:" + routingKey); + String messageBody = new String(message.getBody()); + log.info("messageBody:" + messageBody); + JSONObject messageJson = JSONObject.parseObject(messageBody); + if (CollectionUtils.isEmpty(messageJson)) { + return; + } + // 查找需要执行的调度方案 + Map<String, Object> params = new HashMap<>(); + params.put("trigger_method", TriggerConditionEnum.EVENT); + params.put("trigger_condition", routingKey); + List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(params);//根据触发条件获取调度方案列表 + for(StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList){ + MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO(); + mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode()); + mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime()); + MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);//执行调度方案 + if(mdkScheduleRespDTO == null){ + return; + } + 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("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); + } + 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("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); + } + break; + default: + break; + } + } + } +} \ No newline at end of file diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java index ba037aa..6b30eb1 100644 --- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java +++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java @@ -6,7 +6,7 @@ import com.iailab.module.model.api.mcs.dto.AlarmConfigRespDTO; import com.iailab.module.model.api.mcs.dto.AlarmMessageRespDTO; import com.iailab.module.model.api.mcs.dto.PreDataJsonReqVO; -import com.iailab.module.shasteel.mq.common.RoutingConstant; +import com.iailab.module.shasteel.mq.common.constant.RoutingConstant; import com.iailab.module.shasteel.mq.config.QueuePredictFinishConfig; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.Message; -- Gitblit v1.9.3