From 6f3ae8f858cc9c9667a1031d2323ad0861b330a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Wed, 20 Dec 2023 15:20:51 +0800
Subject: [PATCH] =?UTF-8?q?pms=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/impl/MonitorServiceImpl.java | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
index 4279808ae..3e4579eb8 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
@@ -214,27 +214,31 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
 
         List<Monitor> temList = page.getRecords();
 
-        List<String> terminalIds = temList.stream().map(Monitor::getTerminalId).distinct().collect(Collectors.toList());
-        List<PmsTerminal> pmsTerminalList = terminalMapper.selectList(new LambdaQueryWrapper<PmsTerminal>().in(PmsTerminal::getId,terminalIds));
-        Map<String,PmsTerminal> mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId,Function.identity()));
-
-        List<String> busIds = temList.stream().map(Monitor::getLineId).distinct().collect(Collectors.toList());
-        List<GeneratrixWire> generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper<GeneratrixWire>().in(GeneratrixWire::getId,busIds));
-        Map<String,GeneratrixWire> mapBus = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId,Function.identity()));
 
 
-        temList = temList.stream().peek(item -> {
-            if(mapTerminal.containsKey(item.getTerminalId())){
-                item.setTerminalCode(mapTerminal.get(item.getTerminalId()).getTerminalCode());
-            }
+        if(CollUtil.isNotEmpty(temList)) {
+            List<String> terminalIds = temList.stream().map(Monitor::getTerminalId).distinct().collect(Collectors.toList());
+            List<PmsTerminal> pmsTerminalList = terminalMapper.selectList(new LambdaQueryWrapper<PmsTerminal>().in(PmsTerminal::getId, terminalIds));
+            Map<String, PmsTerminal> mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId, Function.identity()));
 
-            if(mapBus.containsKey(item.getLineId())){
-                item.setBusId(mapBus.get(item.getLineId()).getMidBusId());
-            }
+            List<String> busIds = temList.stream().map(Monitor::getLineId).distinct().collect(Collectors.toList());
+            List<GeneratrixWire> generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper<GeneratrixWire>().in(GeneratrixWire::getId, busIds));
+            Map<String, GeneratrixWire> mapBus = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId, Function.identity()));
 
-            item.setStandShortCapacity(COverlimit.getStandShortCap(map.get(item.getVoltageLevel()).getValue()));
 
-        }).collect(Collectors.toList());
+            temList = temList.stream().peek(item -> {
+                if (mapTerminal.containsKey(item.getTerminalId())) {
+                    item.setTerminalCode(mapTerminal.get(item.getTerminalId()).getTerminalCode());
+                }
+
+                if (mapBus.containsKey(item.getLineId())) {
+                    item.setBusId(mapBus.get(item.getLineId()).getMidBusId());
+                }
+
+                item.setStandShortCapacity(COverlimit.getStandShortCap(map.get(item.getVoltageLevel()).getValue()));
+
+            }).collect(Collectors.toList());
+        }
 
 
         page.setRecords(temList);