电能质量问题修改

pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java

@@ -22,6 +22,7 @@ public enum ProcessResponseEnum {
     ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
     THERE_IS_ONLY_ONE_STRATEGY("A00556","各个策略等级，通用策略只能有一条!"),
     TERMINAL_ID_REPEAT("A00351","终端编号已存在"),
+    NO_PERMISSION("A00357","当前登录人无权限此项操作"),
 
     SUPV_PLAN_REPEAT("A00568","监督计划名称已存在")
     ;

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull;
 public class ComplaintParam extends IssuesParam {
 
     @ApiModelProperty(name = "userType",value = "用户类别")
-    @NotNull(message = "用户类别不可为空")
+//    @NotNull(message = "用户类别不可为空")
     private String userType;
 
     @ApiModelProperty(name = "userNo",value = "用户编号")
@@ -45,6 +45,6 @@ public class ComplaintParam extends IssuesParam {
     private String[] transientIndicators;
 
     @ApiModelProperty(name = "electricityType",value = "用电类别")
-    @NotNull(message = "用电类别不可为空")
+//    @NotNull(message = "用电类别不可为空")
     private String electricityType;
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java

@@ -21,7 +21,7 @@ public class ExcessiveParam extends IssuesParam {
     private String warnTarget;
 
     @ApiModelProperty(name = "warnReason",value = "告警原因")
-    @NotNull(message = "告警原因不可为空")
+//    @NotNull(message = "告警原因不可为空")
     private String warnReason;
 
     @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
@@ -33,6 +33,6 @@ public class ExcessiveParam extends IssuesParam {
     private String measurementPointName;
 
     @ApiModelProperty(name = "warnLastTime",value = "告警持续时间")
-    @NotNull(message = "告警持续时间不可为空")
+//    @NotNull(message = "告警持续时间不可为空")
     private String warnLastTime;
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java

@@ -1,6 +1,7 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("r_stat_electric_quality_problem_flow")
-public class RStatElectricQualityProblemFlow implements Serializable {
+public class RStatElectricQualityProblemFlow extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -2613309615015237749L;
 
@@ -43,7 +44,7 @@ public class RStatElectricQualityProblemFlow implements Serializable {
     /**
      * 填报更新时间
      */
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
 
     /**
      * 问题来源(在线监测告警、普测超标、用户投诉、设备异常)

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/ExcessiveDetailVO.java

@@ -1,5 +1,6 @@
 package com.njcn.process.pojo.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -26,15 +27,21 @@ public class ExcessiveDetailVO extends ProcessVO implements Serializable {
      */
     private String substationName;
 
-    /**
-     * 母线ID
-     */
-    private String busBarId;
+    //告警指标
+    private String harmonicType;
 
-    /**
-     * 所属母线
-     */
-    private String busBarName;
+    //母线id
+    private String barId;
+
+    private String barName;
+
+
+    @ApiModelProperty(name = "objName",value = "监测点对象名称")
+    private String objName;
+    @ApiModelProperty(name = "loadType",value = "监测对象类型")
+    private String loadType;
+    @ApiModelProperty(name = "voltageLevel",value = "电压等级")
+    private String voltageLevel;
 
     /**
      * 监测点ID

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/IssuesVO.java

@@ -1,5 +1,6 @@
 package com.njcn.process.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -43,6 +44,7 @@ public class IssuesVO implements Serializable {
     /**
      * 问题发生记录时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDateTime dataDate;
 
     /**