From 46f54685b15d83978348de0eeb807d7d83728323 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Tue, 10 Dec 2024 14:58:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A05=E5=B1=82=E6=A0=91?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/service/impl/TerminalTreeServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 c519241bb..db91fbb77 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 @@ -180,10 +180,11 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { } //变电站 targetData = targetData.stream().peek(terminalTree -> { + System.out.println(groupLine.get(terminalTree.getId())); + System.out.println(terminalTree.getId()); + List terminalTrees = groupLine.get(terminalTree.getId()).stream().sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList()); if (isLine) { //变电站集合 - List terminalTrees = groupLine.get(terminalTree.getId()); - int size = terminalTrees.stream().map(x -> { // 获取父id字符串，通过 逗号 分割 成一个数组 String[] pid = x.getPids().split(","); @@ -192,7 +193,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { terminalTree.setName(terminalTree.getName() + "（" + size + "台装置）"); - terminalTree.setChildren(groupLine.get(terminalTree.getId())); + terminalTree.setChildren(terminalTrees); } else { terminalTree.setChildren(groupLine.get(terminalTree.getId())); }