From 9b28f14c0b965ed852215bdd9c95627a711c9e46 Mon Sep 17 00:00:00 2001 From: Odboy Date: Fri, 21 Mar 2025 18:41:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E5=9F=BA=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/odboy/base/BaseEntity.java | 5 +- .../src/main/java/cn/odboy/base/MyObject.java | 13 ++++++ .../main/java/cn/odboy/util/PageResult.java | 6 ++- .../mapper/system/DictDetailMapper.xml | 5 +- .../resources/mapper/system/MenuMapper.xml | 3 +- .../mapper/system/RoleDeptMapper.xml | 3 +- .../resources/mapper/system/RoleMapper.xml | 21 +++++++-- .../mapper/system/RoleMenuMapper.xml | 6 ++- .../resources/mapper/system/UserJobMapper.xml | 3 +- .../resources/mapper/system/UserMapper.xml | 46 ++++++++++++++----- .../mapper/system/UserRoleMapper.xml | 3 +- .../java/cn/odboy/util/StringUtilTest.java | 6 +-- .../modules/quartz/config/QuartzConfig.java | 1 - .../modules/quartz/domain/QuartzJob.java | 3 +- .../modules/quartz/domain/QuartzLog.java | 6 ++- .../cn/odboy/modules/system/domain/Dept.java | 3 +- .../cn/odboy/modules/system/domain/Dict.java | 3 +- .../modules/system/domain/DictDetail.java | 3 +- .../cn/odboy/modules/system/domain/Job.java | 3 +- .../cn/odboy/modules/system/domain/Menu.java | 3 +- .../cn/odboy/modules/system/domain/Role.java | 3 +- .../cn/odboy/modules/system/domain/User.java | 3 +- .../modules/system/domain/dto/MenuMetaVo.java | 7 +-- .../modules/system/domain/dto/MenuVo.java | 6 ++- .../system/domain/dto/UserQueryCriteria.java | 6 ++- .../java/cn/odboy/domain/EmailConfig.java | 6 ++- .../java/cn/odboy/domain/LocalStorage.java | 4 +- .../java/cn/odboy/domain/QiniuConfig.java | 6 ++- .../java/cn/odboy/domain/QiniuContent.java | 6 ++- 29 files changed, 125 insertions(+), 67 deletions(-) create mode 100644 cutejava/cutejava-common/src/main/java/cn/odboy/base/MyObject.java diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseEntity.java index 858deba3..890d4633 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseEntity.java @@ -4,20 +4,21 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; -import java.io.Serializable; import java.lang.reflect.Field; import java.sql.Timestamp; @Getter @Setter -public class BaseEntity implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class BaseEntity extends MyObject { @CreatedBy @TableField(fill = FieldFill.INSERT) diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyObject.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyObject.java new file mode 100644 index 00000000..91df133c --- /dev/null +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyObject.java @@ -0,0 +1,13 @@ +package cn.odboy.base; + +import java.io.Serializable; + +/** + * 基础对象 + * + * @author odboy + * @date 2022-01-12 + */ +public class MyObject implements Serializable { + private static final long serialVersionUID = 1L; +} diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageResult.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageResult.java index 17a849b7..232c39c3 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageResult.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageResult.java @@ -1,10 +1,11 @@ package cn.odboy.util; +import cn.odboy.base.MyObject; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.io.Serializable; import java.util.List; /** @@ -13,7 +14,8 @@ import java.util.List; @Data @NoArgsConstructor @AllArgsConstructor -public class PageResult implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class PageResult extends MyObject { private List content; diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/DictDetailMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/DictDetailMapper.xml index 57c7540e..2f50535c 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/DictDetailMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/DictDetailMapper.xml @@ -17,7 +17,10 @@ - dd.detail_id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time, + dd + . + detail_id + , dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time, d.dict_id, d.name diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/MenuMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/MenuMapper.xml index 1e882262..6e00c336 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/MenuMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/MenuMapper.xml @@ -23,7 +23,8 @@ - menu_id, title, name, menu_sort, component, path, type, permission, icon, cache, hidden, pid, sub_count, + menu_id + , title, name, menu_sort, component, path, type, permission, icon, cache, hidden, pid, sub_count, i_frame, create_by, update_by, create_time, update_time diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleDeptMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleDeptMapper.xml index afd274e4..00ef7804 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleDeptMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleDeptMapper.xml @@ -11,7 +11,8 @@ - delete from sys_roles_depts + delete + from sys_roles_depts where role_id = #{roleId} diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMapper.xml index f737b8c6..891a9703 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMapper.xml @@ -23,17 +23,26 @@ - role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope, + role + . + role_id + as role_role_id, role.name as role_name, role.data_scope as role_data_scope, role.level as role_level, role.description as role_description, role.create_by as role_create_by, role.update_by as role_update_by, role.create_time as role_create_time, role.update_time as role_update_time - menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission + menu + . + menu_id + as menu_id, menu.title as menu_title, menu.permission as menu_permission - dept.dept_id as dept_id, dept.name as dept_name + dept + . + dept_id + as dept_id, dept.name as dept_name @@ -52,7 +61,8 @@ diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMenuMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMenuMapper.xml index 6377830a..6a2367e8 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMenuMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMenuMapper.xml @@ -11,7 +11,8 @@ - delete from sys_roles_menus + delete + from sys_roles_menus where role_id = #{roleId} @@ -24,7 +25,8 @@ - delete from sys_roles_menus + delete + from sys_roles_menus where menu_id = #{menuId} \ No newline at end of file diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserJobMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/UserJobMapper.xml index 7fc98632..e36a3d83 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserJobMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/UserJobMapper.xml @@ -11,7 +11,8 @@ - delete from sys_users_jobs + delete + from sys_users_jobs where user_id = #{userId} diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/UserMapper.xml index 179284f7..b6fc9fe2 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/UserMapper.xml @@ -36,7 +36,10 @@ - u.user_id as user_user_id, u.dept_id as user_dept_id, u.username as user_username, + u + . + user_id + as user_user_id, u.dept_id as user_dept_id, u.username as user_username, u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone, u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path, u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by, @@ -45,11 +48,17 @@ - j.job_id as job_id, j.name as job_name + j + . + job_id + as job_id, j.name as job_name - r.role_id as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope + r + . + role_id + as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope @@ -117,30 +126,45 @@ diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserRoleMapper.xml b/cutejava/cutejava-starter/src/main/resources/mapper/system/UserRoleMapper.xml index 3ea5a8c3..e9709099 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserRoleMapper.xml +++ b/cutejava/cutejava-starter/src/main/resources/mapper/system/UserRoleMapper.xml @@ -11,7 +11,8 @@ - delete from sys_users_roles + delete + from sys_users_roles where user_id = #{userId} diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java index a3aa7f36..1b7470c5 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/StringUtilTest.java @@ -6,11 +6,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import java.text.SimpleDateFormat; import java.util.Date; -import static cn.odboy.util.StringUtil.getIp; -import static cn.odboy.util.StringUtil.getWeekDay; -import static cn.odboy.util.StringUtil.toCamelCase; -import static cn.odboy.util.StringUtil.toCapitalizeCamelCase; -import static cn.odboy.util.StringUtil.toUnderScoreCase; +import static cn.odboy.util.StringUtil.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/QuartzConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/QuartzConfig.java index 6b9cc643..c06d4beb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/QuartzConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/QuartzConfig.java @@ -17,7 +17,6 @@ import org.springframework.stereotype.Component; @Configuration @Scope("singleton") public class QuartzConfig { - /** * 解决Job中注入Spring Bean为null的问题 */ diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzJob.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzJob.java index 951bdfbf..83e9623a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzJob.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzJob.java @@ -11,13 +11,12 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; @Getter @Setter @TableName("sys_quartz_job") -public class QuartzJob extends BaseEntity implements Serializable { +public class QuartzJob extends BaseEntity { public static final String JOB_KEY = "JOB_KEY"; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzLog.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzLog.java index c0d9e6ca..df6b8389 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzLog.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzLog.java @@ -1,15 +1,17 @@ package cn.odboy.modules.quartz.domain; +import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.sql.Timestamp; @Data @TableName("sys_quartz_log") -public class QuartzLog implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class QuartzLog extends MyObject { @TableId(value = "log_id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dept.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dept.java index 8a5f6c0c..302adf8f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dept.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dept.java @@ -12,7 +12,6 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.List; import java.util.Objects; import java.util.Set; @@ -20,7 +19,7 @@ import java.util.Set; @Getter @Setter @TableName("sys_dept") -public class Dept extends BaseEntity implements Serializable { +public class Dept extends BaseEntity { @NotNull(groups = Update.class) @TableId(value = "dept_id", type = IdType.AUTO) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dict.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dict.java index 80fdc6aa..3dd8bb8d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dict.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Dict.java @@ -10,13 +10,12 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; @Getter @Setter @TableName("sys_dict") -public class Dict extends BaseEntity implements Serializable { +public class Dict extends BaseEntity { @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/DictDetail.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/DictDetail.java index cea6fec9..1d3d783f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/DictDetail.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/DictDetail.java @@ -10,12 +10,11 @@ import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotNull; -import java.io.Serializable; @Getter @Setter @TableName("sys_dict_detail") -public class DictDetail extends BaseEntity implements Serializable { +public class DictDetail extends BaseEntity { @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Job.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Job.java index 2aa9c76c..be53b622 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Job.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Job.java @@ -10,14 +10,13 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.Objects; @Getter @Setter @TableName("sys_job") -public class Job extends BaseEntity implements Serializable { +public class Job extends BaseEntity { @NotNull(groups = Update.class) @TableId(value = "job_id", type = IdType.AUTO) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Menu.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Menu.java index d49430bd..749278b3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Menu.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Menu.java @@ -11,7 +11,6 @@ import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.List; import java.util.Objects; import java.util.Set; @@ -19,7 +18,7 @@ import java.util.Set; @Getter @Setter @TableName("sys_menu") -public class Menu extends BaseEntity implements Serializable { +public class Menu extends BaseEntity { @NotNull(groups = {Update.class}) @TableId(value = "menu_id", type = IdType.AUTO) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Role.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Role.java index 0466dac4..944a9cc9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Role.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/Role.java @@ -12,7 +12,6 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.Objects; import java.util.Set; @@ -22,7 +21,7 @@ import java.util.Set; @Getter @Setter @TableName("sys_role") -public class Role extends BaseEntity implements Serializable { +public class Role extends BaseEntity { @NotNull(groups = {Update.class}) @TableId(value = "role_id", type = IdType.AUTO) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/User.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/User.java index 9bd2bd01..cbe34576 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/User.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/User.java @@ -12,7 +12,6 @@ import lombok.Setter; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.Date; import java.util.Objects; import java.util.Set; @@ -20,7 +19,7 @@ import java.util.Set; @Getter @Setter @TableName("sys_user") -public class User extends BaseEntity implements Serializable { +public class User extends BaseEntity { @NotNull(groups = Update.class) @TableId(value = "user_id", type = IdType.AUTO) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuMetaVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuMetaVo.java index 0592e049..784a1227 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuMetaVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuMetaVo.java @@ -1,14 +1,15 @@ package cn.odboy.modules.system.domain.dto; +import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; - -import java.io.Serializable; +import lombok.EqualsAndHashCode; @Data @AllArgsConstructor -public class MenuMetaVo implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class MenuMetaVo extends MyObject { @ApiModelProperty(value = "菜单标题") private String title; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuVo.java index ee6c465d..aa13c99d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/MenuVo.java @@ -1,16 +1,18 @@ package cn.odboy.modules.system.domain.dto; +import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.List; /** * 构建前端路由时用到 */ @Data -public class MenuVo implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class MenuVo extends MyObject { @ApiModelProperty(value = "菜单名称") private String name; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/UserQueryCriteria.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/UserQueryCriteria.java index 277f9ea5..2b6ac6f3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/UserQueryCriteria.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/domain/dto/UserQueryCriteria.java @@ -1,16 +1,18 @@ package cn.odboy.modules.system.domain.dto; +import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.sql.Timestamp; import java.util.HashSet; import java.util.List; import java.util.Set; @Data -public class UserQueryCriteria implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class UserQueryCriteria extends MyObject { @ApiModelProperty(value = "ID") private Long id; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/EmailConfig.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/EmailConfig.java index 16f09a5a..256466a8 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/EmailConfig.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/EmailConfig.java @@ -1,19 +1,21 @@ package cn.odboy.domain; +import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; /** * 邮件配置类，数据存覆盖式存入数据存 */ @Data @TableName("tool_email_config") -public class EmailConfig implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class EmailConfig extends MyObject { @TableId("config_id") private Long id; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/LocalStorage.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/LocalStorage.java index 5d2aa295..84bb28ea 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/LocalStorage.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/LocalStorage.java @@ -11,13 +11,11 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.io.Serializable; - @Getter @Setter @NoArgsConstructor @TableName("tool_local_storage") -public class LocalStorage extends BaseEntity implements Serializable { +public class LocalStorage extends BaseEntity { @TableId(value = "storage_id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuConfig.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuConfig.java index e7008e88..20b5bfbd 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuConfig.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuConfig.java @@ -1,19 +1,21 @@ package cn.odboy.domain; +import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; /** * 七牛云对象存储配置类 */ @Data @TableName("tool_qiniu_config") -public class QiniuConfig implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class QiniuConfig extends MyObject { @TableId("config_id") private Long id; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuContent.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuContent.java index ba527240..7dc80a5b 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuContent.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/domain/QiniuContent.java @@ -1,10 +1,11 @@ package cn.odboy.domain; +import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.sql.Timestamp; /** @@ -12,7 +13,8 @@ import java.sql.Timestamp; */ @Data @TableName("tool_qiniu_content") -public class QiniuContent implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class QiniuContent extends MyObject { @TableId(value = "content_id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true)