From af2d5942652584c65579894c4a4a680bc37dad20 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期六, 08 二月 2025 15:29:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 66 insertions(+), 29 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 846333f..f06f22b 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,5 +1,6 @@
package com.iailab.module.shasteel.mq.consumer;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.model.api.mcs.McsApi;
@@ -13,16 +14,14 @@
import com.iailab.module.shasteel.mq.common.constant.CommonConstant;
import com.iailab.module.shasteel.mq.config.QueueModelAlarmConfig;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
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;
+import java.util.*;
/**
* 监听报警信息
@@ -41,10 +40,7 @@
@Resource
private MdkApi mdkApi;
- /**
- * 事件标识
- */
- private final String EVENT_FLAG = "GasAlarm";
+ private static String lastRunGasSchedule = "";
/**
* 监听报警信息，执行调度
@@ -57,29 +53,56 @@
log.info("routingKey:" + routingKey);
String messageBody = new String(message.getBody());
log.info("messageBody:" + messageBody);
- JSONObject messageJson = JSONObject.parseObject(messageBody);
+ Map<String, Object> messageJson = JSONObject.parseObject(messageBody);
if (CollectionUtils.isEmpty(messageJson)) {
return;
}
+ Date predictTime = DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ if (new Date().getTime() - predictTime.getTime() > 1000 * 60 * 10) {
+ log.info("过滤旧消息");
+ return;
+ }
+
// 查找需要执行的调度方案
List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.EVENT.getCode(), routingKey);
- for(StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList){
+ if (CollectionUtils.isEmpty(scheduleSchemeList)) {
+ log.info("routingKey:" + routingKey + ",调度方案为空。");
+ return;
+ }
+ for (StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList) {
+ String runKey = "GasSchedule_" + stScheduleSchemeDTO.getCode() + "_" + predictTime.getTime();
+ log.info("runKey:" + runKey);
+ log.info("lastRunGasSchedule:" + lastRunGasSchedule);
+ if (lastRunGasSchedule.equals(runKey)) {
+ continue;
+ }
+ lastRunGasSchedule = runKey;
MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO();
mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
- mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime());
- MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);//执行调度方案
- if(mdkScheduleRespDTO == null){
+ mdkScheduleReqDTO.setScheduleTime(predictTime);
+ //执行调度方案
+ MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);
+ if (mdkScheduleRespDTO == null) {
return;
}
- AlarmMessageRespDTO alarmRespDTO = (AlarmMessageRespDTO)messageJson.get("AlarmMessageRespDTO");
- alarmRespDTO.setId(UUID.randomUUID().toString());
- alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- mcsApi.createAlarmMessage(alarmRespDTO);
+
Map<String, Object> result = mdkScheduleRespDTO.getResult();
switch (mdkScheduleRespDTO.getScheduleCode()) {
- case CommonConstant.OXYGEN_ONE_CODE://氧气班平衡计划方案
- if(!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")
- || !result.containsKey("hongAdvice") || !result.containsKey("RunAdvice")){
+ case CommonConstant.GAS_MODEL_CODE:
+ // 结果写入测点
+ 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);
+ break;
+ case CommonConstant.OXYGEN_ONE_CODE:
+ if (!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")
+ || !result.containsKey("hongAdvice") || !result.containsKey("RunAdvice")) {
return;
}
for (String key : result.keySet()) {
@@ -90,28 +113,28 @@
suggestRespDTO.setContent(result.get("faAdvice").toString());//法夜空建议送出量建议
suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
mcsApi.createScheduleSuggest(suggestRespDTO);
- }else if ("yingDiAdvice".equals(key) && !"".equals(result.get("yingDiAdvice").toString())) {
+ } 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())) {
+ } 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())) {
+ } 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())) {
+ } else if ("RunAdvice".equals(key) && !"".equals(result.get("RunAdvice").toString())) {
ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
suggestRespDTO.setId(UUID.randomUUID().toString());
suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
@@ -122,8 +145,8 @@
}
break;
case CommonConstant.OXYGEN_TWO_CODE://氧气系统优化调度决策方案
- if(!result.containsKey("yingdiAdvice") || !result.containsKey("faAdvice") || !result.containsKey("hongAdvice")
- || !result.containsKey("RunAdvice")){
+ if (!result.containsKey("yingdiAdvice") || !result.containsKey("faAdvice") || !result.containsKey("hongAdvice")
+ || !result.containsKey("RunAdvice")) {
return;
}
for (String key : result.keySet()) {
@@ -134,21 +157,21 @@
suggestRespDTO.setContent(result.get("yingdiAdvice").toString());//盈德中压建议调整量建议
suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
mcsApi.createScheduleSuggest(suggestRespDTO);
- }else if ("faAdvice".equals(key) && !"".equals(result.get("faAdvice").toString())) {
+ } 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())) {
+ } 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())) {
+ } else if ("RunAdvice".equals(key) && !"".equals(result.get("RunAdvice").toString())) {
ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
suggestRespDTO.setId(UUID.randomUUID().toString());
suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
@@ -163,4 +186,18 @@
}
}
}
+
+ private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime) {
+ if (content == null || StringUtils.isBlank(content.toString()) || "0".equals(content.toString())) {
+ log.info(title + "content为空");
+ return;
+ }
+ ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO();
+ suggest.setTitle(title);
+ suggest.setContent(content.toString());
+ suggest.setScheduleObj(scheduleObj);
+ suggest.setScheduleTime(scheduleTime);
+ suggest.setSort(0);
+ mcsApi.createScheduleSuggest(suggest);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3