From 6fb7534adeaffd1caf325210a2353a85ab79a454 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 21 一月 2025 10:59:18 +0800
Subject: [PATCH] 预警消息过滤
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 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..72c254c 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
@@ -40,10 +40,7 @@
@Resource
private MdkApi mdkApi;
- /**
- * 事件标识
- */
- private final String EVENT_FLAG = "GasAlarm";
+ private static String lastRunGasSchedule = "";
/**
* 监听报警信息，执行调度
@@ -61,16 +58,31 @@
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) {
+ log.info("过滤旧消息");
+ return;
+ }
// 查找需要执行的调度方案
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());
//执行调度方案
MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);
- if(mdkScheduleRespDTO == null){
+ if (mdkScheduleRespDTO == null) {
return;
}
Map<String, Object> result = mdkScheduleRespDTO.getResult();
@@ -86,8 +98,8 @@
mdkApi.scheduleModelOut(mdkScheduleRespDTO);
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 +110,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 +142,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 +154,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