From 08565501239449cc1f686918135c23c0c98e5625 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 18 三月 2025 15:32:37 +0800
Subject: [PATCH] LDG产生预警消息

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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 4f41447..9cfbbbd 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
@@ -1,5 +1,6 @@
 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;
@@ -61,8 +62,13 @@
             Date predictTime = DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
             // 预测模块/预测管网
             String moduleType = messageJson.get("moduleType").toString();
-            if (moduleType.equals(CommonConstant.NET_BFG) || moduleType.equals(CommonConstant.NET_COG) || moduleType.equals(CommonConstant.NET_LDG1) || moduleType.equals(CommonConstant.NET_LDG2) || moduleType.equals(CommonConstant.NET_LDG3)) {
-                String runKey = "GasAlarm_" +  predictTime.getTime();
+            if (moduleType.equals(CommonConstant.NET_BFG) || moduleType.equals(CommonConstant.NET_COG) ||
+                    moduleType.equals(CommonConstant.NET_LDG) ||
+                    moduleType.equals(CommonConstant.NET_LDG1) ||
+                    moduleType.equals(CommonConstant.NET_LDG2) ||
+                    moduleType.equals(CommonConstant.NET_LDG3)) {
+                log.info("moduleType:" + moduleType);
+                String runKey = "GasAlarm_" + predictTime.getTime();
                 log.info("runKey:" + runKey);
                 log.info("lastRunAlarm:" + lastRunAlarm);
                 if (lastRunAlarm.equals(runKey)) {
@@ -73,8 +79,8 @@
                 // 预警信息列表
                 List<AlarmMessageRespDTO> alarmList = new ArrayList<>();
                 // 根据管网查询相关预警配置
-                Map<String,Object> params = new HashMap<>();
-                params.put("alarmObj",moduleType);
+                Map<String, Object> params = new HashMap<>();
+                params.put("alarmObj", moduleType);
                 List<AlarmConfigRespDTO> configList = mcsApi.listAlarmConfig(params);
                 if (CollectionUtils.isEmpty(configList)) {
                     log.info("AlarmConfigList is empty");
@@ -94,11 +100,12 @@
                 }
                 outerLoop:
                 for (AlarmConfigRespDTO configItem : configList) {
-                    log.info("configItem: " + configItem);
+                    log.info("AlarmConfigItem: " + configItem);
                     List<Object[]> result = preData.get(configItem.getOutId());
                     if (CollectionUtils.isEmpty(result)) {
                         continue;
                     }
+                    log.info("AlarmPreData: " + JSONArray.toJSONString(result));
 
                     // 对比预测值是否超限
                     int toIndex = result.size();
@@ -109,6 +116,7 @@
                         if (dataValue.compareTo(configItem.getLowerLimit()) >= 0 && dataValue.compareTo(configItem.getUpperLimit()) <= 0) {
                             continue;
                         }
+                        log.info("AlarmOutValue: " + dataValue);
                         // 预警记录
                         AlarmMessageRespDTO alarmMessage = new AlarmMessageRespDTO();
                         alarmMessage.setConfigId(configItem.getId());

--
Gitblit v1.9.3