From 93eb6ac3fc942e3f6ec7ffe7bb714c5e20a027a4 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 27 Apr 2023 14:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E6=9C=AF=E7=9B=91?= =?UTF-8?q?=E7=9D=A3=E4=BF=A1=E6=81=AF=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/process/pojo/param/MonitorParam.java | 5 +++-- .../java/com/njcn/process/pojo/param/StrategyParam.java | 9 +-------- .../process/controller/ThsWarnStrategyController.java | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java index 6d891cbc2..b48aaa3e3 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -22,11 +23,11 @@ public class MonitorParam { private String deptId; @ApiModelProperty(value = "类型 0.预警策略 1.告警策略") - @NotEmpty(message = "类型不能为空") + @NotNull(message = "类型不能为空") private Integer type; @ApiModelProperty(value = "等级 0.自动策略 1.手动策略 2.排他策略") - @NotEmpty(message = "等级不能为空") + @NotNull(message = "等级不能为空") private Integer grade; @ApiModelProperty(value = "预警策略/告警策略id") diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java index 00bca8dad..c086c0b72 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java @@ -1,18 +1,11 @@ package com.njcn.process.pojo.param; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; -import com.njcn.process.pojo.po.ThsWarnStrategyAss; -import com.njcn.user.pojo.constant.UserValidMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; import java.util.List; /** @@ -94,7 +87,7 @@ public class StrategyParam { private Integer operation; @ApiModelProperty(value = "监测点标签") - @NotBlank(message = "监测点标签不能为空") + @NotEmpty(message = "监测点标签集合不能为空") private List monitorTag; @ApiModelProperty(value = "指标类型") diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java index 4bd620f4c..c7b872de8 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java @@ -114,7 +114,7 @@ public class ThsWarnStrategyController extends BaseController { @PostMapping("/bindMonitor") @ApiOperation(value = "监测点绑定") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) - public HttpResult bindMonitor(@RequestBody MonitorParam param) { + public HttpResult bindMonitor(@RequestBody @Validated MonitorParam param) { String methodDescribe = getMethodDescribe("bindMonitor"); Boolean flag = thsWarnStrategyService.bindMonitor(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);