BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 780526f4844b4db9ca85181d417c80cd3f137066

Authored by puhui999
1 parent f589881d

crm-数据权限：完善数据权限相关操作接口

Inline Side-by-side
Showing 8 changed files with 72 additions and 84 deletions
yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
  View file @780526f
... ... @@ -46,6 +46,10 @@ public interface ErrorCodeConstants {
46 46 ErrorCode CRM_PERMISSION_DENIED = new ErrorCode(1_020_007_001, "{}操作失败，原因：没有权限");
47 47 ErrorCode CRM_PERMISSION_MODEL_NOT_EXISTS = new ErrorCode(1_020_007_002, "{}不存在");
48 48 ErrorCode CRM_PERMISSION_MODEL_TRANSFER_FAIL_OWNER_USER_EXISTS = new ErrorCode(1_020_007_003, "{}操作失败，原因：转移对象已经是该负责人");
  49 + ErrorCode CRM_PERMISSION_DELETE_FAIL = new ErrorCode(1_020_007_004, "删除数据权限失败，原因：参数异常");
  50 + ErrorCode CRM_PERMISSION_DELETE_FAIL_EXIST_OWNER = new ErrorCode(1_020_007_005, "删除数据权限失败，原因：存在负责人");
  51 + ErrorCode CRM_PERMISSION_DELETE_DENIED = new ErrorCode(1_020_007_006, "删除数据权限失败，原因：没有权限");
  52 + ErrorCode CRM_PERMISSION_DELETE_SELF_PERMISSION_FAIL_EXIST_OWNER = new ErrorCode(1_020_007_007, "删除数据权限失败，原因：不能删除负责人");
49 53  
50 54 // ========== 产品 1_020_008_000 ==========
51 55 ErrorCode PRODUCT_NOT_EXISTS = new ErrorCode(1_020_008_000, "产品不存在");
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.http
  View file @780526f
1 1 ### 请求 /add
2   -PUT {{baseUrl}}/crm/permission/add
  2 +POST {{baseUrl}}/crm/permission/create
3 3 Content-Type: application/json
4 4 Authorization: Bearer {{token}}
5 5 tenant-id: {{adminTenentId}}
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
  View file @780526f
... ... @@ -3,13 +3,13 @@ package cn.iocoder.yudao.module.crm.controller.admin.permission;
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.util.ObjUtil;
5 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  6 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6 7 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionCreateReqVO;
7 8 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionRespVO;
8 9 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionUpdateReqVO;
9 10 import cn.iocoder.yudao.module.crm.convert.permission.CrmPermissionConvert;
10 11 import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
11 12 import cn.iocoder.yudao.module.crm.framework.core.annotations.CrmPermission;
12   -import cn.iocoder.yudao.module.crm.framework.enums.CrmBizTypeEnum;
13 13 import cn.iocoder.yudao.module.crm.framework.enums.CrmPermissionLevelEnum;
14 14 import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
15 15 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
... ... @@ -29,17 +29,14 @@ import org.springframework.web.bind.annotation.*;
29 29 import javax.annotation.Resource;
30 30 import javax.validation.Valid;
31 31 import java.util.*;
32   -import java.util.function.Predicate;
33   -import java.util.stream.Collectors;
34 32  
35 33 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
36 34 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
37   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.anyMatch;
38 35 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
39 36 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
40   -import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CRM_PERMISSION_NOT_EXISTS;
  37 +import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
41 38  
42   -@Tag(name = "管理后台 - CRM 数据权限（数据团队成员操作）")
  39 +@Tag(name = "管理后台 - CRM 数据权限")
43 40 @RestController
44 41 @RequestMapping("/crm/permission")
45 42 @Validated
... ... @@ -55,72 +52,59 @@ public class CrmPermissionController {
55 52 @Resource
56 53 private PostApi postApi;
57 54  
58   - // TODO @puhui999：保持统一，create 噢；然后是 PostMapping
59   - @PutMapping("/add")
60   - @Operation(summary = "添加团队成员")
  55 + @PostMapping("/create")
  56 + @Operation(summary = "创建数据权限")
61 57 @PreAuthorize("@ss.hasPermission('crm:permission:create')")
62   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_PERMISSION, bizTypeValue = "#reqVO.bizType", bizId = "#reqVO.bizId",
63   - level = CrmPermissionLevelEnum.OWNER)
  58 + @CrmPermission(bizTypeValue = "#reqVO.bizType", bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
64 59 public CommonResult<Boolean> addPermission(@Valid @RequestBody CrmPermissionCreateReqVO reqVO) {
65 60 permissionService.createPermission(CrmPermissionConvert.INSTANCE.convert(reqVO));
66 61 return success(true);
67 62 }
68 63  
69   - // TODO @puhui999：领取公海客户，是不是放到客户那更合适哈？
70   - @PutMapping("/receive")
71   - @Operation(summary = "领取公海数据")
72   - @PreAuthorize("@ss.hasPermission('crm:permission:update')")
73   - public CommonResult<Boolean> receive(@RequestParam("bizType") Integer bizType, @RequestParam("bizId") Long bizId) {
74   - permissionService.receiveBiz(bizType, bizId, getLoginUserId());
75   - return success(true);
76   - }
77   -
78   - // TODO @puhui999：是不是放到客户那更合适哈？
79   - @PutMapping("/put-pool")
80   - @Operation(summary = "数据放入公海")
81   - @PreAuthorize("@ss.hasPermission('crm:permission:update')")
82   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_PERMISSION, bizTypeValue = "#bizType", bizId = "#bizId"
83   - , level = CrmPermissionLevelEnum.OWNER)
84   - public CommonResult<Boolean> putPool(@RequestParam(value = "bizType") Integer bizType, @RequestParam("bizId") Long bizId) {
85   - permissionService.putPool(bizType, bizId, getLoginUserId());
86   - return success(true);
87   - }
88   -
89 64 @PutMapping("/update")
90   - @Operation(summary = "编辑团队成员权限")
  65 + @Operation(summary = "编辑数据权限")
91 66 @PreAuthorize("@ss.hasPermission('crm:permission:update')")
92   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_PERMISSION, bizTypeValue = "#updateReqVO.bizType", bizId = "#updateReqVO.bizId"
  67 + @CrmPermission(bizTypeValue = "#updateReqVO.bizType", bizId = "#updateReqVO.bizId"
93 68 , level = CrmPermissionLevelEnum.OWNER)
94 69 public CommonResult<Boolean> updatePermission(@Valid @RequestBody CrmPermissionUpdateReqVO updateReqVO) {
95 70 permissionService.updatePermission(updateReqVO);
96 71 return success(true);
97 72 }
98 73  
99   - // TODO @puhui999：bizType 和 bizId 是不是不用啦；因为参数校验需要 bizType 和 bizId，可以先查询下，在直接调用方法；不一定都要注解哈；
100 74 @DeleteMapping("/delete")
101   - @Operation(summary = "移除团队成员")
102   - @Parameters({
103   - @Parameter(name = "bizType", description = "CRM 类型", required = true, example = "2"),
104   - @Parameter(name = "bizId", description = "CRM 类型数据编号", required = true, example = "1024"),
105   - @Parameter(name = "ids", description = "团队成员编号", required = true, example = "1024")
106   - })
  75 + @Operation(summary = "删除数据权限")
  76 + @Parameter(name = "ids", description = "数据权限编号", required = true, example = "1024")
107 77 @PreAuthorize("@ss.hasPermission('crm:permission:delete')")
108   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_PERMISSION, bizTypeValue = "#bizType", bizId = "#bizId"
109   - , level = CrmPermissionLevelEnum.OWNER) // 为了校验权限请求必须带上 bizType 和 bizId
110   - public CommonResult<Boolean> deletePermission(@RequestParam("bizType") Integer bizType,
111   - @RequestParam("bizId") Long bizId,
112   - @RequestParam("ids") Collection<Long> ids) {
  78 + public CommonResult<Boolean> deletePermission(@RequestParam("ids") Collection<Long> ids) {
  79 + List<CrmPermissionDO> permissions = permissionService.getPermissionListByIds(ids);
  80 + if (CollUtil.isEmpty(permissions)) {
  81 + throw exception(CRM_PERMISSION_NOT_EXISTS);
  82 + }
  83 + Set<Long> bizIds = convertSet(permissions, CrmPermissionDO::getBizId);
  84 + if (bizIds.size() > 1) { // 情况一：数据权限的模块数据编号是一致的不可能存在两个
  85 + throw exception(CRM_PERMISSION_DELETE_FAIL);
  86 + }
  87 + if (permissions.size() != ids.size()) { // 情况二：期望数量和实际结果不一致
  88 + throw exception(CRM_PERMISSION_NOT_EXISTS);
  89 + }
  90 + // 情况三：不能包含负责人
  91 + boolean isOwner = CollectionUtils.anyMatch(permissions, item -> ObjUtil.equal(item.getLevel(), CrmPermissionLevelEnum.OWNER.getLevel()));
  92 + if (isOwner) {
  93 + throw exception(CRM_PERMISSION_DELETE_FAIL_EXIST_OWNER);
  94 + }
  95 + // 校验操作人是否为负责人
  96 + CrmPermissionDO permission = permissionService.getPermissionByIdAndUserId(permissions.get(0).getBizId(), getLoginUserId());
  97 + if (!CrmPermissionLevelEnum.isOwner(permission.getLevel())) {
  98 + throw exception(CRM_PERMISSION_DELETE_DENIED);
  99 + }
  100 + // 删除数据权限
113 101 permissionService.deletePermission(ids);
114 102 return success(true);
115 103 }
116 104  
117   - // TODO @puhui999：deleteSelfPermission；尽量归成 crud 这样的操作哈；
118   - @DeleteMapping("/quit-team")
119   - @Operation(summary = "退出团队")
120   - @Parameters({
121   - // TODO @puhui999：这个可以拿出来，不用包在 @Parameters 里，在只有一个参数时哈；
122   - @Parameter(name = "id", description = "团队成员编号", required = true, example = "1024")
123   - })
  105 + @DeleteMapping("/deleteSelfPermission")
  106 + @Operation(summary = "删除自己的数据权限")
  107 + @Parameter(name = "id", description = "数据权限编号", required = true, example = "1024")
124 108 @PreAuthorize("@ss.hasPermission('crm:permission:delete')")
125 109 public CommonResult<Boolean> deletePermission(@RequestParam("id") Long id) {
126 110 // 校验数据存在且是自己
... ... @@ -128,6 +112,10 @@ public class CrmPermissionController {
128 112 if (permission == null) {
129 113 throw exception(CRM_PERMISSION_NOT_EXISTS);
130 114 }
  115 + // 校验是否是负责人
  116 + if (CrmPermissionLevelEnum.isOwner(permission.getLevel())) {
  117 + throw exception(CRM_PERMISSION_DELETE_SELF_PERMISSION_FAIL_EXIST_OWNER);
  118 + }
131 119  
132 120 // 删除
133 121 permissionService.deletePermission(Collections.singletonList(id));
... ... @@ -135,7 +123,7 @@ public class CrmPermissionController {
135 123 }
136 124  
137 125 @GetMapping("/list")
138   - @Operation(summary = "获取团队成员")
  126 + @Operation(summary = "获取数据权限列表")
139 127 @Parameters({
140 128 @Parameter(name = "bizType", description = "CRM 类型", required = true, example = "2"),
141 129 @Parameter(name = "bizId", description = "CRM 类型数据编号", required = true, example = "1024")
... ... @@ -147,19 +135,11 @@ public class CrmPermissionController {
147 135 if (CollUtil.isEmpty(permission)) {
148 136 return success(Collections.emptyList());
149 137 }
150   - // TODO @puhui999：池子的逻辑；
151   - // 判断是否是公海数据
152   - // TODO @puhui999：这段逻辑，可以删除么？
153   - Predicate<CrmPermissionDO> filter = item -> ObjUtil.equal(item.getUserId(), CrmPermissionDO.POOL_USER_ID);
154   - if (anyMatch(permission, filter)) {
155   - permission.removeIf(filter); // 排除
156   - }
157 138  
158 139 // 拼接数据
159 140 List<AdminUserRespDTO> userList = adminUserApi.getUserList(convertSet(permission, CrmPermissionDO::getUserId));
160 141 Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userList, AdminUserRespDTO::getDeptId));
161   - // TODO @puhui999：CollectionUtils.convertSetByFlatMap() 看看可以不
162   - Set<Long> postIds = userList.stream().flatMap(item -> item.getPostIds().stream()).collect(Collectors.toSet());
  142 + Set<Long> postIds = CollectionUtils.convertSetByFlatMap(userList, AdminUserRespDTO::getPostIds, Collection::stream);
163 143 Map<Long, PostRespDTO> postMap = postApi.getPostMap(postIds);
164 144 return success(CrmPermissionConvert.INSTANCE.convert(permission, userList, deptMap, postMap));
165 145 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionBaseVO.java
  View file @780526f
... ... @@ -9,7 +9,7 @@ import lombok.Data;
9 9 import javax.validation.constraints.NotNull;
10 10  
11 11 /**
12   - * 数据权限（团队成员） Base VO，提供给添加、修改、详细的子 VO 使用
  12 + * 数据权限 Base VO，提供给添加、修改、详细的子 VO 使用
13 13 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
14 14 *
15 15 * @author HUIHUI
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionRespVO.java
  View file @780526f
... ... @@ -6,7 +6,7 @@ import lombok.Data;
6 6 import java.time.LocalDateTime;
7 7 import java.util.Set;
8 8  
9   -@Schema(description = "管理后台 - CRM 数据权限（团队成员） Response VO")
  9 +@Schema(description = "管理后台 - CRM 数据权限 Response VO")
10 10 @Data
11 11 public class CrmPermissionRespVO extends CrmPermissionBaseVO {
12 12  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/permission/CrmPermissionConvert.java
  View file @780526f
... ... @@ -15,10 +15,11 @@ import com.google.common.collect.Multimaps;
15 15 import org.mapstruct.Mapper;
16 16 import org.mapstruct.factory.Mappers;
17 17  
18   -import java.util.ArrayList;
19 18 import java.util.List;
20 19 import java.util.Map;
21 20  
  21 +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
  22 +
22 23 /**
23 24 * Crm 数据权限 Convert
24 25 *
... ... @@ -43,9 +44,9 @@ public interface CrmPermissionConvert {
43 44 Map<Long, DeptRespDTO> deptMap, Map<Long, PostRespDTO> postMap) {
44 45 Map<Long, AdminUserRespDTO> userMap = CollectionUtils.convertMap(userList, AdminUserRespDTO::getId);
45 46 return CollectionUtils.convertList(convert(permission), item -> {
46   - MapUtils.findAndThen(userMap, item.getId(), user -> {
  47 + findAndThen(userMap, item.getUserId(), user -> {
47 48 item.setNickname(user.getNickname());
48   - MapUtils.findAndThen(deptMap, user.getDeptId(), deptRespDTO -> {
  49 + findAndThen(deptMap, user.getDeptId(), deptRespDTO -> {
49 50 item.setDeptName(deptRespDTO.getName());
50 51 });
51 52 List<PostRespDTO> postRespList = MapUtils.getList(Multimaps.forMap(postMap), user.getPostIds());
... ... @@ -56,12 +57,8 @@ public interface CrmPermissionConvert {
56 57 }
57 58  
58 59 default List<CrmPermissionDO> convertList(CrmPermissionUpdateReqVO updateReqVO) {
59   - // TODO @puhui999：CollectionUtils.convert
60   - List<CrmPermissionDO> permissions = new ArrayList<>();
61   - updateReqVO.getIds().forEach(id -> {
62   - permissions.add(new CrmPermissionDO().setId(id).setLevel(updateReqVO.getLevel()));
63   - });
64   - return permissions;
  60 + return CollectionUtils.convertList(updateReqVO.getIds(),
  61 + id -> new CrmPermissionDO().setId(id).setLevel(updateReqVO.getLevel()));
65 62 }
66 63  
67 64 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionService.java
  View file @780526f
... ... @@ -78,6 +78,7 @@ public interface CrmPermissionService {
78 78 */
79 79 List<CrmPermissionDO> getPermissionByBizTypeAndBizIdsAndLevel(Integer bizType, Collection<Long> bizIds, Integer level);
80 80  
  81 + List<CrmPermissionDO> getPermissionListByIds(Collection<Long> ids);
81 82 /**
82 83 * 数据权限转移
83 84 *
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
  View file @780526f
... ... @@ -24,7 +24,6 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
24 24 import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
25 25 import static cn.iocoder.yudao.module.crm.framework.enums.CrmPermissionLevelEnum.isOwner;
26 26  
27   -// TODO @puhui999：尽量规避用“团队”这个词哈；这个只是我们给前端展示用的；
28 27 /**
29 28 * CRM 数据权限 Service 接口实现类
30 29 *
... ... @@ -92,6 +91,14 @@ public class CrmPermissionServiceImpl implements CrmPermissionService {
92 91 return crmPermissionMapper.selectListByBizTypeAndBizIdsAndLevel(bizType, bizIds, level);
93 92 }
94 93  
  94 + @Override
  95 + public List<CrmPermissionDO> getPermissionListByIds(Collection<Long> ids) {
  96 + if (CollUtil.isEmpty(ids)) {
  97 + return Collections.emptyList();
  98 + }
  99 + return crmPermissionMapper.selectBatchIds(ids);
  100 + }
  101 +
95 102 private void validateCrmPermissionExists(Collection<Long> ids) {
96 103 List<CrmPermissionDO> permissionList = crmPermissionMapper.selectBatchIds(ids);
97 104 // 校验存在
... ... @@ -118,14 +125,12 @@ public class CrmPermissionServiceImpl implements CrmPermissionService {
118 125 // 1.2 校验新负责人是否存在
119 126 adminUserApi.validateUserList(Collections.singletonList(transferReqBO.getNewOwnerUserId()));
120 127  
121   - // TODO @puhui999：2. 和 2.1 合并成 2；2.2 单独成 3；说白了，就是 2. 修改新负责人的权限；3. 修改老负责人的权限；这样整体注释会简洁一点，也清晰一点；
122   - // 2. 权限转移
  128 + // 2. 修改新负责人的权限
123 129 List<CrmPermissionDO> permissions = crmPermissionMapper.selectByBizTypeAndBizId(
124   - transferReqBO.getBizType(), transferReqBO.getBizId()); // 获取所有团队成员
125   - // 2.1 校验新负责人是否在团队成员中
  130 + transferReqBO.getBizType(), transferReqBO.getBizId()); // 获得所有数据权限
126 131 CrmPermissionDO permission = CollUtil.findOne(permissions,
127   - item -> ObjUtil.equal(item.getUserId(), transferReqBO.getNewOwnerUserId()));
128   - if (permission == null) { // 不存在则以负责人的级别加入这个团队
  132 + item -> ObjUtil.equal(item.getUserId(), transferReqBO.getNewOwnerUserId())); // 校验新负责人是否存在于数据权限列表
  133 + if (permission == null) { // 不存在则以负责人的级别加入
129 134 crmPermissionMapper.insert(new CrmPermissionDO().setBizType(transferReqBO.getBizType())
130 135 .setBizId(transferReqBO.getBizId()).setUserId(transferReqBO.getNewOwnerUserId())
131 136 .setLevel(CrmPermissionLevelEnum.OWNER.getLevel()));
... ... @@ -133,10 +138,11 @@ public class CrmPermissionServiceImpl implements CrmPermissionService {
133 138 crmPermissionMapper.updateById(new CrmPermissionDO().setId(permission.getId())
134 139 .setLevel(CrmPermissionLevelEnum.OWNER.getLevel()));
135 140 }
136   - // 2.2. 老负责人处理
137   - if (transferReqBO.getOldOwnerPermissionLevel() != null) { // 加入团队
  141 +
  142 + // 3. 修改老负责人的权限
  143 + if (transferReqBO.getOldOwnerPermissionLevel() != null) { // 加入数据权限列表
138 144 crmPermissionMapper.updateById(new CrmPermissionDO().setId(oldPermission.getId())
139   - .setLevel(transferReqBO.getOldOwnerPermissionLevel())); // 设置加入团队后的级别
  145 + .setLevel(transferReqBO.getOldOwnerPermissionLevel())); // 设置权限级别
140 146 return;
141 147 }
142 148 crmPermissionMapper.deleteById(oldPermission.getId());
... ...