过程监督代码提交

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

@@ -21,11 +21,9 @@ public class GeneralSurveyParam extends IssuesParam {
     private String substationId;
 
     @ApiModelProperty(name = "busbarId",value = "母线ID")
-    @NotNull(message = "母线ID不可为空")
     private String busbarId;
 
     @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
-    @NotNull(message = "监测点ID不可为空")
     private String measurementPointId;
 
     @ApiModelProperty(name = "steadyState",value = "稳态指标")

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

@@ -36,6 +36,9 @@ public class StrategyParam {
         @ApiModelProperty("名称")
         private String name;
 
+        @ApiModelProperty("等级（0：一级；1：二级；2：三级）")
+        private String grade;
+
         @ApiModelProperty(value = "区分预警单/告警单（0：预警单 ；1：告警单）")
         private Integer type;
     }
@@ -72,8 +75,8 @@ public class StrategyParam {
         private Integer operation;
 
         @ApiModelProperty(value = "监测点标签")
-        @NotBlank(message = "监测点标签不能为空")
-        private String monitorTag;
+        @NotEmpty(message = "监测点标签集合不能为空")
+        private List<String> monitorTag;
 
         @ApiModelProperty(value = "指标类型")
         @NotEmpty(message = "指标类型集合不能为空")