refactor(common-base-model): Lombok annotations for optimized entities and DTO classes

2026-05-23 17:18:44 +00:00 · 2025-05-30 15:31:05 +08:00 · 2025-05-30 15:31:05 +08:00 · 83e1f95b7a
commit 83e1f95b7a
parent 5cbf6026e2
28 changed files with 83 additions and 99 deletions
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileCreateDto.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileCreateDto.java
@ -4,16 +4,14 @@ import com.bgasol.common.core.base.dto.BaseCreateDto;
 import com.bgasol.model.file.file.entity.FileEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.springframework.web.multipart.MultipartFile;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "创建文件")
 public class FileCreateDto extends BaseCreateDto<FileEntity> {
    @Schema(description = "要上传的文件块")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FilePageDto.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FilePageDto.java
@ -5,16 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.bgasol.common.core.base.dto.BasePageDto;
 import com.bgasol.model.file.file.entity.FileEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "文件分页查询参数")
 public class FilePageDto extends BasePageDto<FileEntity> {
    @Schema(description = "文件名称")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileUpdateDto.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileUpdateDto.java
@ -3,15 +3,13 @@ package com.bgasol.model.file.file.dto;
 import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.file.file.entity.FileEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "更新文件")
 public class FileUpdateDto extends BaseUpdateDto<FileEntity> {
    @Override
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/entity/FileEntity.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/entity/FileEntity.java
@ -7,10 +7,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
-@AllArgsConstructor
@NoArgsConstructor
@TableName("t_file")
@Schema(description = "文件实体类")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImageCreateDto.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImageCreateDto.java
@ -4,15 +4,13 @@ import com.bgasol.common.core.base.dto.BaseCreateDto;
 import com.bgasol.model.file.image.entity.ImageEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "创建图片实体类")
 public class ImageCreateDto extends BaseCreateDto<ImageEntity> {
    @Schema(description = "图片名称")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImagePageDto.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImagePageDto.java
@ -5,16 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.bgasol.common.core.base.dto.BasePageDto;
 import com.bgasol.model.file.image.entity.ImageEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "图片分页查询参数")
 public class ImagePageDto extends BasePageDto<ImageEntity> {
    @Schema(description = "图片名称")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImageUpdateDto.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImageUpdateDto.java
@ -4,15 +4,13 @@ import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.file.image.entity.ImageEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "更新图片实体类")
 public class ImageUpdateDto extends BaseUpdateDto<ImageEntity> {
    @Schema(description = "图片名称")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/entity/ImageEntity.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/entity/ImageEntity.java
@ -11,10 +11,9 @@ import jakarta.persistence.Transient;
 import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
-@AllArgsConstructor
@NoArgsConstructor
@TableName("t_image")
@Schema(description = "图片实体类")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/dto/DepartmentCreateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/dto/DepartmentCreateDto.java
@ -3,17 +3,15 @@ package com.bgasol.model.system.department.dto;
 import com.bgasol.common.core.base.dto.BaseCreateDto;
 import com.bgasol.model.system.department.entity.DepartmentEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;

 import static com.bgasol.model.system.department.mapstruct.DepartmentMapstruct.DEPARTMENT_MAPSTRUCT_IMPL;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "新增部门Dto")
 public class DepartmentCreateDto extends BaseCreateDto<DepartmentEntity> {

--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/dto/DepartmentUpdateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/dto/DepartmentUpdateDto.java
@ -4,16 +4,14 @@ import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.system.department.entity.DepartmentEntity;
 import com.bgasol.model.system.department.mapstruct.DepartmentMapstruct;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.mapstruct.factory.Mappers;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "更新部门Dto")
 public class DepartmentUpdateDto extends BaseUpdateDto<DepartmentEntity> {
    @Schema(description = "部门名")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/entity/DepartmentEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/entity/DepartmentEntity.java
@ -7,10 +7,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
-@AllArgsConstructor
@NoArgsConstructor
@Schema(description = "部门实体")
@TableName("t_department")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/dto/MenuCreateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/dto/MenuCreateDto.java
@ -4,12 +4,14 @@ package com.bgasol.model.system.menu.dto;
 import com.bgasol.common.core.base.dto.BaseCreateDto;
 import com.bgasol.model.system.menu.entity.MenuEntity;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
 public class MenuCreateDto extends BaseCreateDto<MenuEntity> {
    @Override
    public MenuEntity toEntity() {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/dto/MenuUpdateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/dto/MenuUpdateDto.java
@ -4,12 +4,14 @@ package com.bgasol.model.system.menu.dto;
 import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.system.menu.entity.MenuEntity;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
 public class MenuUpdateDto extends BaseUpdateDto<MenuEntity> {
    @Override
    public MenuEntity toEntity() {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java
@ -12,11 +12,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
@NoArgsConstructor
-@AllArgsConstructor
@Schema(description = "菜单实体")
@TableName("t_menu")
 public class MenuEntity extends BaseTreeEntity<MenuEntity> {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/dto/PermissionCreateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/dto/PermissionCreateDto.java
@ -4,12 +4,14 @@ package com.bgasol.model.system.permission.dto;
 import com.bgasol.common.core.base.dto.BaseCreateDto;
 import com.bgasol.model.system.permission.entity.PermissionEntity;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
 public class PermissionCreateDto extends BaseCreateDto<PermissionEntity> {
    @Override
    public PermissionEntity toEntity() {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/dto/PermissionUpdateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/dto/PermissionUpdateDto.java
@ -4,12 +4,14 @@ package com.bgasol.model.system.permission.dto;
 import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.system.permission.entity.PermissionEntity;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
 public class PermissionUpdateDto extends BaseUpdateDto<PermissionEntity> {
    @Override
    public PermissionEntity toEntity() {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/entity/PermissionEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/entity/PermissionEntity.java
@ -7,11 +7,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
@NoArgsConstructor
-@AllArgsConstructor
@Schema(description = "权限实体")
@TableName("t_permission")
 public class PermissionEntity extends BaseTreeEntity<PermissionEntity> {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/dto/RoleCreateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/dto/RoleCreateDto.java
@ -6,10 +6,7 @@ import com.bgasol.model.system.permission.entity.PermissionEntity;
 import com.bgasol.model.system.role.entity.RoleEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;

 import java.util.List;
@ -18,9 +15,10 @@ import java.util.stream.Stream;

 import static com.bgasol.model.system.role.mapstruct.RoleMapstruct.ROLE_MAPSTRUCT_IMPL;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "新增角色实体")
 public class RoleCreateDto extends BaseCreateDto<RoleEntity> {

--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/dto/RoleUpdateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/dto/RoleUpdateDto.java
@ -6,10 +6,7 @@ import com.bgasol.model.system.permission.entity.PermissionEntity;
 import com.bgasol.model.system.role.entity.RoleEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;

 import java.util.List;
@ -18,9 +15,10 @@ import java.util.stream.Stream;

 import static com.bgasol.model.system.role.mapstruct.RoleMapstruct.ROLE_MAPSTRUCT_IMPL;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "更新角色实体")
 public class RoleUpdateDto extends BaseUpdateDto<RoleEntity> {
    @NotBlank(message = "角色名不能为空")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/entity/RoleEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/entity/RoleEntity.java
@ -14,11 +14,10 @@ import lombok.experimental.SuperBuilder;

 import java.util.List;

-@Getter
@Setter
+@Getter
@SuperBuilder
@NoArgsConstructor
-@AllArgsConstructor
@Schema(description = "角色实体")
@TableName("t_role")
 public class RoleEntity extends BaseEntity {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserCreateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserCreateDto.java
@ -6,10 +6,7 @@ import com.bgasol.model.system.user.entity.UserEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;

@ -17,9 +14,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "创建用户数据传输对象")
 public class UserCreateDto extends BaseCreateDto<UserEntity> {
    @NotBlank(message = "用户名不能为空")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserLoginDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserLoginDto.java
@ -3,8 +3,15 @@ package com.bgasol.model.system.user.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;

-@Data
+@Setter
+@Getter
+@SuperBuilder
+@NoArgsConstructor
@Schema(description = "登录用户数据传输对象")
 public class UserLoginDto {

--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPageDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPageDto.java
@ -5,16 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.bgasol.common.core.base.dto.BasePageDto;
 import com.bgasol.model.system.user.entity.UserEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "用户分页查询参数")
 public class UserPageDto extends BasePageDto<UserEntity> {
    @Schema(description = "用户名")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPasswordResetDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPasswordResetDto.java
@ -4,15 +4,13 @@ import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.system.user.entity.UserEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "重置用户密码数据传输对象")
 public class UserPasswordResetDto extends BaseUpdateDto<UserEntity> {
    @NotBlank(message = "新密码不能为空")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPasswordUpdateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPasswordUpdateDto.java
@ -3,9 +3,16 @@ package com.bgasol.model.system.user.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;

+@Setter
+@Getter
+@SuperBuilder
+@NoArgsConstructor
@Schema(description = "更新用户密码数据传输对象")
-@Data
 public class UserPasswordUpdateDto {
    @Schema(description = "旧密码")
    @NotBlank(message = "旧密码不能为空")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserUpdateDto.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserUpdateDto.java
@ -6,10 +6,7 @@ import com.bgasol.model.system.user.entity.UserEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;

@ -17,9 +14,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-@Getter
@Setter
+@Getter
@SuperBuilder
+@NoArgsConstructor
@Schema(description = "更新用户数据传输对象")
 public class UserUpdateDto extends BaseUpdateDto<UserEntity> {
    @NotBlank(message = "用户名不能为空")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java
@ -16,11 +16,10 @@ import lombok.experimental.SuperBuilder;

 import java.util.List;

-@Getter
@Setter
+@Getter
@SuperBuilder
@NoArgsConstructor
-@AllArgsConstructor
@Schema(description = "用户实体类")
@TableName("t_user")
 public class UserEntity extends BaseEntity {
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/vo/VerificationVo.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/vo/VerificationVo.java
@ -1,16 +1,13 @@
 package com.bgasol.model.system.user.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import lombok.experimental.SuperBuilder;

-@Data
-@Schema(description = "验证码结果")
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
+@Setter
+@Getter
+@SuperBuilder
+@NoArgsConstructor@Schema(description = "验证码结果")
 public class VerificationVo {

    @Schema(description = "验证码图片的base64编码")