From b054386a79cbe386339c00aabacafcba900586a3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 28 二月 2025 14:49:04 +0800
Subject: [PATCH] 模拟调整

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java |  152 ++++++++++++++++++++++++++++----------------------
 1 files changed, 84 insertions(+), 68 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 bc5631a..4f41447 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
@@ -61,18 +61,7 @@
             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)) {
-                log.info("AlarmConfigList is empty");
-                return;
-            }
-            List<String> outputIdList = configList.stream().map(item -> {
-                return item.getOutId();
-            }).collect(Collectors.toList());
-            List<AlarmMessageRespDTO> alarmList = new ArrayList<>();
-            if (moduleType.equals(CommonConstant.NET_BFG) || moduleType.equals(CommonConstant.NET_COG) ||
-                    moduleType.equals(CommonConstant.NET_LDG)) {
+            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();
                 log.info("runKey:" + runKey);
                 log.info("lastRunAlarm:" + lastRunAlarm);
@@ -80,69 +69,57 @@
                     return;
                 }
                 lastRunAlarm = runKey;
-                for (AlarmConfigRespDTO configItem : configList) {
-                    PreDataJsonReqVO reqVO = new PreDataJsonReqVO();
-                    reqVO.setPredictTime(predictTime);
-                    reqVO.setOutputIdList(outputIdList);
-                    Map<String, List<Object[]>> preData = mcsApi.getPreDataCur(reqVO);
-                    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<AlarmMessageRespDTO> alarmList = new ArrayList<>();
+                // 根据管网查询相关预警配置
+                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");
+                    return;
+                }
+                List<String> outputIdList = configList.stream().map(item -> {
+                    return item.getOutId();
+                }).collect(Collectors.toList());
+
+                // 查询预测结果
+                PreDataJsonReqVO reqVO = new PreDataJsonReqVO();
+                reqVO.setPredictTime(predictTime);
+                reqVO.setOutputIdList(outputIdList);
+                Map<String, List<Object[]>> preData = mcsApi.getPreDataCur(reqVO);
+                if (CollectionUtils.isEmpty(preData)) {
+                    return;
+                }
+                outerLoop:
+                for (AlarmConfigRespDTO configItem : configList) {
+                    log.info("configItem: " + configItem);
                     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();
-                    content.append(configItem.getTitle().replace("预警", ""));
-                    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("预测值不超限");
                             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("即将");
@@ -157,16 +134,55 @@
                         alarmMessage.setContent(content.toString());
                         mcsApi.createAlarmMessage(alarmMessage);
                         alarmList.add(alarmMessage);
-                        break;
+                        continue outerLoop;
+                    }
+
+                    // 对比累计值是否超限
+                    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) {
+                                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)) {
-                log.info("发送预警消息");
-                Map<String, Object> msg = new HashMap<>(2);
-                msg.put("predictTime", DateUtils.format(predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-                msg.put("alarmList", alarmList);
-                rabbitTemplate.convertAndSend(RoutingConstant.EXCHANGE, RoutingConstant.Iailab_Model_Alarm, msg);
+
+                if (!CollectionUtils.isEmpty(alarmList)) {
+                    log.info("发送预警消息");
+                    Map<String, Object> msg = new HashMap<>(2);
+                    msg.put("predictTime", DateUtils.format(predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+                    msg.put("alarmList", alarmList);
+                    rabbitTemplate.convertAndSend(RoutingConstant.EXCHANGE, RoutingConstant.Iailab_Model_Alarm, msg);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

--
Gitblit v1.9.3