1.台账：台账审核和变压器台账

2.配网：稳态指标和暂态指标部分接口
3.指标分类，修改变电站名称异常bug

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 【基准水平】参数
  * @Title RMpBenchmarkLevelParam
@@ -22,6 +24,9 @@ public class RMpBenchmarkLevelParam extends StatisticsBizBaseParam {
     @ApiModelProperty(name = "benchmarkIndicator", value = "基准水平评价指标")
     private String benchmarkIndicator;
 
+    @ApiModelProperty(name = "monitorTags", value = "监测点标签")
+    private List<String> monitorTags;
+
     @ApiModelProperty("页码")
     private Integer pageNum;
     @ApiModelProperty("页面尺寸")

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelM.java

@@ -75,4 +75,24 @@ public class RMpBenchmarkLevelM implements Serializable {
      * 暂降次数水平标准差
      */
     private Double eventSd;
+
+    /**
+     * 暂升次数水平均值
+     */
+    private Double riseAvg;
+
+    /**
+     * 暂升次数水平标准差
+     */
+    private Double riseSd;
+
+    /**
+     * 短时中断水平均值
+     */
+    private Double interruptAvg;
+
+    /**
+     * 短时中断水平标准差
+     */
+    private Double interruptSd;
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelQ.java

@@ -76,4 +76,23 @@ public class RMpBenchmarkLevelQ implements Serializable {
      * 暂降次数水平标准差
      */
     private Double eventSd;
+    /**
+     * 暂升次数水平均值
+     */
+    private Double riseAvg;
+
+    /**
+     * 暂升次数水平标准差
+     */
+    private Double riseSd;
+
+    /**
+     * 短时中断水平均值
+     */
+    private Double interruptAvg;
+
+    /**
+     * 短时中断水平标准差
+     */
+    private Double interruptSd;
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelY.java

@@ -1,6 +1,7 @@
 package com.njcn.harmonic.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -76,4 +77,25 @@ public class RMpBenchmarkLevelY implements Serializable {
      */
     private Double eventSd;
 
+
+    /**
+     * 暂升次数水平均值
+     */
+    private Double riseAvg;
+
+    /**
+     * 暂升次数水平标准差
+     */
+    private Double riseSd;
+
+    /**
+     * 短时中断水平均值
+     */
+    private Double interruptAvg;
+
+    /**
+     * 短时中断水平标准差
+     */
+    private Double interruptSd;
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpBenchmarkLevelVO.java

@@ -24,6 +24,10 @@ public class RMpBenchmarkLevelVO implements Serializable {
     @ApiModelProperty(name = "orgName", value = "单位名称")
     private String orgName;
 
+    @ApiModelProperty(name = "monitorType", value = "监测点标签")
+    private String monitorTag;
+
+
     @ApiModelProperty(name = "benchmarkIndicator", value = "基准水平评价指标id")
     private String benchmarkIndicator;
 
@@ -74,4 +78,17 @@ public class RMpBenchmarkLevelVO implements Serializable {
 
     @ApiModelProperty(name = "eventSd", value = "暂降次数水平标准差")
     private Double eventSd;
+
+
+    @ApiModelProperty(name = "riseAvg", value = "暂升次数水平均值")
+    private Double riseAvg;
+
+    @ApiModelProperty(name = "riseSd", value = "暂升次数水平标准差")
+    private Double riseSd;
+
+    @ApiModelProperty(name = "interruptAvg", value = "短时中断水平均值")
+    private Double interruptAvg;
+
+    @ApiModelProperty(name = "interruptSd", value = "短时中断水平标准差")
+    private Double interruptSd;
 }