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 impl List temList = page.getRecords(); - List terminalIds = temList.stream().map(Monitor::getTerminalId).distinct().collect(Collectors.toList()); - List pmsTerminalList = terminalMapper.selectList(new LambdaQueryWrapper().in(PmsTerminal::getId,terminalIds)); - Map mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId,Function.identity())); - - List busIds = temList.stream().map(Monitor::getLineId).distinct().collect(Collectors.toList()); - List generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper().in(GeneratrixWire::getId,busIds)); - Map 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 terminalIds = temList.stream().map(Monitor::getTerminalId).distinct().collect(Collectors.toList()); + List pmsTerminalList = terminalMapper.selectList(new LambdaQueryWrapper().in(PmsTerminal::getId, terminalIds)); + Map mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId, Function.identity())); - if(mapBus.containsKey(item.getLineId())){ - item.setBusId(mapBus.get(item.getLineId()).getMidBusId()); - } + List busIds = temList.stream().map(Monitor::getLineId).distinct().collect(Collectors.toList()); + List generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper().in(GeneratrixWire::getId, busIds)); + Map 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);