diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java index cc12b775..80c2e95a 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java @@ -12,6 +12,8 @@ package cc.iotkit.manager.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.api.Paging; import cc.iotkit.common.api.Request; +import cc.iotkit.common.validate.AddGroup; +import cc.iotkit.common.validate.EditGroup; import cc.iotkit.manager.dto.bo.ChangeStateBo; import cc.iotkit.manager.dto.bo.protocolcomponent.ProtocolComponentBo; import cc.iotkit.manager.dto.bo.protocolconverter.ProtocolConverterBo; @@ -90,13 +92,13 @@ public class ProtocolController { @ApiOperation("新增转换脚本") @PostMapping("/converter/add") - public boolean addConverter(@Validated @RequestBody Request converter) { + public boolean addConverter(@Validated(AddGroup.class) @RequestBody Request converter) { return protocolService.addConverter(converter.getData()); } @ApiOperation("修改转换脚本") @PostMapping("/converter/edit") - public boolean editConverter(@Validated @RequestBody Request req) { + public boolean editConverter(@Validated(EditGroup.class) @RequestBody Request req) { return protocolService.editConverter(req.getData()); } diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolconverter/ProtocolConverterBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolconverter/ProtocolConverterBo.java index 6ca67c4b..39a87bab 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolconverter/ProtocolConverterBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolconverter/ProtocolConverterBo.java @@ -3,6 +3,8 @@ package cc.iotkit.manager.dto.bo.protocolconverter; import cc.iotkit.model.protocol.ProtocolConverter; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import org.springframework.format.annotation.DateTimeFormat; import io.swagger.annotations.ApiModel; @@ -33,6 +35,7 @@ public class ProtocolConverterBo extends BaseDto { private static final long serialVersionUID = -1L; @ApiModelProperty(value = "id") + @NotBlank(message = "id不能为空", groups = {EditGroup.class}) private String id; @ApiModelProperty(value = "创建时间") @@ -44,6 +47,7 @@ public class ProtocolConverterBo extends BaseDto { @ApiModelProperty(value = "转换器名称") @Size(max = 255, message = "转换器名称长度不正确") + @NotBlank(message = "转换器名称不能为空", groups = {AddGroup.class}) private String name; @ApiModelProperty(value = "脚本内容")