From c05584ba664c477a3aea1d5f47f8d42b33d8b798 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 23 Mar 2024 19:41:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20Crane4j=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew/admin/system/model/resp/RoleDetailResp.java | 4 ++++ .../continew/admin/system/model/resp/UserDetailResp.java | 3 +++ .../continew/admin/system/service/impl/RoleServiceImpl.java | 2 -- .../continew/admin/system/service/impl/UserServiceImpl.java | 3 +-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java index ebb5df05..c685b73f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java @@ -16,10 +16,13 @@ package top.charles7c.continew.admin.system.model.resp; +import cn.crane4j.annotation.Assemble; +import cn.crane4j.annotation.Mapping; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.charles7c.continew.admin.common.constant.ContainerConstants; import top.charles7c.continew.admin.common.enums.DataScopeEnum; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; @@ -37,6 +40,7 @@ import java.util.List; @Data @ExcelIgnoreUnannotated @Schema(description = "角色详情信息") +@Assemble(container = ContainerConstants.ROLE_DEPT_ID_LIST, key = "id", props = @Mapping(ref = "deptIds")) public class RoleDetailResp extends BaseDetailResp { @Serial diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java index 105d0e44..e9ee623b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java @@ -16,6 +16,7 @@ package top.charles7c.continew.admin.system.model.resp; +import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.Mapping; @@ -23,6 +24,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.charles7c.continew.admin.common.constant.ContainerConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.GenderEnum; import top.charles7c.continew.admin.common.util.helper.LoginHelper; @@ -44,6 +46,7 @@ import java.util.Objects; @Data @ExcelIgnoreUnannotated @Schema(description = "用户详情信息") +@Assemble(container = ContainerConstants.USER_ROLE_ID_LIST, key = "id", props = @Mapping(ref = "roleIds")) public class UserDetailResp extends BaseDetailResp { @Serial diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java index b9cab844..4d277b66 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java @@ -131,8 +131,6 @@ public class RoleServiceImpl extends BaseServiceImpl deptIdList = roleDeptService.listDeptIdByRoleId(roleId); - detail.setDeptIds(deptIdList); if (SysConstants.ADMIN_ROLE_CODE.equals(detail.getCode())) { List list = menuService.listAll(); List menuIds = list.stream().map(MenuResp::getId).toList(); diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java index f1e16463..ef3fd45e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java @@ -153,8 +153,7 @@ public class UserServiceImpl extends BaseServiceImpl roleIdList = userRoleService.listRoleIdByUserId(detail.getId()); - detail.setRoleIds(roleIdList); + List roleIdList = detail.getRoleIds(); if (CollUtil.isNotEmpty(roleIdList)) { detail.setRoleNames(String.join(StringConstants.CHINESE_COMMA, roleService.listNameByIds(roleIdList))); }