diff --git a/cloud/common/common-auth/src/main/java/com/bgasol/plugin/satoken/service/StpInterfaceImpl.java b/cloud/common/common-auth/src/main/java/com/bgasol/plugin/satoken/service/StpInterfaceImpl.java index 324f1b0..c97f74f 100644 --- a/cloud/common/common-auth/src/main/java/com/bgasol/plugin/satoken/service/StpInterfaceImpl.java +++ b/cloud/common/common-auth/src/main/java/com/bgasol/plugin/satoken/service/StpInterfaceImpl.java @@ -15,6 +15,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import static com.bgasol.common.constant.value.SystemConfigValues.ADMIN_USER_ID; + /** * 自定义权限验证接口扩展 */ @@ -39,7 +41,7 @@ public class StpInterfaceImpl implements StpInterface { public List getPermissionList(Object loginId, String loginType) { UserEntity user = this.getUser((String) loginId, loginType); Set permissions = new HashSet<>(); - if (user.getId().equals("admin")) { + if (user.getId().equals(ADMIN_USER_ID)) { permissions.add("*"); } else { for (RoleEntity role : user.getRoles()) { @@ -60,7 +62,7 @@ public class StpInterfaceImpl implements StpInterface { public List getRoleList(Object loginId, String loginType) { UserEntity user = this.getUser((String) loginId, loginType); Set roles = new HashSet<>(); - if (user.getId().equals("admin")) { + if (user.getId().equals(ADMIN_USER_ID)) { roles.add("*"); } else { for (RoleEntity role : user.getRoles()) { diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java index d1dfbac..d131209 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java @@ -1,6 +1,7 @@ package com.bgasol.common.core.base.dto; import com.bgasol.common.core.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; @@ -25,6 +26,7 @@ public abstract class BaseCreateDto { * * @return ENTITY */ + @JsonIgnore @Schema(hidden = true) public abstract ENTITY toEntity(); @@ -34,6 +36,7 @@ public abstract class BaseCreateDto { * @param entity 实体 * @return ENTITY */ + @JsonIgnore @Schema(hidden = true) public ENTITY toEntity(ENTITY entity) { entity.setSort(this.getSort()); diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java index 6dfb856..2541e6b 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java @@ -1,6 +1,7 @@ package com.bgasol.common.core.base.dto; import com.bgasol.common.core.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Getter; @@ -30,9 +31,11 @@ public abstract class BaseUpdateDto { * * @return ENTITY */ + @JsonIgnore @Schema(hidden = true) public abstract ENTITY toEntity(); + @JsonIgnore @Schema(hidden = true) public ENTITY toEntity(ENTITY entity) { entity.setSort(this.getSort()); diff --git 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 index dd79ce6..dfe3cff 100644 --- 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 @@ -3,6 +3,7 @@ package com.bgasol.model.file.file.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.file.file.entity.FileEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; @@ -34,6 +35,8 @@ public class FileCreateDto extends BaseCreateDto { private String source; @Override + @JsonIgnore + @Schema(hidden = true) public FileEntity toEntity() { return super.toEntity(FILE_MAPSTRUCT_IMPL.toEntity(this)); } diff --git 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 index 67f5c51..0de2ab0 100644 --- 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,6 +3,7 @@ package com.bgasol.model.file.file.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.file.file.entity.FileEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; @@ -34,6 +35,8 @@ public class FileUpdateDto extends BaseUpdateDto { private String source; @Override + @JsonIgnore + @Schema(hidden = true) public FileEntity toEntity() { return super.toEntity(FILE_MAPSTRUCT_IMPL.toEntity(this)); } diff --git 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 index f04fb60..42635f3 100644 --- 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 @@ -2,6 +2,7 @@ package com.bgasol.model.file.image.dto; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.file.image.entity.ImageEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.*; @@ -21,6 +22,8 @@ public class ImageCreateDto extends BaseCreateDto { private String fileId; @Override + @JsonIgnore + @Schema(hidden = true) public ImageEntity toEntity() { ImageEntity imageEntity = new ImageEntity(); imageEntity.setName(name); diff --git 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 index 91b9adb..9c9c4a3 100644 --- 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 @@ -2,6 +2,7 @@ package com.bgasol.model.file.image.dto; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.file.image.entity.ImageEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.*; @@ -21,6 +22,8 @@ public class ImageUpdateDto extends BaseUpdateDto { private String fileId; @Override + @JsonIgnore + @Schema(hidden = true) public ImageEntity toEntity() { ImageEntity imageEntity = new ImageEntity(); imageEntity.setName(name); diff --git a/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoCreateDto.java b/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoCreateDto.java index e5684a8..27d0062 100644 --- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoCreateDto.java +++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoCreateDto.java @@ -2,6 +2,7 @@ package com.bgasol.model.file.video.dto; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.file.video.entity.VideoEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; @@ -42,8 +43,10 @@ public class VideoCreateDto extends BaseCreateDto { private String fileId; @Override + @JsonIgnore + @Schema(hidden = true) public VideoEntity toEntity() { - return this.toEntity(VideoEntity.builder() + VideoEntity videoEntity = VideoEntity.builder() .name(name) .width(width) .height(height) @@ -52,7 +55,7 @@ public class VideoCreateDto extends BaseCreateDto { .bitrate(bitrate) .fps(fps) .codec(codec) - .fileId(fileId) - .build()); + .fileId(fileId).build(); + return this.toEntity(videoEntity); } } diff --git a/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoUpdateDto.java b/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoUpdateDto.java index 775ee9d..6657a5f 100644 --- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoUpdateDto.java +++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/dto/VideoUpdateDto.java @@ -2,6 +2,7 @@ package com.bgasol.model.file.video.dto; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.file.video.entity.VideoEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; @@ -42,8 +43,10 @@ public class VideoUpdateDto extends BaseUpdateDto { private String fileId; @Override + @JsonIgnore + @Schema(hidden = true) public VideoEntity toEntity() { - return this.toEntity(VideoEntity.builder() + VideoEntity videoEntity = VideoEntity.builder() .name(name) .width(width) .height(height) @@ -52,7 +55,7 @@ public class VideoUpdateDto extends BaseUpdateDto { .bitrate(bitrate) .fps(fps) .codec(codec) - .fileId(fileId) - .build()); + .fileId(fileId).build(); + return this.toEntity(videoEntity); } } diff --git 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 index fcca1c4..0eea4df 100644 --- 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 @@ -2,6 +2,7 @@ package com.bgasol.model.system.department.dto; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.system.department.entity.DepartmentEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; @@ -40,6 +41,8 @@ public class DepartmentCreateDto extends BaseCreateDto { private String parentId; @Override + @JsonIgnore + @Schema(hidden = true) public DepartmentEntity toEntity() { return super.toEntity(DEPARTMENT_MAPSTRUCT_IMPL.toEntity(this)); } diff --git 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 index 7d78318..520c16f 100644 --- 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 @@ -3,6 +3,7 @@ package com.bgasol.model.system.department.dto; 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 com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; @@ -39,6 +40,8 @@ public class DepartmentUpdateDto extends BaseUpdateDto { private String parentId; @Override + @JsonIgnore + @Schema(hidden = true) public DepartmentEntity toEntity() { DepartmentMapstruct mapper = Mappers.getMapper(DepartmentMapstruct.class); return super.toEntity(mapper.toEntity(this)); diff --git 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 index 0a6e7aa..ef81291 100644 --- 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 @@ -3,6 +3,8 @@ package com.bgasol.model.system.menu.dto; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.system.menu.entity.MenuEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -14,6 +16,8 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor public class MenuCreateDto extends BaseCreateDto { @Override + @JsonIgnore + @Schema(hidden = true) public MenuEntity toEntity() { throw new UnsupportedOperationException("Not implemented yet"); } diff --git 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 index f656c59..b6dc450 100644 --- 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 @@ -3,6 +3,8 @@ package com.bgasol.model.system.menu.dto; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.system.menu.entity.MenuEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -14,6 +16,8 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor public class MenuUpdateDto extends BaseUpdateDto { @Override + @JsonIgnore + @Schema(hidden = true) public MenuEntity toEntity() { throw new UnsupportedOperationException("Not implemented yet"); } diff --git 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 index 0b4f48c..de03637 100644 --- 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 @@ -3,6 +3,8 @@ package com.bgasol.model.system.permission.dto; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.system.permission.entity.PermissionEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -14,6 +16,8 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor public class PermissionCreateDto extends BaseCreateDto { @Override + @JsonIgnore + @Schema(hidden = true) public PermissionEntity toEntity() { throw new UnsupportedOperationException("Not implemented yet"); } diff --git 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 index 8b769f5..b5335c9 100644 --- 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 @@ -3,6 +3,8 @@ package com.bgasol.model.system.permission.dto; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.system.permission.entity.PermissionEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -14,6 +16,8 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor public class PermissionUpdateDto extends BaseUpdateDto { @Override + @JsonIgnore + @Schema(hidden = true) public PermissionEntity toEntity() { throw new UnsupportedOperationException("Not implemented yet"); } diff --git 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 index 7a96362..9956a9e 100644 --- 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 @@ -4,6 +4,7 @@ import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.system.menu.entity.MenuEntity; import com.bgasol.model.system.permission.entity.PermissionEntity; import com.bgasol.model.system.role.entity.RoleEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.*; @@ -37,6 +38,8 @@ public class RoleCreateDto extends BaseCreateDto { private List menuIds; @Override + @JsonIgnore + @Schema(hidden = true) public RoleEntity toEntity() { RoleEntity roleEntity = ROLE_MAPSTRUCT_IMPL.toEntity(this); if (permissionIds != null) { diff --git 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 index 797ed1c..ffa71f2 100644 --- 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 @@ -4,6 +4,7 @@ import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.system.menu.entity.MenuEntity; import com.bgasol.model.system.permission.entity.PermissionEntity; import com.bgasol.model.system.role.entity.RoleEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.*; @@ -36,6 +37,8 @@ public class RoleUpdateDto extends BaseUpdateDto { private List menuIds; @Override + @JsonIgnore + @Schema(hidden = true) public RoleEntity toEntity() { RoleEntity roleEntity = ROLE_MAPSTRUCT_IMPL.toEntity(this); if (permissionIds != null) { diff --git 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 index 36510f9..d779eb7 100644 --- 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 @@ -3,10 +3,13 @@ package com.bgasol.model.system.user.dto; import com.bgasol.common.core.base.dto.BaseCreateDto; import com.bgasol.model.system.role.entity.RoleEntity; import com.bgasol.model.system.user.entity.UserEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.ObjectUtils; @@ -14,6 +17,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.bgasol.common.constant.value.SystemConfigValues.DEFAULT_DEPARTMENT_ID; + @Setter @Getter @SuperBuilder @@ -50,6 +55,8 @@ public class UserCreateDto extends BaseCreateDto { private String departmentId; @Override + @JsonIgnore + @Schema(hidden = true) public UserEntity toEntity() { UserEntity user = new UserEntity(); user.setUsername(username); @@ -61,7 +68,7 @@ public class UserCreateDto extends BaseCreateDto { if (ObjectUtils.isNotEmpty(departmentId)) { user.setDepartmentId(departmentId); } else { - user.setDepartmentId("default"); + user.setDepartmentId(DEFAULT_DEPARTMENT_ID); } if (roleIds != null) { Stream roleEntityStream = roleIds.stream().map((id) -> { diff --git 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 index 7273f4b..965fe60 100644 --- 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 @@ -2,6 +2,7 @@ package com.bgasol.model.system.user.dto; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.system.user.entity.UserEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.*; @@ -18,6 +19,8 @@ public class UserPasswordResetDto extends BaseUpdateDto { private String password; @Override + @JsonIgnore + @Schema(hidden = true) public UserEntity toEntity() { UserEntity user = new UserEntity(); user.setId(this.getId()); diff --git 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 index df703c3..f94fc0f 100644 --- 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 @@ -3,10 +3,13 @@ package com.bgasol.model.system.user.dto; import com.bgasol.common.core.base.dto.BaseUpdateDto; import com.bgasol.model.system.role.entity.RoleEntity; import com.bgasol.model.system.user.entity.UserEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.ObjectUtils; @@ -14,6 +17,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.bgasol.common.constant.value.SystemConfigValues.DEFAULT_DEPARTMENT_ID; + @Setter @Getter @SuperBuilder @@ -44,6 +49,8 @@ public class UserUpdateDto extends BaseUpdateDto { private String departmentId; @Override + @JsonIgnore + @Schema(hidden = true) public UserEntity toEntity() { UserEntity user = new UserEntity(); user.setUsername(username); @@ -55,7 +62,7 @@ public class UserUpdateDto extends BaseUpdateDto { if (ObjectUtils.isNotEmpty(departmentId)) { user.setDepartmentId(departmentId); } else { - user.setDepartmentId("default"); + user.setDepartmentId(DEFAULT_DEPARTMENT_ID); } if (roleIds != null) { Stream roleEntityStream = roleIds.stream().map((id) -> { diff --git a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/controller/DepartmentController.java b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/controller/DepartmentController.java index 0a408ba..71d94b5 100644 --- a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/controller/DepartmentController.java +++ b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/controller/DepartmentController.java @@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import static com.bgasol.common.constant.value.SystemConfigValues.DEFAULT_DEPARTMENT_ID; + @RestController @RequiredArgsConstructor @Tag(name = "部门管理") @@ -78,7 +80,7 @@ public class DepartmentController extends BaseController< @GetMapping("/find-by-id-is-default") @Operation(summary = "查询默认部门", operationId = "findDefaultDepartment") public BaseVo findById() { - return super.findById("default"); + return super.findById(DEFAULT_DEPARTMENT_ID); } @GetMapping("/get-my-department") diff --git a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/service/DepartmentService.java b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/service/DepartmentService.java index b809f22..b807922 100644 --- a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/service/DepartmentService.java +++ b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/department/service/DepartmentService.java @@ -15,6 +15,8 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import static com.bgasol.common.constant.value.SystemConfigValues.DEFAULT_DEPARTMENT_ID; + @Service @RequiredArgsConstructor(onConstructor_ = {@Lazy}) @Transactional @@ -59,6 +61,6 @@ public class DepartmentService extends BaseService