From bdb3efd81d4d56fc3f7109fdeda622ab666485db Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 30 Jun 2025 11:06: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

---
 .../transientes/pojo/vo/AlarmAnalysisVO.java  | 10 ++---
 .../event/transientes/pojo/vo/MapCountVO.java |  2 +-
 .../impl/LargeScreenCountServiceImpl.java     | 45 ++++++++++++++++---
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java
index a9a8e1c9..d998dc52 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java
+++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java
@@ -32,11 +32,11 @@ public class AlarmAnalysisVO {
     @ApiModelProperty(name="lookNoticeCount",value="远程通知处置数")
     private Integer lookNoticeCount;
 
-    List<PqsEventdetail> eventdetails;
-    List<PqsEventdetail> aLarmEvent;
-    List<PqsEventdetail> warnEvent;
+    List<EventDetailVO> eventdetails;
+    List<EventDetailVO> aLarmEvent;
+    List<EventDetailVO> warnEvent;
     List<MsgEventInfo> noticeEvent;
-    List<PqsEventdetail> lookALarmEvent;
-    List<PqsEventdetail> lookWarnEvent;
+    List<EventDetailVO> lookALarmEvent;
+    List<EventDetailVO> lookWarnEvent;
     List<MsgEventInfo> lookNoticeEvent;
 }
diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java
index 59a33b1f..47f3fb9b 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java
+++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java
@@ -24,6 +24,6 @@ public class MapCountVO {
     private Integer noticeCount;
 
     private List<LedgerBaseInfoDTO> lineList;
-    private List<PqsEventdetail> eventList;
+    private List<EventDetailVO> eventList;
     private List<MsgEventInfo> noticeList;
 }
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 238681dc..dd39f64f 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
@@ -236,12 +236,12 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         alarmAnalysisVO.setLookNoticeCount(lookNoticeCount);
 
 
-        alarmAnalysisVO.setEventdetails(eventdetails);
-        alarmAnalysisVO.setALarmEvent(aLarmEvent);
-        alarmAnalysisVO.setWarnEvent(warnEvent);
+        alarmAnalysisVO.setEventdetails(change(eventdetails));
+        alarmAnalysisVO.setALarmEvent(change(aLarmEvent));
+        alarmAnalysisVO.setWarnEvent(change(warnEvent));
         alarmAnalysisVO.setNoticeEvent(msgEventInfoList);
-        alarmAnalysisVO.setLookALarmEvent(lookALarmEvent);
-        alarmAnalysisVO.setLookWarnEvent(lookWarnEvent);
+        alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent));
+        alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent));
         alarmAnalysisVO.setLookNoticeEvent(handleMsg);
 
 
@@ -538,12 +538,13 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
             List<LedgerBaseInfoDTO> ledgerBaseInfoDTOS = pqLineService.queryListByIds(v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()));
             mapCountVO.setLineList(ledgerBaseInfoDTOS);
             List<Integer> deptslineIds = v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList());
-
             List<PqsEventdetail> eventdetails = pqsEventdetailService.lambdaQuery()
                     .between(PqsEventdetail::getTimeid, startTime, endTime)
                     .in(PqsEventdetail::getLineid, deptslineIds).list();
             mapCountVO.setEventCount(eventdetails.size());
-            mapCountVO.setEventList(eventdetails);
+            List<EventDetailVO> change = change(eventdetails);
+
+            mapCountVO.setEventList(change);
             List<String> eveIdndex = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList());
             List<MsgEventInfo> temp = new ArrayList<>();
             if(!CollectionUtils.isEmpty(eveIdndex)){
@@ -647,6 +648,36 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         return true;
     }
 
+    private List<EventDetailVO> change(List<PqsEventdetail> list){
+        List<EventDetailVO> result = new ArrayList<>();
+        List<Integer> lineidList = list.stream().map(PqsEventdetail::getLineid).collect(Collectors.toList());
+
+        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 -> {
+            EventDetailVO eventDetailVO = new EventDetailVO();
+            eventDetailVO.setEventdetail_index(temp.getEventdetailIndex());
+            eventDetailVO.setTimeid(temp.getTimeid());
+            eventDetailVO.setMs(temp.getMs());
+            eventDetailVO.setWavetype(temp.getWavetype().toString());
+            eventDetailVO.setPersisttime(temp.getPersisttime().toString());
+            eventDetailVO.setEventvalue(temp.getEventvalue());
+            eventDetailVO.setLookFlag(temp.getLookFlag());
+            eventDetailVO.setNoticeFlag(temp.getNoticeFlag());
+            if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){
+                LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid());
+                eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
+                eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
+                eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
+                eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName());
+            }
+            return eventDetailVO;
+        }).collect(Collectors.toList());
+
+        return result;
+    }
+