From 9028d0694549df46adf4cca71de823b5b35fc4c8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 19 三月 2025 11:47:20 +0800
Subject: [PATCH] 调整速率有效期内，跳过执行
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 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 c4b608d..9424085 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
@@ -8,6 +8,7 @@
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.MdkPredictSimAdjustReqDTO;
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;
@@ -42,13 +43,19 @@
private static String lastRunGasSchedule = "";
+ // 最早调度时间
+ private static Date earliestScheduleTime = null;
+
+ private static Date lastScheduleTime = null;
+
/**
- * 监听报警信息，执行调度
+ * 监听报警信息，执行煤气调度
*
* @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());
@@ -62,18 +69,41 @@
log.info("过滤旧消息");
return;
}
+ 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();
- // 查找需要执行的调度方案
+ 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();
+ if (lastScheduleTime != null && stScheduleSchemeDTO.getAdjustRate() != null && stScheduleSchemeDTO.getAdjustRate() > 0 &&
+ (predictTime.getTime() - lastScheduleTime.getTime() > 1000 * 60 * stScheduleSchemeDTO.getAdjustRate().longValue()) ) {
+ log.info("调整速率有效期内，跳过执行");
+ continue;
+ }
+ 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;
@@ -89,6 +119,13 @@
Map<String, Object> result = mdkScheduleRespDTO.getResult();
switch (mdkScheduleRespDTO.getScheduleCode()) {
case CommonConstant.GAS_MODEL_CODE:
+
+ if (CollectionUtils.isEmpty(result)) {
+ log.info("煤气调度结果为空，" + result);
+ break;
+ }
+
+ log.info("煤气调度");
// 结果写入测点
mdkApi.scheduleModelOut(mdkScheduleRespDTO);
@@ -98,6 +135,19 @@
saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime);
saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime);
saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime);
+
+ // 模拟调整
+ MdkPredictSimAdjustReqDTO simAdjustReqDTO = new MdkPredictSimAdjustReqDTO();
+ simAdjustReqDTO.setPredictTime(predictTime);
+ simAdjustReqDTO.setScheduleCode(CommonConstant.GAS_MODEL_CODE);
+ simAdjustReqDTO.setModelResult(result);
+ Boolean simAdjustFlag = mdkApi.predictSimAdjust(simAdjustReqDTO);
+ if (simAdjustFlag) {
+ log.info("模拟调整成功，ScheduleCode：" + CommonConstant.GAS_MODEL_CODE);
+ } else {
+ log.error("模拟调整失败，simAdjustReqDTO：" + simAdjustReqDTO);
+ }
+
break;
case CommonConstant.OXYGEN_ONE_CODE:
if (!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")
@@ -184,6 +234,8 @@
break;
}
}
+
+ lastScheduleTime = predictTime;
}
private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime) {
--
Gitblit v1.9.3