From a3bb1815c3eb6b0f0cfe9d9d2ba5ee48279e26ed Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 28 三月 2025 11:30:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 137 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 116 insertions(+), 21 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 cfb4427..7713b57 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;
@@ -21,6 +22,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -42,16 +44,25 @@
private static String lastRunGasSchedule = "";
- // 最早调度时间
- private static Date earliestScheduleTime = null;
+ /**
+ * 煤气调度调整方向
+ * 1：调整值为正数；-1：调整值为负数
+ */
+ private static Map<String, Integer> gasAdjustMode = new HashMap<>();
/**
- * 监听报警信息，执行调度
+ * 煤气调度建议时间
+ */
+ private static Map<String, Date> gasLastSugTime = new HashMap<>();
+
+ /**
+ * 监听报警信息，执行煤气调度
*
* @param message
*/
@RabbitListener(queues = QueueModelAlarmConfig.QUEUE_NAME)
public void listen(Message message) {
+ log.info("监听报警信息，执行煤气调度");
String routingKey = message.getMessageProperties().getReceivedRoutingKey();
log.info("routingKey:" + routingKey);
String messageBody = new String(message.getBody());
@@ -65,29 +76,36 @@
log.info("过滤旧消息");
return;
}
-
- // 判断predictTime 是否大于outTime，否则不执行调度
- if (earliestScheduleTime != null && predictTime.compareTo(earliestScheduleTime) < 0) {
+ if (!ModelPredictFinishConsumer.finishModuleMap.containsKey(predictTime.getTime())) {
+ log.info("finishModuleMap not containsKey:" + predictTime.getTime());
return;
}
+ List<String> finishModuleList = ModelPredictFinishConsumer.finishModuleMap.get(predictTime.getTime());
+ if (CollectionUtils.isEmpty(finishModuleList)) {
+ log.info("finishModuleList is empty");
+ return;
+ }
+ if (!finishModuleList.contains(CommonConstant.NET_BFG) || !finishModuleList.contains(CommonConstant.NET_COG) ||
+ !finishModuleList.contains(CommonConstant.NET_LDG)) {
+ log.info("finishModuleList:" + JSONArray.toJSONString(finishModuleList));
+ log.info("等待全部预测完成");
+ return;
+ }
+ log.info("已全部预测完成，清空finishModuleMap");
+ ModelPredictFinishConsumer.finishModuleMap.clear();
- List<AlarmMessageRespDTO> alarmList = JSONObject.parseArray(messageJson.get("alarmList").toString(),AlarmMessageRespDTO.class);
- // 取出最小outTime
- Date minOutTime = alarmList.stream().filter(e -> e.getOutTime() != null).map(AlarmMessageRespDTO::getOutTime).min(Date::compareTo).get();
- earliestScheduleTime = minOutTime;
-
-
- // 查找需要执行的调度方案
+ log.info("查找需要执行的调度方案");
List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.EVENT.getCode(), routingKey);
if (CollectionUtils.isEmpty(scheduleSchemeList)) {
log.info("routingKey:" + routingKey + ",调度方案为空。");
return;
}
for (StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList) {
- String runKey = "GasSchedule_" + stScheduleSchemeDTO.getCode() + "_" + predictTime.getTime();
+ String runKey = "GasSchedule_" + stScheduleSchemeDTO.getCode() + "_" + predictTime.getTime();
log.info("runKey:" + runKey);
log.info("lastRunGasSchedule:" + lastRunGasSchedule);
if (lastRunGasSchedule.equals(runKey)) {
+ log.info("lastRunGasSchedule:" + lastRunGasSchedule + "已执行完成");
continue;
}
lastRunGasSchedule = runKey;
@@ -114,11 +132,11 @@
mdkApi.scheduleModelOut(mdkScheduleRespDTO);
// 保存调度建议
- 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);
+ saveScheduleSuggest("高炉煤气", result.get("adviceBFG"), "BFG", predictTime, result.get("adjustValueBFG"), stScheduleSchemeDTO.getAdjustRate());
+ saveScheduleSuggest("焦炉煤气", result.get("adviceCOG"), "COG", predictTime, result.get("adjustValueCOG"), stScheduleSchemeDTO.getAdjustRate());
+ saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime, result.get("adjustValueLDG13W"), stScheduleSchemeDTO.getAdjustRate());
+ saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime, result.get("adjustValueLDG12W"), stScheduleSchemeDTO.getAdjustRate());
+ saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime, result.get("adjustValueLDG12WT"), stScheduleSchemeDTO.getAdjustRate());
// 模拟调整
MdkPredictSimAdjustReqDTO simAdjustReqDTO = new MdkPredictSimAdjustReqDTO();
@@ -128,7 +146,7 @@
Boolean simAdjustFlag = mdkApi.predictSimAdjust(simAdjustReqDTO);
if (simAdjustFlag) {
log.info("模拟调整成功，ScheduleCode：" + CommonConstant.GAS_MODEL_CODE);
- }else {
+ } else {
log.error("模拟调整失败，simAdjustReqDTO：" + simAdjustReqDTO);
}
@@ -220,14 +238,91 @@
}
}
- private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime) {
+ /**
+ * 建议保持逻辑
+ * <p>
+ * <p>
+ * BFG建议：
+ * 若触发第一条：
+ * 当前BFG建议 = adviceBFG
+ * 若后续BFG建议出现时间与当前BFG建议相差15分钟之内：
+ * 所后续BFG建议方向与当前BFG建议方向相反：
+ * 当前建议 = 后续BFG建议
+ * 若不是：
+ * 当前建议保持不变
+ * 若不是则：
+ * 当前建议 = 后续BFG建议
+ * <p>
+ * COG建议：
+ * 若触发第一条：
+ * 当前COG建议 = adviceCOG
+ * 若后续COG建议出现时间与当前COG建议相差15分钟之内：
+ * 所后续COG建议方向与当前COG建议方向相反：
+ * 当前建议 = 后续COG建议
+ * 若不是：
+ * 当前建议保持不变
+ * 若不是则：
+ * 当前建议 = 后续COG建议
+ * <p>
+ * LDG13W建议：
+ * 若触发第一条：
+ * 当前LDG13W建议 = adviceLDG13W
+ * 若后续LDG13W建议出现时间与当前LDG13W建议相差15分钟之内：
+ * 所后续LDG13W建议方向与当前LDG13W建议方向相反：
+ * 当前建议 = 后续LDG13W建议
+ * 若不是：
+ * 当前建议保持不变
+ * 若不是则：
+ * 当前建议 = 后续LDG13W建议
+ * <p>
+ * LDG12W建议：
+ * 若触发第一条：
+ * 当前LDG12W建议 = adviceLDG12W
+ * 若后续LDG12W建议出现时间与当前LDG12W建议相差15分钟之内：
+ * 所后续LDG12W建议方向与当前LDG12W建议方向相反：
+ * 当前建议 = 后续LDG12W建议
+ * 若不是：
+ * 当前建议保持不变
+ * 若不是则：
+ * 当前建议 = 后续LDG12W建议
+ * <p>
+ * LDG12WT建议：
+ * 若触发第一条：
+ * 当前LDG12WT建议 = adviceLDG12WT
+ * 若后续LDG12WT建议出现时间与当前LDG12WT建议相差15分钟之内：
+ * 所后续LDG12WT建议方向与当前LDG12WT建议方向相反：
+ * 当前建议 = 后续LDG12WT建议
+ * 若不是：
+ * 当前建议保持不变
+ * 若不是则：
+ * 当前建议 = 后续LDG12WT建议
+ *
+ * @param title
+ * @param content
+ * @param scheduleObj
+ * @param scheduleTime
+ */
+ private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime, Object adjustObj, int adjustRate) {
if (content == null || StringUtils.isBlank(content.toString()) || "0".equals(content.toString())) {
log.info(title + "content为空");
return;
}
+ if (adjustObj == null || StringUtils.isBlank(adjustObj.toString()) || "0".equals(adjustObj.toString())) {
+ log.info(title + "调整值为空，不产生建议");
+ return;
+ }
+ BigDecimal adjustValue = new BigDecimal(adjustObj.toString());
+ if (gasAdjustMode.containsKey(scheduleObj) && gasAdjustMode.get(scheduleObj).equals(adjustValue.compareTo(BigDecimal.ZERO)) &&
+ gasLastSugTime.containsKey(scheduleObj) && (scheduleTime.getTime() - gasLastSugTime.get(scheduleObj).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) {
+ log.info("调整建议在有效期内");
+ return;
+ }
+ gasAdjustMode.put(scheduleObj, adjustValue.compareTo(BigDecimal.ZERO));
+ gasLastSugTime.put(scheduleObj, scheduleTime);
ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO();
suggest.setTitle(title);
suggest.setContent(content.toString());
+ suggest.setAdjustValue(adjustValue);
suggest.setScheduleObj(scheduleObj);
suggest.setScheduleTime(scheduleTime);
suggest.setSort(0);
--
Gitblit v1.9.3