From d12cae1937d722cd6b54bd379f1b52236fc15292 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 21 Sep 2022 11:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=AA=8C=E8=AF=81=E5=99=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/admin/validate/article/ArticleParam.java | 1 - .../com/mdd/admin/validate/article/CategoryParam.java | 11 ++--------- .../com/mdd/admin/validate/common/AlbumParam.java | 7 ++----- .../java/com/mdd/admin/validate/common/PageParam.java | 4 ++-- .../admin/validate/decorate/DecoratePageParam.java | 7 ++++++- .../com/mdd/admin/validate/setting/DictDataParam.java | 10 ++-------- .../com/mdd/admin/validate/setting/DictTypeParam.java | 10 ++-------- .../admin/validate/system/SystemAuthAdminParam.java | 9 ++------- .../admin/validate/system/SystemAuthDeptParam.java | 7 ++----- .../admin/validate/system/SystemAuthMenuParam.java | 8 ++------ .../admin/validate/system/SystemAuthPostParam.java | 7 ++----- .../admin/validate/system/SystemAuthRoleParam.java | 8 ++------ .../mdd/admin/validate/system/SystemLoginParam.java | 6 ++---- 13 files changed, 28 insertions(+), 67 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java index 6965a4ed..2047ca04 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java @@ -11,7 +11,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * 文章参数 diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java index d77a865f..aa7e5b7d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.article; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; @@ -10,7 +11,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * 文章分类参数 @@ -18,14 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class CategoryParam implements Serializable { - - private static final long serialVersionUID = 1L; - - public interface create{} - public interface update{} - public interface delete{} - public interface change{} +public class CategoryParam extends BaseParam { @IDMust(message = "id参数必传且需大于0", groups = {delete.class, change.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/common/AlbumParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/common/AlbumParam.java index d4f02938..fc9c66f4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/common/AlbumParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/common/AlbumParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.common; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; @@ -10,7 +11,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * 相册参数 @@ -18,11 +18,8 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class AlbumParam implements Serializable { +public class AlbumParam extends BaseParam { - private static final long serialVersionUID = 1L; - - public interface delete{} public interface rename{} public interface cateAdd{} public interface albumMove{} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/common/PageParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/common/PageParam.java index 4a643318..3a0b9633 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/common/PageParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/common/PageParam.java @@ -1,12 +1,12 @@ package com.mdd.admin.validate.common; +import com.mdd.admin.validate.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.DecimalMin; -import java.io.Serializable; /** * 分页参数 @@ -14,7 +14,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class PageParam implements Serializable { +public class PageParam extends BaseParam { // 当前分页 @DecimalMin(value = "1", message = "pageNo参数必须大于0的数字") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageParam.java index aa2efcd0..3c3a7f4d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageParam.java @@ -1,7 +1,10 @@ package com.mdd.admin.validate.decorate; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; @@ -9,7 +12,9 @@ import javax.validation.constraints.NotNull; * 页面装修参数类 */ @Data -public class DecoratePageParam { +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class DecoratePageParam extends BaseParam { @IDMust(message = "id参数必传且需大于0") private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataParam.java index ba133fa3..2117c06c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.setting; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; @@ -9,7 +10,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.List; /** @@ -18,13 +18,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class DictDataParam implements Serializable { - - private static final long serialVersionUID = 1L; - - public interface create{} - public interface update{} - public interface delete{} +public class DictDataParam extends BaseParam { @IDMust(message = "id参数必传且需大于0", groups = {update.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeParam.java index dbe9e45b..0031ead1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.setting; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; @@ -8,7 +9,6 @@ import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.List; /** @@ -17,13 +17,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class DictTypeParam implements Serializable { - - private static final long serialVersionUID = 1L; - - public interface create{} - public interface update{} - public interface delete{} +public class DictTypeParam extends BaseParam { @IDMust(message = "id参数必传且需大于0", groups = {update.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java index 490f83e1..4042569c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.system; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; @@ -11,7 +12,6 @@ import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * 系统管理员参数 @@ -19,14 +19,9 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class SystemAuthAdminParam implements Serializable { +public class SystemAuthAdminParam extends BaseParam { - private static final long serialVersionUID = 1L; - - public interface create{} - public interface update{} public interface upInfo{} - public interface delete{} @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java index 6c5d79e2..1c274bcd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.system; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; @@ -17,11 +18,7 @@ import javax.validation.constraints.Pattern; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class SystemAuthDeptParam { - - public interface create{} - public interface update{} - public interface delete{} +public class SystemAuthDeptParam extends BaseParam { @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthMenuParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthMenuParam.java index 93c4be7c..e21027d6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthMenuParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthMenuParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.system; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import com.mdd.common.validator.annotation.StringContains; @@ -10,7 +11,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * 系统菜单参数 @@ -18,11 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class SystemAuthMenuParam implements Serializable { - - public interface create{} - public interface update{} - public interface delete{} +public class SystemAuthMenuParam extends BaseParam { @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java index f35d3a34..df72fc50 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.system; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; @@ -16,11 +17,7 @@ import javax.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class SystemAuthPostParam { - - public interface create{} - public interface update{} - public interface delete{} +public class SystemAuthPostParam extends BaseParam { @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthRoleParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthRoleParam.java index 3ad522b9..06012e04 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthRoleParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthRoleParam.java @@ -1,5 +1,6 @@ package com.mdd.admin.validate.system; +import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +10,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * 系统角色参数 @@ -17,11 +17,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class SystemAuthRoleParam implements Serializable { - - public interface create{} - public interface update{} - public interface delete{} +public class SystemAuthRoleParam extends BaseParam { @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemLoginParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemLoginParam.java index 1e1a6288..006fbc29 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemLoginParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemLoginParam.java @@ -1,12 +1,12 @@ package com.mdd.admin.validate.system; +import com.mdd.admin.validate.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; -import java.io.Serializable; /** * 系统登录参数 @@ -14,9 +14,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class SystemLoginParam implements Serializable { - - private static final long serialVersionUID = 1L; +public class SystemLoginParam extends BaseParam { @NotEmpty(message = "账号不能为空") @Length(min = 2, max = 20, message = "账号或密码错误")