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/ModelPredictFinishConsumer.java | 165 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 95 insertions(+), 70 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
index 692fe36..8e890a1 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
@@ -39,6 +39,8 @@
@Resource
private RabbitTemplate rabbitTemplate;
+ private static String lastRunAlarm = "";
+
/**
* 监听预测完成，产生预警消息
*
@@ -55,8 +57,10 @@
if (CollectionUtils.isEmpty(messageJson)) {
return;
}
+ // 预测时间
Date predictTime = DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
-
+ // 预测模块/预测管网
+ String moduleType = messageJson.get("moduleType").toString();
// 查询相关预警配置
List<AlarmConfigRespDTO> configList = mcsApi.listAlarmConfig(new HashMap<String, Object>());
if (CollectionUtils.isEmpty(configList)) {
@@ -66,9 +70,18 @@
List<String> outputIdList = configList.stream().map(item -> {
return item.getOutId();
}).collect(Collectors.toList());
-
List<AlarmMessageRespDTO> alarmList = new ArrayList<>();
- for (AlarmConfigRespDTO configItem : configList) {
+ if (moduleType.equals(CommonConstant.NET_BFG) || moduleType.equals(CommonConstant.NET_COG) ||
+ moduleType.equals(CommonConstant.NET_LDG)) {
+ String runKey = "GasAlarm_" + predictTime.getTime();
+ log.info("runKey:" + runKey);
+ log.info("lastRunAlarm:" + lastRunAlarm);
+ if (lastRunAlarm.equals(runKey)) {
+ return;
+ }
+ lastRunAlarm = runKey;
+
+ // 查询预测结果
PreDataJsonReqVO reqVO = new PreDataJsonReqVO();
reqVO.setPredictTime(predictTime);
reqVO.setOutputIdList(outputIdList);
@@ -76,77 +89,89 @@
if (CollectionUtils.isEmpty(preData)) {
return;
}
- Map<String, BigDecimal> culData = new HashMap<>();
- preData.forEach((key, value) -> {
- double nv = value.stream().map(v1 -> {
- return Double.parseDouble(v1[1].toString());
- }).collect(Collectors.toList()).stream().mapToDouble(Double::doubleValue).sum();
- culData.put(key, new BigDecimal(nv));
- });
-
-
- List<Object[]> result = preData.get(configItem.getOutId());
- if (CollectionUtils.isEmpty(result)) {
- continue;
- }
- // 累计值
- BigDecimal culValue = new BigDecimal(result.stream().map(v1 -> {
- return Double.parseDouble(v1[1].toString());
- }).collect(Collectors.toList()).stream().mapToDouble(Double::doubleValue).sum());
- log.info("culValue:" + culValue);
-
-
- // 生成预警信息
- AlarmMessageRespDTO alarmMessage = new AlarmMessageRespDTO();
- alarmMessage.setConfigId(configItem.getId());
- alarmMessage.setTitle(configItem.getTitle());
- alarmMessage.setAlarmObj(configItem.getAlarmObj());
- alarmMessage.setAlarmTime(predictTime);
- log.info("对比累计值是否超限");
- StringBuilder content = new StringBuilder();
- if (configItem.getCulUpper() != null && culValue.compareTo(configItem.getCulUpper()) > 0) {
- content.append("即将超出累计值上限");
- alarmMessage.setAlarmType(CommonConstant.EXCEEDING_UPPER_LIMIT);
- alarmMessage.setContent(content.toString());
- mcsApi.createAlarmMessage(alarmMessage);
- alarmList.add(alarmMessage);
- continue;
- }
- if (configItem.getCulLower() != null && culValue.compareTo(configItem.getCulLower()) < 0) {
- content.append("即将低于累计值下限");
- alarmMessage.setAlarmType(CommonConstant.EXCEEDING_LOWER_LIMIT);
- alarmMessage.setContent(content.toString());
- mcsApi.createAlarmMessage(alarmMessage);
- alarmList.add(alarmMessage);
- continue;
- }
-
-
- log.info("对比预测值是否超限");
- int toIndex = result.size();
- int fromIndex = result.size() - configItem.getCompLength();
- List<Object[]> predictList = result.subList(fromIndex, toIndex);
- for (Object[] data : predictList) {
- BigDecimal dataValue = new BigDecimal(Double.parseDouble(data[1].toString())).setScale(2, BigDecimal.ROUND_HALF_UP);
- if (dataValue.compareTo(configItem.getLowerLimit()) >= 0 && dataValue.compareTo(configItem.getUpperLimit()) <= 0) {
- log.info("预测值不超限");
+ outerLoop:
+ for (AlarmConfigRespDTO configItem : configList) {
+ List<Object[]> result = preData.get(configItem.getOutId());
+ if (CollectionUtils.isEmpty(result)) {
continue;
}
- alarmMessage.setOutTime(DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- content.append(DateUtils.format(alarmMessage.getOutTime(), DateUtils.FORMAT_SIMPLE_TIME));
- content.append("，");
- content.append("即将");
- if (dataValue.compareTo(configItem.getLowerLimit()) < 0) {
- content.append("低与下限");
- alarmMessage.setAlarmType(CommonConstant.EXCEEDING_LOWER_LIMIT);
- } else if (dataValue.compareTo(configItem.getUpperLimit()) > 0) {
- content.append("超出上限");
- alarmMessage.setAlarmType(CommonConstant.EXCEEDING_UPPER_LIMIT);
+ // 对比预测值是否超限
+ int toIndex = result.size();
+ int fromIndex = result.size() - configItem.getCompLength();
+ List<Object[]> predictList = result.subList(fromIndex, toIndex);
+ for (Object[] data : predictList) {
+ BigDecimal dataValue = new BigDecimal(Double.parseDouble(data[1].toString())).setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (dataValue.compareTo(configItem.getLowerLimit()) >= 0 && dataValue.compareTo(configItem.getUpperLimit()) <= 0) {
+ log.info("预测值不超限");
+ continue;
+ }
+ // 预警记录
+ AlarmMessageRespDTO alarmMessage = new AlarmMessageRespDTO();
+ alarmMessage.setConfigId(configItem.getId());
+ alarmMessage.setTitle(configItem.getTitle());
+ alarmMessage.setAlarmObj(configItem.getAlarmObj());
+ alarmMessage.setAlarmTime(predictTime);
+ // 设置超出时间
+ alarmMessage.setOutTime(DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ // 预警消息
+ StringBuilder content = new StringBuilder();
+ content.append(configItem.getTitle().replace("预警", ""));
+ content.append(DateUtils.format(alarmMessage.getOutTime(), DateUtils.FORMAT_SIMPLE_TIME));
+ content.append("，");
+ content.append("即将");
+ if (dataValue.compareTo(configItem.getLowerLimit()) < 0) {
+ content.append("低与下限");
+ alarmMessage.setAlarmType(CommonConstant.EXCEEDING_LOWER_LIMIT);
+
+ } else if (dataValue.compareTo(configItem.getUpperLimit()) > 0) {
+ content.append("超出上限");
+ alarmMessage.setAlarmType(CommonConstant.EXCEEDING_UPPER_LIMIT);
+ }
+ alarmMessage.setContent(content.toString());
+ mcsApi.createAlarmMessage(alarmMessage);
+ alarmList.add(alarmMessage);
+ continue outerLoop;
}
- alarmMessage.setContent(content.toString());
- mcsApi.createAlarmMessage(alarmMessage);
- alarmList.add(alarmMessage);
+
+ // 对比累计值是否超限
+ if (configItem.getCulUpper() != null && configItem.getCulLower() != null) {
+ Double culValue = Double.valueOf(0.0);
+ for (Object[] data : result) {
+ culValue += Double.parseDouble(data[1].toString());
+ if (culValue.compareTo(configItem.getCulLower().doubleValue()) >= 0 && culValue.compareTo(configItem.getCulUpper().doubleValue()) <= 0) {
+ log.info("累计值不超限");
+ continue;
+ }
+
+ // 生成预警信息
+ AlarmMessageRespDTO alarmMessage = new AlarmMessageRespDTO();
+ alarmMessage.setConfigId(configItem.getId());
+ alarmMessage.setTitle(configItem.getTitle());
+ alarmMessage.setAlarmObj(configItem.getAlarmObj());
+ alarmMessage.setAlarmTime(predictTime);
+ // 设置超出时间
+ alarmMessage.setOutTime(DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ StringBuilder content = new StringBuilder();
+ content.append(configItem.getTitle().replace("预警", ""));
+ content.append(DateUtils.format(alarmMessage.getOutTime(), DateUtils.FORMAT_SIMPLE_TIME));
+ content.append("，");
+ content.append("即将");
+
+ if (culValue.compareTo(configItem.getCulUpper().doubleValue()) > 0) {
+ content.append("超出累计值上限");
+ alarmMessage.setAlarmType(CommonConstant.EXCEEDING_UPPER_LIMIT);
+ }
+ if (culValue.compareTo(configItem.getCulLower().doubleValue()) < 0) {
+ content.append("低于累计值下限");
+ alarmMessage.setAlarmType(CommonConstant.EXCEEDING_LOWER_LIMIT);
+ }
+ alarmMessage.setContent(content.toString());
+ mcsApi.createAlarmMessage(alarmMessage);
+ alarmList.add(alarmMessage);
+ continue outerLoop;
+ }
+ }
}
}
if (!CollectionUtils.isEmpty(alarmList)) {
--
Gitblit v1.9.3