From e6b9276f3b1317070be0fe641ebc81cc38b459b4 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 18 二月 2025 10:23:09 +0800
Subject: [PATCH] 预警判断 累计超限逻辑修改，累计记录超限时间，设置最早调度时间
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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..232af5a 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)) {
--
Gitblit v1.9.3