From f1f86ea854473b0c06172a224529da69c56bd96b Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 3 Jul 2025 11:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=89=88=E6=9C=AC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml | 1 + .../java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java | 1 + .../njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java | 3 ++- .../transientes/service/impl/LargeScreenCountServiceImpl.java | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml index abece248..2d68e329 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml @@ -38,6 +38,7 @@ PQ_SUBVOLTAGE.name busBarName, pq_device.dev_index devId, pq_device.name devName, + pq_device.Status runFlag, PQ_SUBSTATION.sub_index stationId, PQ_SUBSTATION.name stationName from diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java index 3d2d2500..8e4561a0 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java @@ -23,5 +23,6 @@ public class DeviceDTO { private LocalDateTime updateTime; private String devFlag; private String ip; + //通讯状态 private Integer runFlag=0; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java index a17f6439..04997b08 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java @@ -27,7 +27,8 @@ public class LedgerBaseInfoDTO { private Integer stationId; private String stationName; + //通讯状态 + private Integer runFlag=0; - private Integer runFlag=0;; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index 8372d9d5..c7561fe8 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -125,7 +125,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { long runDevCount = runDevList.stream().count(); List runSubList = list.stream().map(PqDevice::getSubIndex).distinct().collect(Collectors.toList()); long runSubCount = runSubList.stream().count(); - List runLineList = pqLineList.stream().filter(temp->runDevList.contains(temp.getDevIndex())).map(PqLine::getLineIndex).collect(Collectors.toList()); + List ledgerBaseInfoDTOS = pqLineService.getBaseLineInfo(allLineIds); + List runLineList = ledgerBaseInfoDTOS.stream().filter(temp->Objects.equals(temp.getStatus(),1)).map(LedgerBaseInfoDTO::getLineId).collect(Collectors.toList()); long runLineCount = runLineList.stream().count(); @@ -138,7 +139,6 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { ledgerCountVO.setRunSubCount(runSubCount); ledgerCountVO.setRunLineCount(runLineCount); - List ledgerBaseInfoDTOS = pqLineService.getBaseLineInfo(allLineIds); ledgerBaseInfoDTOS.stream().forEach(temp->temp.setRunFlag(runLineList.contains(temp.getLineId())?1:0)); ledgerCountVO.setAllLineList(ledgerBaseInfoDTOS); List deviceDTOS = pqDeviceService.queryListByIds(devList);