From a27f1a6e238880ea52e0734083aa04ad360a27a2 Mon Sep 17 00:00:00 2001 From: wurui Date: Thu, 23 Mar 2023 15:39:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A2=E5=BD=A2=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/event/pojo/vo/PwRmpEventDetailVO.java | 12 ++++++++++++ .../com/njcn/event/pojo/vo/RmpEventDetailVO.java | 6 ++++++ .../Impl/PwRmpEventDetailServiceImpl.java | 1 + 3 files changed, 19 insertions(+) diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/PwRmpEventDetailVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/PwRmpEventDetailVO.java index 4ffacd9d0..a7c40cf72 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/PwRmpEventDetailVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/PwRmpEventDetailVO.java @@ -66,6 +66,12 @@ public class PwRmpEventDetailVO implements Serializable { @ApiModelProperty(name = "monitorVoltageLevel",value = "监测点电压等级") private String monitorVoltageLevel; + /** + * 暂时事件ID + */ + @ApiModelProperty(name = "eventId",value = "暂时事件ID") + private String eventId; + /** * 暂态事件类型 */ @@ -91,6 +97,12 @@ public class PwRmpEventDetailVO implements Serializable { @ApiModelProperty(name = "featureAmplitude", value = "特征幅值") private Double featureAmplitude; + /** + * 系统名称 + */ + @ApiModelProperty(name = "系统名称") + private String systemType="pms"; + /** * 波形路径 */ diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RmpEventDetailVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RmpEventDetailVO.java index f4d30f25b..d388ab7d4 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RmpEventDetailVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RmpEventDetailVO.java @@ -86,6 +86,12 @@ public class RmpEventDetailVO implements Serializable { @ApiModelProperty(name = "featureAmplitude",value = "特征幅值") private Double featureAmplitude; + /** + * 系统名称 + */ + @ApiModelProperty(name = "系统名称") + private String systemType="pms"; + /** * 波形路径 */ diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwRmpEventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwRmpEventDetailServiceImpl.java index ea8ce447d..fca86d284 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwRmpEventDetailServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwRmpEventDetailServiceImpl.java @@ -81,6 +81,7 @@ public class PwRmpEventDetailServiceImpl implements PwRmpEventDetailService { PwRmpEventDetailVO vo = new PwRmpEventDetailVO(); BeanUtils.copyProperties(po, vo); vo.setMonitorId(po.getMeasurementPointId()); + vo.setEventId(po.getEventId()); vo.setOrgId(pwPmsMonitorDTOMap.get(po.getMeasurementPointId()).getOrgId()); vo.setOrgName(pwPmsMonitorDTOMap.get(po.getMeasurementPointId()).getOrgName()); vo.setMonitorSort(pwPmsMonitorDTOMap.get(po.getMeasurementPointId()).getMonitorSort());