From de138328e99ba91305d13b198050acecc5ea5060 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 30 Jun 2025 16:02:49 +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

---
 .../event/devcie/mapper/mapping/PqDeviceMapper.xml       | 8 ++++----
 .../com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java | 9 +++++++--
 .../service/impl/LargeScreenCountServiceImpl.java        | 6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml
index 17045c94..b041b537 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml
+++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml
@@ -32,8 +32,9 @@
     select
     pq_device.dev_index devId,
     pq_device.name devName,
-    PQ_SUBVOLTAGE.SUBV_INDEX busBarId,
-    PQ_SUBVOLTAGE.name busBarName,
+    pq_device.UpdateTime updateTime,
+    pq_device.DevFlag devFlag,
+    pq_device.IP ip,
     PQ_SUBSTATION.sub_index stationId,
     PQ_SUBSTATION.name stationName,
     PQ_GDINFORMATION.Name gdName
@@ -43,8 +44,7 @@
     PQ_SUBSTATION,
     PQ_GDINFORMATION
     where
-    PQ_SUBVOLTAGE.DEV_INDEX = pq_device.DEV_INDEX
-    and pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
+     pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
     and pq_device.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
     and pq_device.DEV_INDEX in
     <foreach collection="ids" item="item" open="(" close=")" separator=",">
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 5ee6941d..3d2d2500 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
@@ -1,7 +1,10 @@
 package com.njcn.gather.event.devcie.pojo.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * Description:
  * Date: 2025/06/27  下午 3:25【需求编号】
@@ -13,10 +16,12 @@ import lombok.Data;
 public class DeviceDTO {
    private Integer devId;
    private String devName;
-   private Integer busBarId;
-   private String busBarName;
    private Integer stationId;
    private String stationName;
    private String gdName;
+   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+   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/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
index 56836390..3099eec7 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
@@ -138,7 +138,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         ledgerBaseInfoDTOS.stream().forEach(temp->temp.setRunFlag(runLineList.contains(temp.getLineId())?1:0));
         ledgerCountVO.setAllLineList(ledgerBaseInfoDTOS);
         List<DeviceDTO> deviceDTOS = pqDeviceService.queryListByIds(devList);
-        deviceDTOS.forEach(temp->temp.setRunFlag(runDevList.contains(temp.getDevId())?1:0));
+        deviceDTOS =deviceDTOS.stream().distinct().collect(Collectors.toList());
+        deviceDTOS.forEach(temp-> temp.setRunFlag(runDevList.contains(temp.getDevId())?1:0));
         ledgerCountVO.setAllDevList(deviceDTOS);
         List<SubstationDTO> substationDTOS = pqSubstationService.queryListByIds(allSubList);
         substationDTOS.forEach(temp->temp.setRunFlag(runSubList.contains(temp.getStationId())?1:0));
@@ -437,6 +438,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         }).collect(Collectors.toList());
         Page<EventDetailVO> returnpage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize());
         returnpage.setRecords(collect);
+        returnpage.setTotal(list.getTotal());
         return returnpage;
     }
 
@@ -658,7 +660,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         List<LedgerBaseInfoDTO> pqLineList = pqLineMapper.getBaseLineInfo(lineidList);
         Map<Integer,LedgerBaseInfoDTO> ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
 
-        List<EventDetailVO> detailVOList = list.stream().map(temp -> {
+         result = list.stream().map(temp -> {
             EventDetailVO eventDetailVO = new EventDetailVO();
             eventDetailVO.setEventdetail_index(temp.getEventdetailIndex());
             eventDetailVO.setTimeid(temp.getTimeid());