refactor: 重构查询角色字典接口

continew-org · Jun 5, 2024 · 1e73d06 · 1e73d06
1 parent 1dbb339
commit 1e73d06
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java
@@ -19,6 +19,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import top.continew.admin.common.enums.DataScopeEnum;
+import top.continew.starter.extension.crud.annotation.DictField;
 import top.continew.starter.extension.crud.model.entity.BaseDO;
 
 import java.io.Serial;
@@ -30,6 +31,7 @@
  * @since 2023/2/8 22:54
  */
 @Data
+@DictField
 @TableName("sys_role")
 public class RoleDO extends BaseDO {
 

diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java
@@ -17,14 +17,13 @@
 package top.continew.admin.system.service;
 
 import top.continew.admin.common.model.dto.RoleDTO;
-import top.continew.admin.common.model.resp.LabelValueResp;
 import top.continew.admin.system.model.entity.RoleDO;
 import top.continew.admin.system.model.query.RoleQuery;
 import top.continew.admin.system.model.req.RoleReq;
 import top.continew.admin.system.model.resp.RoleDetailResp;
 import top.continew.admin.system.model.resp.RoleResp;
-import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.data.mybatis.plus.service.IService;
+import top.continew.starter.extension.crud.service.BaseService;
 
 import java.util.List;
 import java.util.Set;
@@ -37,14 +36,6 @@
  */
 public interface RoleService extends BaseService<RoleResp, RoleDetailResp, RoleQuery, RoleReq>, IService<RoleDO> {
 
- /**
- * 构建字典
- *
- * @param list 原始列表数据
- * @return 字典列表
- */
- List<LabelValueResp<Long>> buildDict(List<RoleResp> list);
-
  /**
  * 根据 ID 列表查询
  *

diff --git a/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java b/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java
@@ -31,7 +31,6 @@
 import top.continew.admin.common.constant.SysConstants;
 import top.continew.admin.common.enums.DataScopeEnum;
 import top.continew.admin.common.model.dto.RoleDTO;
-import top.continew.admin.common.model.resp.LabelValueResp;
 import top.continew.admin.system.mapper.RoleMapper;
 import top.continew.admin.system.model.entity.RoleDO;
 import top.continew.admin.system.model.query.RoleQuery;
@@ -136,14 +135,6 @@ protected void fill(Object obj) {
  }
  }
 
- @Override
- public List<LabelValueResp<Long>> buildDict(List<RoleResp> list) {
- if (CollUtil.isEmpty(list)) {
- return new ArrayList<>(0);
- }
- return list.stream().map(r -> new LabelValueResp<>(r.getName(), r.getId())).toList();
- }
-
  @Override
  @ContainerMethod(namespace = ContainerConstants.USER_ROLE_NAME_LIST, type = MappingType.ORDER_OF_KEYS)
  public List<String> listNameByIds(List<Long> ids) {

diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java
@@ -97,6 +97,8 @@ public R<List<Tree<Long>>> listMenuTree(MenuQuery query, SortQuery sortQuery) {
  @GetMapping("/dict/role")
  public R<List<LabelValueResp<Long>>> listRoleDict(RoleQuery query, SortQuery sortQuery) {
  return R.ok(roleService.buildDict(roleService.list(query, sortQuery)));
+ public R<List<LabelValueResp>> listRoleDict(RoleQuery query, SortQuery sortQuery) {
+ return R.ok(roleService.listDict(query, sortQuery));
  }
 
  @Operation(summary = "查询字典", description = "查询字典列表")