From b045860a43ec94e8a635ba07309d5bb0890783ab Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 9 Jul 2025 16:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java | 5 ++++-
 .../njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml   | 2 +-
 .../csharmonic/service/impl/CsEventUserPOServiceImpl.java    | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
index 8f96ce9..ac2d49c 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
@@ -116,8 +116,11 @@ public class EventDetailVO {
     //用于波形分析区别pms，pq
     private String systemType="ZL";
 
+    @ApiModelProperty("子模块编号")
+    private String modelNo;
 
 
-
+    @ApiModelProperty("逻辑子设备编码")
+    private Integer clDid;
 
 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
index 6b422e0..d2b7a5e 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
@@ -121,7 +121,7 @@
   <select id="queryEventPageWeb" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">
     select DISTINCT b.id id,
     b.device_id deviceId,b.line_id lineId,b.code code,
-    b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location
+    b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,b.cl_did clDid
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
     ,d.name lineName
     </if>
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index c75d366..da62c03 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -422,6 +422,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
             EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
             temp.setShowName(ele.getShowName());
             temp.setCode(ele.getDefaultValue());
+            if (temp.getLineId().endsWith("0")) {
+                temp.setModelNo("模块" + temp.getClDid());
+            }
             if(Objects.equals(csEventUserQueryPage.getType(),"0")){
 
                 List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();