From 6e7a55cb93e20b0bb5cd3eaa6f263af24231cc86 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 15 May 2025 09:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=BD=AE=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml  | 3 ++-
 .../service/majornetwork/Impl/EventDetailServiceImpl.java   | 6 ++++++
 .../src/main/java/com/njcn/system/enums/DicDataEnum.java    | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
index 34fc5d486..5e5bc06da 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
@@ -58,9 +58,10 @@
 
 
     <select id="getMonitorDetail" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
-        select a.id pointId,a.name pointName,b.Time_Interval timeInterval
+        select a.id pointId,a.name pointName,b.Time_Interval timeInterval,bus.pid devId
         from pq_line a
         inner join pq_line_detail b on a.id=b.id
+        inner join pq_line bus on a.pid =bus.id
         where a.id = #{monitorId}
     </select>
     <select id="getLineDetailByIds" resultType="com.njcn.device.pq.pojo.po.LineDetail">
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
index e2355433a..d73fcb8a9 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
@@ -138,6 +138,12 @@ public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEv
         rmpEventDetailPO.setPhase(deatilDTO.getPhase());
         rmpEventDetailPO.setWavePath(deatilDTO.getWavePath());
         rmpEventDetailPO.setEventDescribe(" ");
+        //默认都是其他
+        DictData reason = dicDataFeignClient.getDicDataByCode(DicDataEnum.RESON_REST.getCode()).getData();
+        DictData advanceType = dicDataFeignClient.getDicDataByCode(DicDataEnum.TYPE_REST.getCode()).getData();
+
+        rmpEventDetailPO.setAdvanceReason(reason.getId());
+        rmpEventDetailPO.setAdvanceType(advanceType.getId());
         String severity = EventUtil.getYzd(deatilDTO.getDuration().floatValue(),(deatilDTO.getAmplitude().floatValue()/100));
         rmpEventDetailPO.setSeverity(Double.valueOf(severity));
         rmpEventDetailPO.setCreateTime(LocalDateTime.now());
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
index e69c4d4fc..f5efd78ec 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
@@ -411,6 +411,11 @@ public enum DicDataEnum {
      * 暂降原因
      */
     SHORT_TROUBLE("短路故障", "Short_Trouble"),
+    TRANSFORMER_EXCITATION("变压器激磁", "Transformer_Excitation"),
+    RESON_REST("其他", "Reson_Rest"),
+    LARGE_INDUCTION("大型感应电动机启动", "Large_Induction"),
+    VOLTAGE_DISTURBANCE("电压扰动", "Voltage_Disturbance"),
+
 
     /**
      * 暂降类型