From 6c2ddfab672b052ca6c4183a6a865a9e696bd193 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 30 Jul 2025 10:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=91=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=EF=BC=9B=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E6=80=A7=E5=88=97=E8=A1=A8=E5=8F=98=E7=94=B5=E7=AB=99=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml  | 1 +
 .../main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml | 2 +-
 .../device/pq/service/impl/LineIntegrityDataServiceImpl.java   | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
index d8d1b1cf4..f12d598e2 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
@@ -62,6 +62,7 @@
         <foreach collection="lineIndexes" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        order by sub.sort asc
     </select>
 
     <!--根据监测点索引集合获取监测点详细参数-->
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
index b0c08a5e8..3d59ca347 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TreeMapper.xml
@@ -381,7 +381,7 @@
             line.LEVEL,
             line.sort,
             line.pids,
-            CONCAT(voltage.name, '_', line.name) name,
+            CONCAT(voltage.name, '_', line.name, '(',device.`Name`,')') name,
             comFlag.Com_Flag,
             detail.pt_type,
             detail.obj_id
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
index 57bc5e404..cf4a65df8 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
@@ -150,9 +150,8 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
 
                 // 通过供电站索引查询供电站信息
                 List<LineIntegrityDataVO> subList = lineIntegrityDataMapper.getSubList(lineIds);
-                subList.sort(Comparator.comparingInt(LineIntegrityDataVO::getSort));
-
                 List<String> gdIds = subList.stream().map(LineIntegrityDataVO::getPid).distinct().collect(Collectors.toList());
+
                 // 通过供电公司索引查询供电公司信息
                 List<LineIntegrityDataVO> gdList = lineIntegrityDataMapper.getGdList(gdIds);