From 401195fc7b44a899af057ea3b05a34af60ac192a Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 29 Nov 2024 11:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=8D=97=E5=A4=A7=E5=B1=8Fbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=94=B5=E7=AB=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/device/pq/pojo/vo/EventVO.java    | 5 +++++
 .../event/mapper/majornetwork/mapping/LargeScreenMapper.xml  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventVO.java
index b9d18bfad..0d0ea7013 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventVO.java
@@ -27,6 +27,11 @@ public class EventVO implements Serializable {
     @ApiModelProperty("监测点名称")
     private String name;
 
+    @ApiModelProperty("变电站名称")
+    private String subName;
+
+
+
     /**
      * 暂降原因
      */
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 932b2c521..7b277847b 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
@@ -363,9 +363,10 @@
 
     <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
+            ed.event_id as eventId, ed.start_time  "time",pl.Name "name",sub.Name subName,ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
             from pq_line pl
             left join r_mp_event_detail ed on pl.id = ed.measurement_point_id
+            left join pq_line sub on SUBSTRING_INDEX(SUBSTRING_INDEX(pl.Pids, ',', 4), ',', -1)=sub.id
             <where>
                 ed.measurement_point_id in
                 <foreach collection="lineIds" item="item" open="(" close=")" separator=",">