diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java index 13a794162..303d7a9f5 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java @@ -2,15 +2,11 @@ package org.dromara.common.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * Entity基类 @@ -23,13 +19,6 @@ public class BaseEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 搜索值 - */ - @JsonIgnore - @TableField(exist = false) - private String searchValue; - /** * 创建部门 */ @@ -60,11 +49,4 @@ public class BaseEntity implements Serializable { @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; - /** - * 请求参数 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @TableField(exist = false) - private Map params = new HashMap<>(); - } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java index ef21980d3..a74964b02 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java @@ -1,15 +1,15 @@ package org.dromara.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.demo.domain.TestDemo; + +import java.io.Serial; +import java.io.Serializable; /** * 测试单表业务对象 test_demo @@ -19,9 +19,11 @@ import jakarta.validation.constraints.NotNull; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = TestDemo.class, reverseConvertGenerate = false) -public class TestDemoBo extends BaseEntity { +public class TestDemoBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 主键 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java index 1bbac0e88..a8fd805f8 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java @@ -1,14 +1,15 @@ package org.dromara.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.demo.domain.TestTree; + +import java.io.Serial; +import java.io.Serializable; /** * 测试树表业务对象 test_tree @@ -18,9 +19,11 @@ import lombok.EqualsAndHashCode; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = TestTree.class, reverseConvertGenerate = false) -public class TestTreeBo extends BaseEntity { +public class TestTreeBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 主键 diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index 511d37c04..8ff476cbe 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -1,12 +1,12 @@ package ${packageName}.domain.bo; import ${packageName}.domain.${ClassName}; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import java.io.Serial; +import java.io.Serializable; import lombok.Data; -import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; #foreach ($import in $importList) import ${import}; @@ -19,9 +19,11 @@ import ${import}; * @date ${datetime} */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false) -public class ${ClassName}Bo extends BaseEntity { +public class ${ClassName}Bo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; #foreach ($column in $columns) #if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit)) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java index 1929bbf2d..816b7bf3e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java @@ -4,19 +4,19 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; +import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.MimeTypeUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.helper.DataPermissionHelper; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.bo.SysUserPasswordBo; import org.dromara.system.domain.bo.SysUserProfileBo; import org.dromara.system.domain.vo.ProfileUserVo; import org.dromara.system.domain.vo.SysOssVo; @@ -99,13 +99,13 @@ public class SysProfileController extends BaseController { public R updatePwd(@Validated @RequestBody SysUserPasswordBo bo) { SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); String password = user.getPassword(); - if (!BCrypt.checkpw(bo.getOldPassword(), password)) { + if (!BCrypt.checkpw(bo.oldPassword(), password)) { return R.fail("修改密码失败,旧密码错误"); } - if (BCrypt.checkpw(bo.getNewPassword(), password)) { + if (BCrypt.checkpw(bo.newPassword(), password)) { return R.fail("新密码不能与旧密码相同"); } - int rows = DataPermissionHelper.ignore(() -> userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword()))); + int rows = DataPermissionHelper.ignore(() -> userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.newPassword()))); if (rows > 0) { return R.ok(); } @@ -153,4 +153,15 @@ public class SysProfileController extends BaseController { */ public record ProfileVo(ProfileUserVo user, String roleGroup, String postGroup) {} + /** + * 用户密码修改 + * + * @param oldPassword 旧密码 + * @param newPassword 新密码 + */ + public record SysUserPasswordBo( + @NotBlank(message = "旧密码不能为空") String oldPassword, + @NotBlank(message = "新密码不能为空") String newPassword) { + } + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java index e5f5ffa3f..bbc8e0e85 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java @@ -1,14 +1,15 @@ package org.dromara.system.domain.bo; -import org.dromara.system.domain.SysClient; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.system.domain.SysClient; +import java.io.Serial; +import java.io.Serializable; import java.util.List; /** @@ -18,9 +19,11 @@ import java.util.List; * @date 2023-05-15 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysClient.class, reverseConvertGenerate = false) -public class SysClientBo extends BaseEntity { +public class SysClientBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * id diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java index 257935dd1..cbb1c8477 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java @@ -4,10 +4,12 @@ import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysConfig; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + /** * 参数配置业务对象 sys_config * @@ -15,9 +17,8 @@ import org.dromara.system.domain.SysConfig; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysConfig.class, reverseConvertGenerate = false) -public class SysConfigBo extends BaseEntity { +public class SysConfigBo implements Serializable { /** * 参数主键 @@ -55,5 +56,9 @@ public class SysConfigBo extends BaseEntity { */ private String remark; + /** + * 请求参数 + */ + private Map params = new HashMap<>(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java index 0d8ac84b9..9f5451d5d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -6,10 +6,11 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysDept; +import java.io.Serial; +import java.io.Serializable; + /** * 部门业务对象 sys_dept * @@ -17,9 +18,11 @@ import org.dromara.system.domain.SysDept; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysDept.class, reverseConvertGenerate = false) -public class SysDeptBo extends BaseEntity { +public class SysDeptBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 部门id diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java index 042946ca1..34a30faf7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java @@ -2,13 +2,13 @@ package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysDictData; +import java.io.Serial; +import java.io.Serializable; + /** * 字典数据业务对象 sys_dict_data * @@ -16,9 +16,11 @@ import org.dromara.system.domain.SysDictData; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysDictData.class, reverseConvertGenerate = false) -public class SysDictDataBo extends BaseEntity { +public class SysDictDataBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 字典编码 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java index fcc1ac11d..d822dbe5d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java @@ -5,11 +5,12 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysDictType; +import java.io.Serial; +import java.io.Serializable; + /** * 字典类型业务对象 sys_dict_type * @@ -17,9 +18,11 @@ import org.dromara.system.domain.SysDictType; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysDictType.class, reverseConvertGenerate = false) -public class SysDictTypeBo extends BaseEntity { +public class SysDictTypeBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 字典主键 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java index 4b639e754..93b2bc5c2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java @@ -1,9 +1,11 @@ package org.dromara.system.domain.bo; -import org.dromara.system.domain.SysLoginInfo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.system.domain.SysLoginInfo; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -16,7 +18,10 @@ import java.util.Map; @Data @AutoMapper(target = SysLoginInfo.class, reverseConvertGenerate = false) -public class SysLoginInfoBo { +public class SysLoginInfoBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 访问ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java index 118c9544e..f1b419fe8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java @@ -7,13 +7,14 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; import org.dromara.common.core.constant.RegexConstants; import org.dromara.common.json.validate.JsonPattern; import org.dromara.common.json.validate.JsonType; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysMenu; +import java.io.Serial; +import java.io.Serializable; + /** * 菜单权限业务对象 sys_menu * @@ -21,9 +22,11 @@ import org.dromara.system.domain.SysMenu; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysMenu.class, reverseConvertGenerate = false) -public class SysMenuBo extends BaseEntity { +public class SysMenuBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 菜单ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java index cdcc57508..c5ac35198 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java @@ -4,11 +4,12 @@ import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysNotice; +import java.io.Serial; +import java.io.Serializable; + /** * 通知公告业务对象 sys_notice * @@ -16,9 +17,11 @@ import org.dromara.system.domain.SysNotice; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysNotice.class, reverseConvertGenerate = false) -public class SysNoticeBo extends BaseEntity { +public class SysNoticeBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 公告ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java index 8f547ee31..af69e237e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java @@ -1,11 +1,13 @@ package org.dromara.system.domain.bo; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; +import org.dromara.common.log.event.OperLogEvent; +import org.dromara.system.domain.SysOperLog; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -22,7 +24,10 @@ import java.util.Map; @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false), @AutoMapper(target = OperLogEvent.class) }) -public class SysOperLogBo { +public class SysOperLogBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 日志主键 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java index ff624c9bf..095c9ae78 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java @@ -1,10 +1,13 @@ package org.dromara.system.domain.bo; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import lombok.EqualsAndHashCode; +import org.dromara.system.domain.SysOss; + +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * OSS对象存储分页查询对象 sys_oss @@ -12,9 +15,11 @@ import lombok.EqualsAndHashCode; * @author Lion Li */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysOss.class, reverseConvertGenerate = false) -public class SysOssBo extends BaseEntity { +public class SysOssBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * ossId @@ -51,4 +56,9 @@ public class SysOssBo extends BaseEntity { */ private String service; + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java index 3dc4328c0..0da601259 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java @@ -1,15 +1,16 @@ package org.dromara.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.system.domain.SysOssConfig; + +import java.io.Serial; +import java.io.Serializable; /** * 对象存储配置业务对象 sys_oss_config @@ -20,9 +21,11 @@ import lombok.EqualsAndHashCode; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false) -public class SysOssConfigBo extends BaseEntity { +public class SysOssConfigBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 主键 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java index 09805cdda..589e54c60 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java @@ -5,10 +5,11 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysPost; +import java.io.Serial; +import java.io.Serializable; + /** * 岗位信息业务对象 sys_post * @@ -16,9 +17,11 @@ import org.dromara.system.domain.SysPost; */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysPost.class, reverseConvertGenerate = false) -public class SysPostBo extends BaseEntity { +public class SysPostBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 岗位ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java index 5e3e60260..26b9baadd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java @@ -5,12 +5,15 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysRole; +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + /** * 角色信息业务对象 sys_role * @@ -19,9 +22,11 @@ import org.dromara.system.domain.SysRole; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysRole.class, reverseConvertGenerate = false) -public class SysRoleBo extends BaseEntity { +public class SysRoleBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 角色ID @@ -91,4 +96,9 @@ public class SysRoleBo extends BaseEntity { return SystemConstants.SUPER_ADMIN_ID.equals(this.roleId); } + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java index c3292d168..1f5e48866 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java @@ -4,13 +4,14 @@ import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysSocial; +import java.io.Serial; +import java.io.Serializable; + /** * 社会化关系业务对象 sys_social * @@ -18,9 +19,11 @@ import org.dromara.system.domain.SysSocial; */ @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysSocial.class, reverseConvertGenerate = false) -public class SysSocialBo extends BaseEntity { +public class SysSocialBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 主键 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java index 11c01666d..2583f82fc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -5,13 +5,16 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysUser; +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + /** * 用户信息业务对象 sys_user * @@ -20,9 +23,11 @@ import org.dromara.system.domain.SysUser; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysUser.class, reverseConvertGenerate = false) -public class SysUserBo extends BaseEntity { +public class SysUserBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 用户ID @@ -121,4 +126,9 @@ public class SysUserBo extends BaseEntity { return SystemConstants.SUPER_ADMIN_ID.equals(this.userId); } + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java deleted file mode 100644 index 8615fcda2..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.system.domain.bo; - -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 用户密码修改bo - */ -@Data -public class SysUserPasswordBo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 旧密码 - */ - @NotBlank(message = "旧密码不能为空") - private String oldPassword; - - /** - * 新密码 - */ - @NotBlank(message = "新密码不能为空") - private String newPassword; -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java index 846dd7960..933410761 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java @@ -4,14 +4,15 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.dromara.common.core.constant.RegexConstants; import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.sensitive.annotation.Sensitive; import org.dromara.common.sensitive.core.SensitiveStrategy; +import java.io.Serial; +import java.io.Serializable; + /** * 个人信息业务处理 * @@ -20,8 +21,10 @@ import org.dromara.common.sensitive.core.SensitiveStrategy; @Data @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SysUserProfileBo extends BaseEntity { +public class SysUserProfileBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 用户昵称 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java index fd626eb0d..c2482fb92 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java @@ -4,12 +4,13 @@ import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.workflow.domain.FlowCategory; +import java.io.Serial; +import java.io.Serializable; + /** * 流程分类业务对象 wf_category * @@ -17,9 +18,11 @@ import org.dromara.workflow.domain.FlowCategory; * @date 2023-06-27 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = FlowCategory.class, reverseConvertGenerate = false) -public class FlowCategoryBo extends BaseEntity { +public class FlowCategoryBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 流程分类ID diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java index da78935c6..e508b643a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java @@ -1,14 +1,15 @@ package org.dromara.workflow.domain.bo; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; import org.dromara.workflow.domain.FlowSpel; +import java.io.Serial; +import java.io.Serializable; + /** * 流程spel表达式定义业务对象 flow_spel * @@ -16,9 +17,11 @@ import org.dromara.workflow.domain.FlowSpel; * @date 2025-07-04 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = FlowSpel.class, reverseConvertGenerate = false) -public class FlowSpelBo extends BaseEntity { +public class FlowSpelBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 主键id diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java index 2463569bd..e0b2cd0a8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java @@ -5,13 +5,13 @@ import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.workflow.domain.TestLeave; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; /** @@ -21,9 +21,11 @@ import java.util.Date; * @date 2023-07-21 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = TestLeave.class, reverseConvertGenerate = false) -public class TestLeaveBo extends BaseEntity { +public class TestLeaveBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 主键