From 8fc1645b04cd2d2b05a7ec7e13a2f17c3e69aa73 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Thu, 21 Nov 2024 16:35:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B2=B3=E5=8C=97=E7=BB=BC=E5=90=88=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/event/pojo/vo/RmpEventDetailVO.java    | 4 ++++
 .../src/main/java/com/njcn/harmonic/pojo/vo/ComAssessVO.java  | 3 +++
 .../com/njcn/harmonic/service/impl/ComAssessServiceImpl.java  | 2 ++
 3 files changed, 9 insertions(+)

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 a5ba4bab6..0029bc7b5 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
@@ -103,5 +103,9 @@ public class RmpEventDetailVO implements Serializable {
     private String powerStationName;
 
 
+    @ApiModelProperty(value = "波形文件是否从装置招到本地(0：未招，1：已招)默认值为0")
+    private Integer fileFlag;
+
+
 }
 
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ComAssessVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ComAssessVO.java
index 99d54edfd..23cc24611 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ComAssessVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ComAssessVO.java
@@ -19,6 +19,9 @@ public class ComAssessVO implements Serializable {
     @ApiModelProperty("名称")
     private String name;
 
+    @ApiModelProperty("索引")
+    private String id;
+
     @ApiModelProperty("评估分值")
     private Float data =3.14159f;
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java
index 87363c910..09eb66667 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java
@@ -156,6 +156,7 @@ public class ComAssessServiceImpl extends ServiceImpl<RStatComassesDMapper, RSta
                     }
                     ComAssessVO comAssessVO = new ComAssessVO();
                     comAssessVO.setName(dept.getName());
+                    comAssessVO.setId(dept.getIndex());
                     comAssessVO.setMonitors(dept.getMonitorIdList().size());
 
                     List<ComAssessDTO> childrenDTOS = new ArrayList<>();
@@ -175,6 +176,7 @@ public class ComAssessServiceImpl extends ServiceImpl<RStatComassesDMapper, RSta
                             String lv = getLevel(allComAss);
                             child.setData(allComAss);
                             child.setLevel(lv);
+                            child.setId(l1.get(0).getSubstationId());
                             children.add(child);
                         });
                     }