1.pmsbug修改，配网统计报表报告

2.技术监督策略，代码提交

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

@@ -20,6 +20,7 @@ public enum ProcessResponseEnum {
     PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"),
     QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"),
     ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
+    THERE_IS_ONLY_ONE_STRATEGY("A00556","自动策略或手动策略，通用策略只能有一条!"),
     ;
 
     private final String code;

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

@@ -0,0 +1,37 @@
+package com.njcn.process.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * <策略监测点绑定>
+ *
+ * @author wr
+ * @createTime: 2023-03-22
+ */
+
+@Data
+public class MonitorParam {
+
+    @ApiModelProperty(value = "单位id")
+    @NotBlank(message = "单位id不能为空")
+    private String deptId;
+
+    @ApiModelProperty(value = "类型 0.预警策略 1.告警策略")
+    @NotEmpty(message = "类型不能为空")
+    private Integer type;
+
+    @ApiModelProperty(value = "预警策略/告警策略id")
+    @NotEmpty(message = "策略id集合不能为空")
+    private List<String> alarmId;
+
+    @ApiModelProperty(value = "监测点id")
+    @NotEmpty(message = "监测点id集合不能为空")
+    private List<String> monitorId;
+
+
+}

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

@@ -57,6 +57,10 @@ public class StrategyParam {
         @NotNull(message = "等级不能为空")
         private Integer grade;
 
+        @ApiModelProperty(value = "0.通用策略  1.定值策略")
+        @NotNull(message = "策略选择不能为空")
+        private Integer bigType;
+
         @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
         @NotNull(message = "区分类别不能为空")
         private Integer type;
@@ -108,6 +112,10 @@ public class StrategyParam {
         @NotBlank(message = "名称不能为空")
         private String name;
 
+        @ApiModelProperty(value = "0.通用策略  1.定值策略")
+        @NotNull(message = "策略选择不能为空")
+        private Integer bigType;
+
         @ApiModelProperty(value = "等级（0：一级；1：二级；2：三级）")
         @NotNull(message = "等级不能为空")
         private Integer grade;
@@ -134,23 +142,22 @@ public class StrategyParam {
         @ApiModelProperty("名称")
         private String name;
 
-        @ApiModelProperty("变电站信息")
-        private List<Power> childPower;
+//        @ApiModelProperty("变电站信息")
+//        private List<Power> childPower;
 
         @ApiModelProperty("子节点详细信息")
-        private List<MonitorTree> children;
+        private List<?> children;
     }
 
     @Data
-    public static class Power {
+    public static class Monitor {
         @ApiModelProperty("id")
         private String id;
 
         @ApiModelProperty("名称")
         private String name;
 
-        @ApiModelProperty("监测点信息")
-        private List<Power> childMonitor;
+        @ApiModelProperty("标识")
+        private Integer leven=3;
     }
-
 }

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

@@ -42,6 +42,10 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
     @TableField("Operation")
     private Integer operation;
 
+    @ApiModelProperty(value = "0.通用策略  1.定值策略")
+    @TableField("Big_Type")
+    private Integer bigType;
+
     @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
     private Integer type;