From 1707ce3ed2fbcf020391c89564cace58ad89b421 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 12 Apr 2023 12:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=90=E6=B3=A2=E8=A3=85=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/impl/TerminalTreeServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 1e9733f3b..872743f6c 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 @@ -166,11 +166,20 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { } else { groupLine = childrenData.stream().collect(Collectors.groupingBy(TerminalTree::getPid)); } + //变电站 targetData = targetData.stream().peek(terminalTree -> { if(isLine){ - //监测点的数量 - int size = groupLine.get(terminalTree.getId()).size(); + //变电站集合 + List terminalTrees = groupLine.get(terminalTree.getId()); + + int size = terminalTrees.stream().map(x -> { + // 获取父id字符串，通过 逗号 分割 成一个数组 + String[] pid = x.getPids().split(","); + return pid[LineBaseEnum.DEVICE_LEVEL.getCode()]; + }).distinct().collect(Collectors.toList()).size(); + terminalTree.setName(terminalTree.getName()+"（"+size+"台装置）"); + terminalTree.setChildren(groupLine.get(terminalTree.getId())); }else{ terminalTree.setChildren(groupLine.get(terminalTree.getId()));