From a74e9ab915a1254f8a3056aeb33547472caabc0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 2 Nov 2023 08:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/device/pq/mapper/LineMapper.java | 2 +-
 .../njcn/device/pq/service/impl/GeneralDeviceService.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
index 2f5bd6105..9aa2f2a7d 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
@@ -410,7 +410,7 @@ public interface LineMapper extends BaseMapper<Line> {
             "\t\tFROM\n",
             "\t\t\tpq_line a\n",
             "\t\tINNER JOIN pq_device b ON a.id = b.id\n",
-            "where b.Run_Flag = 0 and a.Pid in",
+            "where b.com_flag = 0 and a.Pid in",
             "<foreach item='item' index='index' collection='items' open='(' separator=',' close=')'>",
             "#{item}",
             "</foreach>",
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
index 92bcd455d..0e965efd7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
@@ -712,10 +712,10 @@ public class GeneralDeviceService {
 
         List<GeneralDeviceDTO> deptDeviceInfos = this.getDeviceInfoAsDept(deviceInfoParam, Stream.of(0, 1).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
 
-        List<String> DeviceIds = deptDeviceInfos.stream().map(GeneralDeviceDTO::getSubIndexes).flatMap(Collection::stream).collect(Collectors.toList());
-        Integer substationCount = DeviceIds.size();
+        List<String> subIds = deptDeviceInfos.stream().map(GeneralDeviceDTO::getSubIndexes).flatMap(Collection::stream).collect(Collectors.toList());
+        Integer substationCount = subIds.size();
 
-        Integer count = lineMapper.queryOnlineSubstaion(DeviceIds);
+        Integer count = lineMapper.queryOnlineSubstaion(subIds);
         deptSubstationDetailVO.setSubstationCount(substationCount);
         deptSubstationDetailVO.setRunsubstationCount(count);
         BigDecimal rate = BigDecimal.valueOf(count).divide(BigDecimal.valueOf(substationCount), 4, BigDecimal.ROUND_HALF_UP);