From c31c36e90eed9bf740496d8a2ee4b84165f995c9 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Thu, 17 Apr 2025 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TerminalTreeServiceImpl.java   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 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 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<TerminalTree> 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<TerminalTree> devList = userLineMap.get(terminalTree.getId());
-                    terminalTrees.addAll(devList);
-                }
                 terminalTree.setChildren(terminalTrees);
             } else {
                 terminalTree.setChildren(terminalTrees);