From 4ba34e084ab6e947a203a96ebf3e3f844020c61a Mon Sep 17 00:00:00 2001
From: zhangbaojian <1065122561@qq.com>
Date: Tue, 23 May 2023 09:44:59 +0800
Subject: [PATCH] =?UTF-8?q?zbj//1.=E5=A4=A7=E5=B1=8F=E4=B8=AD=E9=97=B450?=
 =?UTF-8?q?=E6=9D=A1=E6=9A=82=E9=99=8D=E4=BA=8B=E4=BB=B6=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=E5=8C=BA=E5=9F=9Fid=E7=AD=9B=E9=80=89=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/LargeScreenMapper.java       |  2 +-
 .../mapping/LargeScreenMapper.xml             |  8 ++++++--
 .../Impl/LargeScreenServiceImpl.java          | 20 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java
index e078d276b..b00fa5747 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java
@@ -26,7 +26,7 @@ public interface LargeScreenMapper {
 
     List<Map<String, Object>> getTimeCount(@Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<EventVO> eventLists(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("typeId") String typeId);
+    List<EventVO> eventLists(@Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("typeId") String typeId);
 
     AllDataVO getFlagCount(@Param("lineIds") List<String> lineIds);
 
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
index a64712e55..3d4f90a33 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
@@ -350,9 +350,13 @@
     <select id="eventLists" resultType="com.njcn.device.pq.pojo.vo.EventVO">
             SELECT
             ed.event_id as eventId, ed.start_time  "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
-            from r_mp_event_detail ed
-            left join pq_line pl on pl.id = ed.measurement_point_id
+            from pq_line pl
+            left join r_mp_event_detail ed on pl.id = ed.measurement_point_id
             <where>
+                ed.measurement_point_id in
+                <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
                 <if test="startTime != null and startTime != ''">
                     and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
                 </if>
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
index e3742cf6d..7125d703f 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
@@ -252,8 +252,26 @@ public class LargeScreenServiceImpl implements LargeScreenService {
      */
     @Override
     public List<EventVO> eventLists(LargeScreenParam largeScreenParam) {
+        DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
+        //部门索引
+        deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
+        //统计类型
+        SimpleDTO simpleDTO = new SimpleDTO();
+        simpleDTO.setCode(String.valueOf(StatisticsEnum.POWER_NETWORK));
+        deviceInfoParam.setStatisticalType(simpleDTO);
+        //添加时间
+        deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
+        deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime());
+        //添加服务名
+        deviceInfoParam.setServerName("event-boot");
+        // 获取所有数据
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
+
+        //获取所有监测点集合
+        List<String> lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
+
         DictData dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
-        return largeScreenMapper.eventLists(largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime(), dictData.getId());
+        return largeScreenMapper.eventLists(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime(), dictData.getId());
     }
 
     /**