From 5e5fc60968f7d2256508f046a7e3cd45bbcf2914 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Sat, 6 May 2023 08:52:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/DeviceAbnormaStatisticsServiceImpl.java  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java
index ab8f8538f..9d5048e96 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java
@@ -47,16 +47,9 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist
         // 根据装置id分组
         Map<String, List<AlarmPO>> devMap = lines.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId));
         // 监测点集合
-//        List<String> monotorIds = lines.stream().map(AlarmPO::getId).collect(Collectors.toList());
+        List<String> monotorIds = lines.stream().map(AlarmPO::getId).collect(Collectors.toList());
         // 装置id集合
-//        List<String> devIds = new ArrayList<>(devMap.keySet());
-
-        List<AlarmPO> monitors = devMap.get("f82ab14fd5950ac5f7deaf75af360333");
-        List<String> monotorIds = monitors.stream().map(AlarmPO::getId).collect(Collectors.toList());
-        List<String> devIds = new ArrayList(Collections.singleton("f82ab14fd5950ac5f7deaf75af360333"));
-        Map<String, List<AlarmPO>> map = new HashMap<>();
-        map.put("f82ab14fd5950ac5f7deaf75af360333",monitors);
-
+        List<String> devIds = new ArrayList<>(devMap.keySet());
         // 获取异常告警策略
         List<AlarmStrategyVO> alarmStrategyVOS = deviceAbnormaStatisticsMapper.selectAlarmStrategy();
         Map<Integer, List<AlarmStrategyVO>> levMap = alarmStrategyVOS.stream().collect(Collectors.groupingBy(AlarmStrategyVO::getAlgoDesc));
@@ -91,7 +84,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist
         }
         // 整合装置信息
         List<TopMsgPO> topMsgPOS = new ArrayList<>();
-        for (Map.Entry<String, List<AlarmPO>> devEntry : map.entrySet()) {
+        for (Map.Entry<String, List<AlarmPO>> devEntry : devMap.entrySet()) {
             TopMsgPO topMsg = new TopMsgPO();
             topMsg.setDevId(devEntry.getKey());
             int deviceLevel = devEntry.getValue().stream().mapToInt(AlarmPO::getLevel).min().orElse(-1);