From b054386a79cbe386339c00aabacafcba900586a3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 28 二月 2025 14:49:04 +0800
Subject: [PATCH] 模拟调整
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 cb2cfcc..059259a 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,6 +1,5 @@
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;
@@ -42,6 +41,9 @@
private static String lastRunGasSchedule = "";
+ // 最早调度时间
+ private static Date earliestScheduleTime = null;
+
/**
* 监听报警信息，执行调度
*
@@ -63,6 +65,17 @@
return;
}
+ // 判断predictTime 是否大于outTime，否则不执行调度
+ if (earliestScheduleTime != null && predictTime.compareTo(earliestScheduleTime) < 0) {
+ return;
+ }
+
+ 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;
+
+
// 查找需要执行的调度方案
List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.EVENT.getCode(), routingKey);
if (CollectionUtils.isEmpty(scheduleSchemeList)) {
@@ -79,7 +92,7 @@
lastRunGasSchedule = runKey;
MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO();
mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
- mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime());
+ mdkScheduleReqDTO.setScheduleTime(predictTime);
//执行调度方案
MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);
if (mdkScheduleRespDTO == null) {
@@ -89,16 +102,19 @@
Map<String, Object> result = mdkScheduleRespDTO.getResult();
switch (mdkScheduleRespDTO.getScheduleCode()) {
case CommonConstant.GAS_MODEL_CODE:
+ log.info("煤气调度");
// 结果写入测点
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);
+ 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);
+
+ // 模拟调整
+
break;
case CommonConstant.OXYGEN_ONE_CODE:
if (!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")
--
Gitblit v1.9.3