From 5e1fbbd878af55a76e590510e0b08e9d84e72b4b Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期四, 13 三月 2025 16:29:49 +0800
Subject: [PATCH] 新增把指标数据存入测点的定时任务
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 98 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 25 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 85e7427..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;
@@ -40,10 +40,10 @@
@Resource
private MdkApi mdkApi;
- /**
- * 事件标识
- */
- private final String EVENT_FLAG = "GasAlarm";
+ private static String lastRunGasSchedule = "";
+
+ // 最早调度时间
+ private static Date earliestScheduleTime = null;
/**
* 监听报警信息，执行调度
@@ -61,33 +61,81 @@
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;
+ }
+
+ // 判断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);
- 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());
+ mdkScheduleReqDTO.setScheduleTime(predictTime);
//执行调度方案
MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);
- if(mdkScheduleRespDTO == null){
+ 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")
- || !result.containsKey("hongAdvice") || !result.containsKey("RunAdvice")){
+ if (!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")
+ || !result.containsKey("hongAdvice") || !result.containsKey("RunAdvice")) {
return;
}
for (String key : result.keySet()) {
@@ -98,28 +146,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());
@@ -130,8 +178,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()) {
@@ -142,21 +190,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());
--
Gitblit v1.9.3