diff --git a/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java b/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java index b20b04d..6db8952 100644 --- a/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java @@ -29,6 +29,7 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/com/greenorange/promotion/model/dto/CommonBatchRequest.java b/src/main/java/com/greenorange/promotion/model/dto/CommonBatchRequest.java index 576bc63..8de6854 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/CommonBatchRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/CommonBatchRequest.java @@ -1,6 +1,7 @@ package com.greenorange.promotion.model.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; import java.io.Serial; @@ -12,7 +13,8 @@ import java.util.List; public class CommonBatchRequest implements Serializable { - @Schema(description = "id列表", example = "[8, 9, 17]") + @NotEmpty(message = "id列表不能为空") + @Schema(description = "id列表", example = "[1, 2, 3]") private List ids; diff --git a/src/main/java/com/greenorange/promotion/model/dto/CommonRequest.java b/src/main/java/com/greenorange/promotion/model/dto/CommonRequest.java index 996482b..33179db 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/CommonRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/CommonRequest.java @@ -1,6 +1,8 @@ package com.greenorange.promotion.model.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.io.Serial; @@ -13,7 +15,8 @@ public class CommonRequest implements Serializable { /** * id */ - @Schema(description = "id", example = "2") + @NotNull(message = "id不能为null") + @Schema(description = "id", example = "1") private Long id; @Serial diff --git a/src/main/java/com/greenorange/promotion/model/dto/CommonStringRequest.java b/src/main/java/com/greenorange/promotion/model/dto/CommonStringRequest.java index 6ed2869..f96e6d5 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/CommonStringRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/CommonStringRequest.java @@ -1,6 +1,7 @@ package com.greenorange.promotion.model.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import java.io.Serial; @@ -14,6 +15,7 @@ public class CommonStringRequest implements Serializable { /** * 字符串 */ + @NotBlank(message = "字符串不能为空") @Schema(description = "String", example = "templateString") private String templateString; diff --git a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoAddRequest.java b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoAddRequest.java index 72223d6..7b87e08 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoAddRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoAddRequest.java @@ -2,7 +2,6 @@ package com.greenorange.promotion.model.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoLoginRequest.java b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoLoginRequest.java index efb38f8..f888c99 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoLoginRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoLoginRequest.java @@ -17,14 +17,14 @@ public class UserInfoLoginRequest implements Serializable { * 账号 */ @NotBlank(message = "账号不能为空") - @Schema(description = "账号", example = "${field.example}") + @Schema(description = "账号", example = "qingcheng_account") private String userAccount; /** * 密码 */ @NotBlank(message = "密码不能为空") - @Schema(description = "密码", example = "${field.example}") + @Schema(description = "密码", example = "qingcheng_password") private String userPassword; } diff --git a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java index f8f9284..bb69be0 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java @@ -26,7 +26,7 @@ public class UserInfoQueryRequest extends PageRequest implements Serializable { * 手机号 */ @NotBlank(message = "手机号不能为空") - @Schema(description = "手机号", example = "${field.example}") + @Schema(description = "手机号", example = "15888610253") private String phoneNumber; diff --git a/src/main/java/com/greenorange/promotion/model/entity/UserInfo.java b/src/main/java/com/greenorange/promotion/model/entity/UserInfo.java index f9a2851..e27b17f 100644 --- a/src/main/java/com/greenorange/promotion/model/entity/UserInfo.java +++ b/src/main/java/com/greenorange/promotion/model/entity/UserInfo.java @@ -8,8 +8,6 @@ import java.io.Serializable; import java.util.Date; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * 用户基本信息表 * @TableName user_info