diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java index c1e5bc6a5..019ae129a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java @@ -265,12 +265,12 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { tree.setPid(userLedgerVO.getStationId()); tree.setId(userLedgerVO.getId()); tree.setChildren(monitorList); - int devSize = (int) monitorList.stream().map(x -> { + /* int devSize = (int) monitorList.stream().map(x -> { // 获取父id字符串,通过 逗号 分割 成一个数组 String[] pid = x.getPids().split(StrUtil.COMMA); return pid[LineBaseEnum.DEVICE_LEVEL.getCode()]; - }).distinct().count(); - tree.setName(userLedgerVO.getProjectName() + "(" + devSize + "台装置)"); + }).distinct().count();*/ + tree.setName(userLedgerVO.getProjectName()); temList.add(tree); }); @@ -334,18 +334,17 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { } if (isLine) { //变电站集合 + if(userLineMap.containsKey(terminalTree.getId())){ + List devList = userLineMap.get(terminalTree.getId()); + terminalTrees.addAll(devList); + } + int size = (int) terminalTrees.stream().map(x -> { // 获取父id字符串,通过 逗号 分割 成一个数组 String[] pid = x.getPids().split(StrUtil.COMMA); return pid[LineBaseEnum.DEVICE_LEVEL.getCode()]; }).distinct().count(); - terminalTree.setName(terminalTree.getName() + "(" + size + "台装置)"); - - if(userLineMap.containsKey(terminalTree.getId())){ - List devList = userLineMap.get(terminalTree.getId()); - terminalTrees.addAll(devList); - } terminalTree.setChildren(terminalTrees); } else { terminalTree.setChildren(terminalTrees);