设备树添加设备名称；完整性列表变电站排序

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>
 
     <!--根据监测点索引集合获取监测点详细参数-->

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

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);