Commit b2370564a42d71d343a1086922bc79886e1b121c

Authored by kyle
1 parent e9a29e6d

feat: 添加查找用户的处理器,用于在bpmn中辅助查找用户

yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/enums/ProcessConstants.java 0 → 100644
  1 +package cn.iocoder.yudao.framework.flowable.core.enums;
  2 +
  3 +/**
  4 + * 流程常量信息
  5 + */
  6 +public interface ProcessConstants {
  7 +
  8 + String BPMN_FILE_SUFFIX = ".bpmn";
  9 +
  10 + /**
  11 + * nameapace
  12 + * bpmn中的命名空间
  13 + * 这个东西有可能导致无法切换工作流程的实现
  14 + */
  15 + String NAMESPASE = "http://flowable.org/bpmn";
  16 +
  17 + /**
  18 + * 自定义属性 dataType
  19 + */
  20 + String PROCESS_CUSTOM_DATA_TYPE = "dataType";
  21 +
  22 +}
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/handler/MultiInstanceHandler.java 0 → 100644
  1 +package cn.iocoder.yudao.module.bpm.framework.flowable.core.handler;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.ObjectUtil;
  5 +import cn.iocoder.yudao.framework.flowable.core.enums.ProcessConstants;
  6 +import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
  7 +import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
  8 +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
  9 +import jakarta.annotation.Resource;
  10 +import lombok.AllArgsConstructor;
  11 +import org.flowable.bpmn.model.FlowElement;
  12 +import org.flowable.bpmn.model.UserTask;
  13 +import org.flowable.engine.delegate.DelegateExecution;
  14 +import org.springframework.stereotype.Component;
  15 +
  16 +import java.util.ArrayList;
  17 +import java.util.LinkedHashSet;
  18 +import java.util.List;
  19 +import java.util.Set;
  20 +import java.util.stream.Collectors;
  21 +
  22 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
  23 +
  24 +/**
  25 + * 多实例处理类
  26 + */
  27 +@AllArgsConstructor
  28 +@Component("multiInstanceHandler")
  29 +public class MultiInstanceHandler {
  30 +
  31 + @Resource
  32 + private AdminUserApi userApi;
  33 +
  34 + @Resource
  35 + private PermissionApi permissionApi;
  36 +
  37 + public Set<String> getUserIds(DelegateExecution execution) {
  38 + Set<String> candidateUserIds = new LinkedHashSet<>();
  39 + FlowElement flowElement = execution.getCurrentFlowElement();
  40 + if (ObjectUtil.isNotEmpty(flowElement) && flowElement instanceof UserTask userTask) {
  41 + String dataType = userTask.getAttributeValue(ProcessConstants.NAMESPASE, ProcessConstants.PROCESS_CUSTOM_DATA_TYPE);
  42 + if ("USERS".equals(dataType) && CollUtil.isNotEmpty(userTask.getCandidateUsers())) {
  43 + // 添加候选用户id
  44 + candidateUserIds.addAll(userTask.getCandidateUsers());
  45 + } else if (CollUtil.isNotEmpty(userTask.getCandidateGroups())) {
  46 + // 获取组的ID,角色ID集合或部门ID集合
  47 + List<Long> groups = userTask.getCandidateGroups().stream()
  48 + // 例如部门DEPT100,100才是部门id
  49 + .map(item -> Long.parseLong(item.substring(4)))
  50 + .collect(Collectors.toList());
  51 + List<Long> userIds = new ArrayList<>();
  52 + if ("ROLES".equals(dataType)) {
  53 + // 通过角色id,获取所有用户id集合
  54 + Set<Long> userRoleIdListByRoleIds = permissionApi.getUserRoleIdListByRoleIds(groups);
  55 + userIds = new ArrayList<>(userRoleIdListByRoleIds);
  56 + } else if ("DEPTS".equals(dataType)) {
  57 + // 通过部门id,获取所有用户id集合
  58 + List<AdminUserRespDTO> userListByDeptIds = userApi.getUserListByDeptIds(groups);
  59 + userIds = convertList(userListByDeptIds, AdminUserRespDTO::getId);
  60 + }
  61 + // 添加候选用户id
  62 + userIds.forEach(id -> candidateUserIds.add(String.valueOf(id)));
  63 + }
  64 + }
  65 + return candidateUserIds;
  66 + }
  67 +}
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
... ... @@ -5,8 +5,8 @@ import cn.hutool.core.util.ObjectUtil;
5 5 import cn.hutool.core.util.StrUtil;
6 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 7 import cn.iocoder.yudao.framework.common.util.object.PageUtils;
  8 +import cn.iocoder.yudao.framework.flowable.core.enums.ProcessConstants;
8 9 import cn.iocoder.yudao.framework.flowable.core.util.BpmnModelUtils;
9   -import cn.iocoder.yudao.framework.flowable.core.util.FlowableUtils;
10 10 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
11 11 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO;
12 12 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
... ... @@ -17,6 +17,8 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
17 17 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
18 18 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionExtMapper;
19 19 import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
  20 +import jakarta.annotation.Resource;
  21 +import jakarta.validation.Valid;
20 22 import lombok.extern.slf4j.Slf4j;
21 23 import org.flowable.bpmn.converter.BpmnXMLConverter;
22 24 import org.flowable.bpmn.model.BpmnModel;
... ... @@ -29,13 +31,10 @@ import org.flowable.engine.repository.ProcessDefinitionQuery;
29 31 import org.springframework.stereotype.Service;
30 32 import org.springframework.validation.annotation.Validated;
31 33  
32   -import jakarta.annotation.Resource;
33   -import jakarta.validation.Valid;
34 34 import java.util.*;
35 35  
36 36 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
37 37 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
38   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
39 38 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.PROCESS_DEFINITION_KEY_NOT_MATCH;
40 39 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.PROCESS_DEFINITION_NAME_NOT_MATCH;
41 40 import static java.util.Collections.emptyList;
... ... @@ -53,8 +52,6 @@ import static java.util.Collections.emptyList;
53 52 @Slf4j
54 53 public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionService {
55 54  
56   - private static final String BPMN_FILE_SUFFIX = ".bpmn";
57   -
58 55 @Resource
59 56 private RepositoryService repositoryService;
60 57  
... ... @@ -125,7 +122,7 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
125 122 // 创建 Deployment 部署
126 123 Deployment deploy = repositoryService.createDeployment()
127 124 .key(createReqDTO.getKey()).name(createReqDTO.getName()).category(createReqDTO.getCategory())
128   - .addBytes(createReqDTO.getKey() + BPMN_FILE_SUFFIX, createReqDTO.getBpmnBytes())
  125 + .addBytes(createReqDTO.getKey() + ProcessConstants.BPMN_FILE_SUFFIX, createReqDTO.getBpmnBytes())
129 126 .tenantId(TenantContextHolder.getTenantIdStr())
130 127 .deploy();
131 128  
... ...