Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

事件添加模块信息

Browse Source
This commit is contained in:
xy
2025-07-09 16:45:22 +08:00
parent c0c3ae4e41
commit b045860a43
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
View File

@@ -116,8 +116,11 @@ public class EventDetailVO {
//用于波形分析区别pms，pq //用于波形分析区别pms，pq
private String systemType="ZL"; private String systemType="ZL";
@ApiModelProperty("子模块编号")
private String modelNo;
@ApiModelProperty("逻辑子设备编码")
private Integer clDid;
} }

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
View File

@@ -121,7 +121,7 @@
<select id="queryEventPageWeb" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO"> <select id="queryEventPageWeb" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">
select DISTINCT b.id id, select DISTINCT b.id id,
b.device_id deviceId,b.line_id lineId,b.code code, 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 "> <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
,d.name lineName ,d.name lineName
</if> </if>

3
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
View File

@@ -422,6 +422,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData(); EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
temp.setShowName(ele.getShowName()); temp.setShowName(ele.getShowName());
temp.setCode(ele.getDefaultValue()); temp.setCode(ele.getDefaultValue());
if (temp.getLineId().endsWith("0")) {
temp.setModelNo("模块" + temp.getClDid());
}
if(Objects.equals(csEventUserQueryPage.getType(),"0")){ if(Objects.equals(csEventUserQueryPage.getType(),"0")){
List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData(); List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();