1.河北综合评估功能调整

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;
+
+
 }
 

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;
 

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);
                         });
                     }