策略代码提交

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

@@ -18,7 +18,8 @@ public enum ProcessResponseEnum {
     PROCESS_COMMON_ERROR("A00550","监督管理模块异常"),
     ARCHIVE_ERROR("A00552","不满足归档调节，操作失败！"),
     PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"),
-
+    QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"),
+    ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
     ;
 
     private final String code;

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

@@ -28,6 +28,10 @@ public class ExcessiveParam extends IssuesParam {
     @NotNull(message = "监测点ID不可为空")
     private String measurementPointId;
 
+    @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
+    @NotNull(message = "监测点ID不可为空")
+    private String measurementPointName;
+
     @ApiModelProperty(name = "warnLastTime",value = "告警持续时间")
     @NotNull(message = "告警持续时间不可为空")
     private String warnLastTime;

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

@@ -37,7 +37,7 @@ public class StrategyParam {
         private String name;
 
         @ApiModelProperty("等级（0：一级；1：二级；2：三级）")
-        private String grade;
+        private Integer grade;
 
         @ApiModelProperty(value = "区分预警单/告警单（0：预警单 ；1：告警单）")
         private Integer type;
@@ -71,7 +71,7 @@ public class StrategyParam {
         private String id;
 
         @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
-        @TableField("Operation")
+        @NotNull(message = "id不能为空")
         private Integer operation;
 
         @ApiModelProperty(value = "监测点标签")
@@ -84,7 +84,23 @@ public class StrategyParam {
     }
 
     @Data
-    public static class StrategyUpdateParam {
+    public static class StrategyUpdateParam extends  StrategyUpParam{
+
+        @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
+        private Integer operation;
+
+        @ApiModelProperty(value = "监测点标签")
+        @NotBlank(message = "监测点标签不能为空")
+        private List<String> monitorTag;
+
+        @ApiModelProperty(value = "指标类型")
+        @NotEmpty(message = "指标类型集合不能为空")
+        private List<String> indicatorTypes;
+
+    }
+
+    @Data
+    public static class StrategyUpParam {
         @ApiModelProperty(value = "预警单id")
         private String id;
 
@@ -96,18 +112,6 @@ public class StrategyParam {
         @NotNull(message = "等级不能为空")
         private Integer grade;
 
-        @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
-        @TableField("Operation")
-        private Integer operation;
-
-        @ApiModelProperty(value = "监测点标签")
-        @NotBlank(message = "监测点标签不能为空")
-        private String monitorTag;
-
-        @ApiModelProperty(value = "指标类型")
-        @NotEmpty(message = "指标类型集合不能为空")
-        private List<String> indicatorTypes;
-
     }
 
     @Data
@@ -116,7 +120,7 @@ public class StrategyParam {
         @NotBlank(message = "id不能为空")
         private String id;
 
-        @ApiModelProperty(value = "0.删除 1.正常")
+        @ApiModelProperty(value = "0.删除 1.启用 2.关闭")
         private Integer state;
 
     }

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

@@ -45,6 +45,11 @@ public class RMpOnlineMonitorOverproofProblem implements Serializable {
      */
     private String measurementPointId;
 
+    /**
+     * 监测点ID
+     */
+    private String measurementPointName;
+
     /**
      * 操作时间
      */

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

@@ -45,9 +45,8 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
     private Integer type;
 
-    @ApiModelProperty(value = "0.删除 1.正常")
+    @ApiModelProperty(value = "0.删除 1.启用 2.关闭")
     @TableField("State")
-    @TableLogic
     private Integer state;
 
     @TableField("Create_By")