From fedc457da0075d5b8188f9cc8314671619828a7d Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 20 May 2025 15:25:46 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/pojo/vo/DevDetailVO.java   |  3 ++
 .../pq/pojo/vo/DeviceRunEvaluateVO.java       |  3 ++
 .../device/pq/mapper/mapping/LineMapper.xml   | 35 ++++++++++---------
 .../impl/DeviceRunEvaluateServiceImpl.java    |  7 +++-
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java
index 4c5979b6b..2be3c6c62 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java
@@ -23,6 +23,9 @@ public class DevDetailVO {
     @ApiModelProperty(name = "devName",value = "终端名称")
     private String devName;
 
+    @ApiModelProperty(name = "ip",value = "ip")
+    private String ip;
+
     @ApiModelProperty(name = "subName",value = "变电站名称")
     private String subName;
 
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java
index 1559d7dd1..ec2021be0 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java
@@ -20,6 +20,9 @@ public class DeviceRunEvaluateVO {
     @ApiModelProperty("变电站名称")
     private String subName;
 
+    @ApiModelProperty("ip")
+    private String ip;
+
     @ApiModelProperty("评价")
     private BigDecimal evaluate;
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index ad4529981..63c33bcc8 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -1835,24 +1835,27 @@
         where t1.state = 1
     </select>
     <select id="getLineDeviceByDevIds" resultType="com.njcn.device.pq.pojo.vo.DevDetailVO">
-        SELECT
-            t.id lineId,
-            t.NAME lineName,
-            dev.id devId,
-            dev.NAME devName,
-            sub.NAME subName,
-            td.Obj_Id objId
+        SELECT distinct
+        t.id lineId,
+        t.NAME lineName,
+        dev.id devId,
+        dev.NAME devName,
+        sub.NAME subName,
+        td.Obj_Id objId,
+        device.ip
         FROM
-            pq_line t,
-            pq_line_detail td,
-            pq_line subv,
-            pq_line dev,
-            pq_line sub
+        pq_line t,
+        pq_line_detail td,
+        pq_line subv,
+        pq_line dev,
+        pq_device device,
+        pq_line sub
         WHERE
-            subv.id = t.pid
-            AND t.id = td.id
-            AND dev.id = subv.pid
-            AND sub.id = dev.pid
+        t.id = td.id
+        AND subv.id = t.pid
+        AND dev.id = subv.pid
+        AND dev.id = device.id
+        AND sub.id = dev.pid
         <if test="powerFlag!=null and powerFlag!=2">
             AND td.Power_Flag =#{powerFlag}
         </if>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java
index 365270532..9c94036be 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java
@@ -195,6 +195,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
                 DeviceRunEvaluateVO vo = new DeviceRunEvaluateVO();
                 vo.setName(split[1]);
                 vo.setSubName(split[2]);
+                vo.setIp(value.get(0).getIp());
                 setEvaluate(Arrays.asList(split[0]),
                         value.stream().map(DevDetailVO::getLineId).distinct().collect(Collectors.toList()),
                         onIntegrityList, vo, onlineRateList, limitRateList);
@@ -244,6 +245,9 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
                 }
             } else {
                 for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
+                    if(CollUtil.isEmpty(generalDeviceDTO.getDeviceIndexes())){
+                        continue;
+                    }
                     List<RStatIntegrityD> rStatIntegrityDList = new ArrayList<>();
                     List<RStatOnlinerateD> rStatOnlinerateDList = new ArrayList<>();
                     List<RStatLimitRateDPO> rStatLimitRateDPOList = new ArrayList<>();
@@ -252,7 +256,8 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
                 }
             }
         }
-        return result;
+
+        return result.stream().sorted(Comparator.comparing(TerminalEvaluateAreaVO::getScore, Comparator.reverseOrder())).collect(Collectors.toList());
     }
 
     @Override