BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1895a9e8090cbe353b8a486d0564a9e24631197d

Authored by YunaiV
1 parent bdf579a2

优化 AdminUserApi 的实现，和 Cloud 保持一致

Inline Side-by-side
Showing 3 changed files with 19 additions and 11 deletions
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
  View file @1895a9e
1 1 package cn.iocoder.yudao.module.system.api.user;
2 2  
  3 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
3 4 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
4 5  
5 6 import java.util.Collection;
... ... @@ -23,6 +24,14 @@ public interface AdminUserApi {
23 24 AdminUserRespDTO getUser(Long id);
24 25  
25 26 /**
  27 + * 通过用户 ID 查询用户们
  28 + *
  29 + * @param ids 用户 ID 们
  30 + * @return 用户对象信息
  31 + */
  32 + List<AdminUserRespDTO> getUsers(Collection<Long> ids);
  33 +
  34 + /**
26 35 * 获得指定部门的用户数组
27 36 *
28 37 * @param deptIds 部门数组
... ... @@ -44,7 +53,10 @@ public interface AdminUserApi {
44 53 * @param ids 用户编号数组
45 54 * @return 用户 Map
46 55 */
47   - Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids);
  56 + default Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids) {
  57 + List<AdminUserRespDTO> users = getUsers(ids);
  58 + return CollectionUtils.convertMap(users, AdminUserRespDTO::getId);
  59 + }
48 60  
49 61 /**
50 62 * 校验用户们是否有效。如下情况，视为无效：
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
  View file @1895a9e
... ... @@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
9 9 import javax.annotation.Resource;
10 10 import java.util.Collection;
11 11 import java.util.List;
12   -import java.util.Map;
13 12 import java.util.Set;
14 13  
15 14 /**
... ... @@ -30,6 +29,12 @@ public class AdminUserApiImpl implements AdminUserApi {
30 29 }
31 30  
32 31 @Override
  32 + public List<AdminUserRespDTO> getUsers(Collection<Long> ids) {
  33 + List<AdminUserDO> users = userService.getUsers(ids);
  34 + return UserConvert.INSTANCE.convertList4(users);
  35 + }
  36 +
  37 + @Override
33 38 public List<AdminUserRespDTO> getUsersByDeptIds(Collection<Long> deptIds) {
34 39 List<AdminUserDO> users = userService.getUsersByDeptIds(deptIds);
35 40 return UserConvert.INSTANCE.convertList4(users);
... ... @@ -42,12 +47,6 @@ public class AdminUserApiImpl implements AdminUserApi {
42 47 }
43 48  
44 49 @Override
45   - public Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids) {
46   - Map<Long, AdminUserDO> userMap = userService.getUserMap(ids);
47   - return UserConvert.INSTANCE.convertMap4(userMap);
48   - }
49   -
50   - @Override
51 50 public void validUsers(Set<Long> ids) {
52 51 userService.validUsers(ids);
53 52 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java
  View file @1895a9e
... ... @@ -14,7 +14,6 @@ import org.mapstruct.Mapper;
14 14 import org.mapstruct.factory.Mappers;
15 15  
16 16 import java.util.List;
17   -import java.util.Map;
18 17  
19 18 @Mapper
20 19 public interface UserConvert {
... ... @@ -53,6 +52,4 @@ public interface UserConvert {
53 52  
54 53 List<AdminUserRespDTO> convertList4(List<AdminUserDO> users);
55 54  
56   - Map<Long, AdminUserRespDTO> convertMap4(Map<Long, AdminUserDO> map);
57   -
58 55 }
... ...