From f3f3dd90709c118b21d7414c3a6b1aa55a7cab8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 23 Mar 2023 16:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/event/pojo/vo/RmpEventDetailVO.java |  4 ++++
 .../majornetwork/Impl/RmpEventDetailServiceImpl.java  | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

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 d388ab7d4..d97a2f26c 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
@@ -98,5 +98,9 @@ public class RmpEventDetailVO implements Serializable {
     @ApiModelProperty(name = "wavePath",value = "波形路径")
     private String wavePath;
 
+    @ApiModelProperty(name = "powerStationName",value = "电站名称")
+    private String powerStationName;
+
+
 }
 
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
index 5183c7b85..2fbeff035 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
@@ -106,13 +106,14 @@ public class RmpEventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper,
         // 属性赋值
         return detailsOfTransientEvents.stream().map(po -> {
             RmpEventDetailVO vo = new RmpEventDetailVO();
-            for (PmsGeneralDeviceDTO dto : data) {
-                if (dto.getMonitorIdList().contains(po.getMeasurementPointId())) {
-                    BeanUtils.copyProperties(po, vo);
-                    vo.setDeptName(dto.getName());
+            BeanUtils.copyProperties(po, vo);
+            for (PmsMonitorDTO dto : monitorInfo) {
+                if (dto.getId().equals(po.getMeasurementPointId())) {
+                    vo.setDeptName(dto.getOrgName());
                     vo.setMonitorSort(monitorSort);
-                    vo.setMeasurementPointName(monitorInfoMap.get(po.getMeasurementPointId()));
+                    vo.setMeasurementPointName(dto.getName());
                     vo.setEventType(eventStatisDataMap.get(po.getEventType()));
+                    vo.setPowerStationName(dto.getPowerrName());
                 }
             }
             return vo;