new

e64b2a0b · wanglei · 28fe1080 · e64b2a0b · e64b2a0b · e64b2a0b
Commit e64b2a0b authored Mar 03, 2023 by wanglei
15 changed files
--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/Article.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/Article.java
@@ -65,7 +65,7 @@ public class Article implements Serializable {
    @TableField("update_time")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    @TableField("delete_status")
    @TableLogic(value = "0",delval = "1")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/Coupon.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/Coupon.java
@@ -72,7 +72,7 @@ public class Coupon implements Serializable {
    @TableField("update_time")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    @TableField("delete_status")
    @TableLogic(value = "0",delval = "1")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/Order.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/Order.java
@@ -100,7 +100,7 @@ public class Order implements Serializable {
    @TableField("update_time")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    @TableField("delete_status")
    @TableLogic(value = "0",delval = "1")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/UserComment.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/UserComment.java
@@ -61,7 +61,7 @@ public class UserComment implements Serializable {
    @TableField("update_time")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    @TableField("delete_status")
    @TableLogic(value = "0",delval = "1")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/UserFeedback.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/UserFeedback.java
@@ -61,7 +61,7 @@ public class UserFeedback implements Serializable {
    @TableField("update_time")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    @TableField("delete_status")
    @TableLogic(value = "0",delval = "1")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/ArticleBo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/ArticleBo.java
@@ -2,6 +2,8 @@ package com.yongqi.xinrenli.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,13 +36,13 @@ public class ArticleBo extends BaseEntity {
    private String userId;
    @Schema(name = "动态标题")
-    @NotNull(message = "动态标题不能为空")
+    @NotNull(message = "动态标题不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "动态标题不能为空")
+    @NotBlank(message = "动态标题不能为空", groups = {AddGroup.class, EditGroup.class})
    private String title;
    @Schema(name = "动态内容")
-    @NotNull(message = "动态内容不能为空")
+    @NotNull(message = "动态内容不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "动态内容不能为空")
+    @NotBlank(message = "动态内容不能为空", groups = {AddGroup.class, EditGroup.class})
    private String content;
    @Schema(name = "添加图片地址")
@@ -52,7 +54,7 @@ public class ArticleBo extends BaseEntity {
    @Schema(name = "修改人")
    private String updateUser;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;
 }
--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/CouponBo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/CouponBo.java
@@ -2,6 +2,8 @@ package com.yongqi.xinrenli.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,19 +36,19 @@ public class CouponBo extends BaseEntity {
    private Integer userId;
    @Schema(name = "券类型")
-    @NotNull(message = "券类型不能为空")
+    @NotNull(message = "券类型不能为空", groups = {AddGroup.class, EditGroup.class})
    private Integer couponType;
    @Schema(name = "优惠内容：满减")
-    @NotNull(message = "优惠内容不能为空")
+    @NotNull(message = "优惠内容不能为空", groups = {AddGroup.class, EditGroup.class})
    private Integer fullSubtraction;
    @Schema(name = "使用门槛： 最低消费")
-    @NotNull(message = "使用门槛不能为空")
+    @NotNull(message = "使用门槛不能为空", groups = {AddGroup.class, EditGroup.class})
    private Integer minUsed;
    @Schema(name = "生效时间")
-    @NotNull(message = "生效时间不能为空")
+    @NotNull(message = "生效时间不能为空", groups = {AddGroup.class, EditGroup.class})
    private Date effectiveTime;
    @Schema(name = "失效时间")
@@ -58,7 +60,7 @@ public class CouponBo extends BaseEntity {
    @Schema(name = "修改人")
    private String updateUser;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/OrderBo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/OrderBo.java
@@ -38,36 +38,36 @@ public class OrderBo extends BaseEntity {
    private Long id;
    @Schema(name = "用户id")
-    @NotNull(message = "用户id不能为空")
+    @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
    private Long userId;
    @Schema(name = "标题")
-    @NotNull(message = "标题不能为空")
+    @NotNull(message = "标题不能为空", groups = {AddGroup.class, EditGroup.class})
    @NotBlank(message = "标题不能为空", groups = {AddGroup.class, EditGroup.class})
    private String title;
    @Schema(name = "联系人")
-    @NotNull(message = "联系人不能为空")
+    @NotNull(message = "联系人不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "联系人不能为空")
+    @NotBlank(message = "联系人不能为空", groups = {AddGroup.class, EditGroup.class})
    private String linkman;
    @Schema(name = "联系电话")
-    @NotNull(message = "联系电话不能为空")
+    @NotNull(message = "联系电话不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "联系电话不能为空")
+    @NotBlank(message = "联系电话不能为空", groups = {AddGroup.class, EditGroup.class})
    private String phone;
    @Schema(name = "维修时间")
-    @NotNull(message = "维修时间不能为空")
+    @NotNull(message = "维修时间不能为空", groups = {AddGroup.class, EditGroup.class})
    @JsonFormat(pattern = "yyyy/MM/dd")
    private Date repairTime;
    @Schema(name = "维修地址")
-    @NotNull(message = "维修地址不能为空")
+    @NotNull(message = "维修地址不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "维修地址不能为空")
+    @NotBlank(message = "维修地址不能为空", groups = {AddGroup.class, EditGroup.class})
    private String repairAddress;
    @Schema(name = "预算金额")
-    @NotNull(message = "预算金额不能为空")
+    @NotNull(message = "预算金额不能为空", groups = {AddGroup.class, EditGroup.class})
    private Double budget;
    @Schema(name = "图片地址")
@@ -93,7 +93,7 @@ public class OrderBo extends BaseEntity {
    private String updateUser;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/UserCommentBo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/UserCommentBo.java
@@ -3,6 +3,8 @@ package com.yongqi.xinrenli.domain.bo;
 import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -36,12 +38,12 @@ public class UserCommentBo extends BaseEntity {
    private Integer articleId;
    @Schema(name = "用户id")
-    @NotNull(message = "用户id不能为空")
+    @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
    private Long userId;
    @Schema(name = "用户评论内容")
-    @NotNull(message = "评论内容不能为空")
+    @NotNull(message = "评论内容不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "评论内容不能为空")
+    @NotBlank(message = "评论内容不能为空", groups = {AddGroup.class, EditGroup.class})
    private String content;
    @Schema(name = "创建人")
@@ -50,7 +52,7 @@ public class UserCommentBo extends BaseEntity {
    @Schema(name = "修改人")
    private String updateUser;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/UserFeedbackBo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/UserFeedbackBo.java
@@ -3,6 +3,8 @@ package com.yongqi.xinrenli.domain.bo;
 import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,26 +35,26 @@ public class UserFeedbackBo extends BaseEntity {
    private Long id;
    @Schema(name = "用户id")
-    @NotNull(message = "用户id不能为空")
+    @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
    private Long userId;
    @Schema(name = "反馈标题")
-    @NotNull(message = "反馈标题不能为空")
+    @NotNull(message = "反馈标题不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "反馈标题不能为空")
+    @NotBlank(message = "反馈标题不能为空", groups = {AddGroup.class, EditGroup.class})
    private String title;
    @Schema(name = "反馈内容")
-    @NotNull(message = "反馈标题不能为空")
+    @NotNull(message = "反馈标题不能为空", groups = {AddGroup.class, EditGroup.class})
-    @NotBlank(message = "反馈标题不能为空")
+    @NotBlank(message = "反馈标题不能为空", groups = {AddGroup.class, EditGroup.class})
    private String content;
    @Schema(name = "创建人")
    private String createUser;
    @Schema(name = "修改人")
    private String updateUser;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/ArticleVo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/ArticleVo.java
@@ -66,7 +66,7 @@ public class ArticleVo implements Serializable {
    @Schema(name = "修改时间")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;
 }
--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/CouponVo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/CouponVo.java
@@ -73,7 +73,7 @@ public class CouponVo implements Serializable {
    @Schema(name = "修改时间")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;
 }
--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/OrderVo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/OrderVo.java
@@ -100,7 +100,7 @@ public class OrderVo implements Serializable {
    @Schema(name = "修改时间")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/UserCommentVo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/UserCommentVo.java
@@ -62,7 +62,7 @@ public class UserCommentVo implements Serializable {
    @Schema(name = "修改时间")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;
 }

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/UserFeedbackVo.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/UserFeedbackVo.java
@@ -62,7 +62,7 @@ public class UserFeedbackVo implements Serializable {
    @Schema(name = "修改时间")
    private Date updateTime;
-    @Schema(name = "删除状态")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Integer delStatus;