1.变电站上送逻辑修改

2.添加pms配网用户侧数据完整性接口
3.添加pms配网用户侧指标越限接口

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -49,6 +50,9 @@ public class DistributionMonitorParam {
     @ApiModelProperty(value = "监测终端接线方式(字典)")
     private String terminalWiringMethod;
 
+    @ApiModelProperty(value = "统计间隔分钟")
+    private Integer statisticalInterval;
+
 
     /**
      * pt变比

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java

@@ -199,7 +199,6 @@ public class PowerClientParam {
      * 用户标签
      */
     @ApiModelProperty(value = "用户标签",required = true)
-    @NotBlank(message = "用户标签不可为空")
     private String userTag;
 
     /**

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/pwUser/PwUserMonitorParam.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -17,5 +18,8 @@ public class PwUserMonitorParam extends BaseParam {
 
     private Double limitValue;
 
+    private Integer comFlag;
+
+    private List<String> ids;
 
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/pwUser/PwUserMonitorDataVO.java

@@ -2,21 +2,47 @@ package com.njcn.device.pms.pojo.vo.pwUser;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class PwUserMonitorDataVO {
 
     private String id;
 
+    /**
+     * 监测点名称
+     */
     private String name;
 
+    /**
+     * 所属组织
+     */
     private String orgName;
 
     private String operationName;
 
+    /**
+     * 是否敏感用户
+     */
     private Integer ifSensitiveUser;
 
+    /**
+     * 用户类型
+     */
     private String userType;
 
+    /**
+     * 电压等级
+     */
+    private String voltageLevel;
+
+    /**
+     * 数据完整性
+     */
     private Float integrityRate;
 
+    private LocalDateTime localDateTime;
+
+    private Integer comFlag;
+
 }