diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java index a1b8039..7f00d67 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.*; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; @@ -21,19 +23,23 @@ import java.util.Date; @ApiModel(description = "散户更新 Request VO") public class ClientUpdateVO { - @ApiModelProperty(value = "id", required = false, example = "大马猴", hidden = true) + @ApiModelProperty(value = "id", hidden = true, example = "533242995646951685") private String id; @ApiModelProperty(value = "昵称", required = false, example = "大马猴") + @NotBlank(message = "昵称不能为空") + @Size(max = 6, min = 2, message = "昵称必须2~6个字符") private String nickName; - @ApiModelProperty(value = "手机", required = false, example = "[{\"name\":\"sunlogin.jpg\",\"url\":\"upload/image/445083e778779767dd8ac22eede077ec.png\",\"fileId\":\"65baf8acb2048f25a2c16a1c.jpg\"}]") + @ApiModelProperty(value = "头像", required = false, example = "[{\"name\":\"sunlogin.jpg\",\"url\":\"upload/image/445083e778779767dd8ac22eede077ec.png\",\"fileId\":\"65baf8acb2048f25a2c16a1c.jpg\"}]") private String headIcon; @ApiModelProperty(value = "性别", required = false, example = "1") + @NotNull(message = "性别不能为空") private Integer gender; - @ApiModelProperty(value = "生日", required = false, example = "2024-02-28") + @ApiModelProperty(value = "生日", required = false, example = "2024-02-28 00:00:00") + @Past(message = "生日范围不正确,生日必须是今天以前的") private LocalDateTime birthday; @ApiModelProperty(value = "发票抬头", required = false, example = "中铁建工集团有限公司") diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycler/RecyclerUpdateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycler/RecyclerUpdateVO.java index b5a253a..9e4c301 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycler/RecyclerUpdateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycler/RecyclerUpdateVO.java @@ -4,6 +4,10 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + @Data @ApiModel(description = "回收员更新 Request VO") public class RecyclerUpdateVO { @@ -12,12 +16,15 @@ public class RecyclerUpdateVO { private String id; @ApiModelProperty(value = "回收员姓名", required = false, example = "光头强") + @NotBlank(message = "回收员姓名不能为空") + @Size(max = 6, min = 2, message = "回收员姓名必须2~6个字符") private String staffsName; // 回收员姓名 - @ApiModelProperty(value = "头像", required = false, example = "光头强") + @ApiModelProperty(value = "头像", required = false, example = "[{\"name\":\"sunlogin.jpg\",\"url\":\"upload/image/445083e778779767dd8ac22eede077ec.png\",\"fileId\":\"65baf8acb2048f25a2c16a1c.jpg\"}]") private String headIcon; // 头像 @ApiModelProperty(value = "性别", required = false, example = "1") + @NotNull(message = "性别不能为空") private Integer gender; // 性别 @ApiModelProperty(value = "自动接单 (0-否,1-是)", required = false, example = "0") diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java index c2cc066..239575f 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java @@ -67,7 +67,7 @@ public interface IClientService extends IService { * 更新散户信息 * @param clientUpdateVO */ - void updateClient(ClientUpdateVO clientUpdateVO); + void updateClient(@Valid ClientUpdateVO clientUpdateVO); /** diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IRecyclerService.java b/nxhs-service/src/main/java/cc/yunxi/service/IRecyclerService.java index f7ce999..d2252ce 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IRecyclerService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IRecyclerService.java @@ -8,6 +8,7 @@ import cc.yunxi.domain.vo.recycler.RecyclerUpdateVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import javax.validation.Valid; import java.math.BigDecimal; /** @@ -49,7 +50,7 @@ public interface IRecyclerService extends IService { * 更新回收员信息 * @param recyclerUpdateVO */ - void updateRecycler(RecyclerUpdateVO recyclerUpdateVO); + void updateRecycler(@Valid RecyclerUpdateVO recyclerUpdateVO); /** diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java index 24b0001..ea0b832 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java @@ -43,6 +43,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -62,6 +63,7 @@ import java.util.Collections; */ @Service @Slf4j +@Validated public class ClientServiceImpl extends ServiceImpl implements IClientService { @Autowired diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecyclerServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecyclerServiceImpl.java index 4ebc103..940159a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecyclerServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecyclerServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.math.BigDecimal; @@ -31,6 +32,7 @@ import java.math.BigDecimal; * 回收员 服务实现类 */ @Service +@Validated public class RecyclerServiceImpl extends ServiceImpl implements IRecyclerService { @Resource