From 411cad33fde485593b2f554c214839d04f1a39eb Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 18 三月 2025 16:30:47 +0800
Subject: [PATCH] 低与 -》 低于
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 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 72c254c..cfb4427 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;
@@ -8,6 +7,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,6 +42,9 @@
private static String lastRunGasSchedule = "";
+ // 最早调度时间
+ private static Date earliestScheduleTime = null;
+
/**
* 监听报警信息，执行调度
*
@@ -58,10 +61,21 @@
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 * 3) {
+ if (new Date().getTime() - predictTime.getTime() > 1000 * 60 * 10) {
log.info("过滤旧消息");
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);
@@ -79,23 +93,45 @@
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) {
return;
}
+
Map<String, Object> result = mdkScheduleRespDTO.getResult();
switch (mdkScheduleRespDTO.getScheduleCode()) {
case CommonConstant.GAS_MODEL_CODE:
- 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);
+
+ if (CollectionUtils.isEmpty(result)) {
+ log.info("煤气调度结果为空，" + result);
+ break;
+ }
+
+ log.info("煤气调度");
// 结果写入测点
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);
+
+ // 模拟调整
+ 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")
--
Gitblit v1.9.3