diff --git a/shuili-admin/src/main/resources/application-dev.yml b/shuili-admin/src/main/resources/application-dev.yml index 158b89db..820adedc 100644 --- a/shuili-admin/src/main/resources/application-dev.yml +++ b/shuili-admin/src/main/resources/application-dev.yml @@ -46,7 +46,7 @@ logging: org.springframework: warn # Spring配置 spring: - mongodb: + mongodb: uri: mongodb://192.168.1.20:27017/tianhui field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy # 资源信息 diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/AddGroup.java b/shuili-system/src/main/java/com/kms/yxgh/base/AddGroup.java new file mode 100644 index 00000000..7b9e026f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/AddGroup.java @@ -0,0 +1,13 @@ +package com.kms.yxgh.base; + +/** + * @ClassName: AddGroup + * @Description: TODO + * @Date: 2024/4/1 上午10:38 + * * + * @author: hxh + * @version: 1.0 + */ + +public interface AddGroup { +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/UpdateGroup.java b/shuili-system/src/main/java/com/kms/yxgh/base/UpdateGroup.java new file mode 100644 index 00000000..b7d9d374 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/UpdateGroup.java @@ -0,0 +1,13 @@ +package com.kms.yxgh.base; + +/** + * @ClassName: UpdateGroup + * @Description: TODO + * @Date: 2024/4/1 上午10:39 + * * + * @author: hxh + * @version: 1.0 + */ + +public interface UpdateGroup { +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzOperaRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzOperaRecordController.java index c4c1f9cc..61ae6dd8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzOperaRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzOperaRecordController.java @@ -1,13 +1,16 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.AddGroup; import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; import com.kms.yxgh.sz.dto.SzOperaRecordDto; import com.kms.yxgh.sz.service.SzOperaRecordService; import com.shuili.common.core.domain.SearchParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** @@ -44,14 +47,14 @@ public class SzOperaRecordController { //操作记录新增 @PostMapping("") @ApiOperation("操作记录新增") - public Response add(@RequestBody SzOperaRecordDto dto) { + public Response add(@RequestBody @Validated(AddGroup.class) SzOperaRecordDto dto) { return Response.ok(szOperaRecordService.add(dto)); } //操作记录修改 @PutMapping("") @ApiOperation("操作记录修改") - public Response update(@RequestBody SzOperaRecordDto dto) { + public Response update(@RequestBody @Validated(UpdateGroup.class) SzOperaRecordDto dto) { return Response.ok(szOperaRecordService.modify(dto)); } //操作记录删除 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzOperaRecordDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzOperaRecordDto.java index 6d5474c4..0c425fd1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzOperaRecordDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzOperaRecordDto.java @@ -1,10 +1,14 @@ package com.kms.yxgh.sz.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Max; +import javax.validation.constraints.Size; import java.util.Date; /** @@ -23,23 +27,33 @@ public class SzOperaRecordDto { @ApiModelProperty(value = "主键") private String id; @ApiModelProperty(value = "水闸编码") + @Size(max = 50, message = "水闸编码不能大于50", groups = {AddGroup.class, UpdateGroup.class}) private String wagaCode; @ApiModelProperty(value = "闸门") + @Size(max = 50, message = "闸门不能大于50", groups = {AddGroup.class, UpdateGroup.class}) private String gate; + @Size(max = 50, message = "闸号不能大于50", groups = {AddGroup.class, UpdateGroup.class}) @ApiModelProperty(value = "闸号") private String gateNum; @ApiModelProperty(value = "指令号") + @Size(max = 50, message = "指令号不能大于50", groups = {AddGroup.class, UpdateGroup.class}) private String commandNum; @ApiModelProperty(value = "控制水位") + @Max(value = 10000, message = "控制水位不能大于10000", groups = {AddGroup.class, UpdateGroup.class}) private Float controlLevel; + @Max(value = 10000, message = "左干不能大于10000", groups = {AddGroup.class, UpdateGroup.class}) @ApiModelProperty(value = "左干") private Float leftDry; + @Max(value = 10000, message = "右干不能大于10000", groups = {AddGroup.class, UpdateGroup.class}) @ApiModelProperty(value = "右干") private Float rightDry; @ApiModelProperty(value = "上游水位") + @Max(value = 10000, message = "上游水位不能大于10000", groups = {AddGroup.class, UpdateGroup.class}) private Float upstreamLevel; + @Max(value = 10000, message = "下游水位不能大于10000", groups = {AddGroup.class, UpdateGroup.class}) @ApiModelProperty(value = "下游水位") private Float downstreamLevel; + @Max(value = 10000, message = "开度不能大于10000", groups = {AddGroup.class, UpdateGroup.class}) @ApiModelProperty(value = "开度") private Float opening; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")