BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f03e26bc86f6f8d6068f58066de55ece51ff09ba

Authored by jason
1 parent ff6bee96

仿钉钉流程设计- 增加流程进度接口第一版 (用于查询审批记录）

Inline Side-by-side
Showing 26 changed files with 590 additions and 39 deletions
sql/mysql/bpm_update.sql
  View file @f03e26b
... ... @@ -3,4 +3,9 @@
3 3 -- ----------------------------
4 4 ALTER TABLE `pro-test`.`bpm_process_instance_copy`
5 5 ADD COLUMN `activity_id` varchar(64) NULL COMMENT '流程活动编号' AFTER `category`,
6   - MODIFY COLUMN `task_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '任务编号' AFTER `category`;
7 6 \ No newline at end of file
  7 + MODIFY COLUMN `task_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '任务编号' AFTER `category`;
  8 +
  9 +ALTER TABLE `pro-test`.`bpm_process_definition_info`
  10 + ADD COLUMN `model_type` tinyint NOT NULL DEFAULT 10 COMMENT '流程模型的类型' AFTER `model_id`,
  11 + ADD COLUMN `simple_model` json NULL COMMENT 'SIMPLE 设计器模型数据' AFTER `form_custom_view_path`,
  12 + ADD COLUMN `visible` bit(1) NOT NULL DEFAULT 1 COMMENT '是否可见' AFTER `simple_model`;
8 13 \ No newline at end of file
... ...
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmProcessNodeProgressEnum.java 0 → 100644
  View file @f03e26b
  1 +package cn.iocoder.yudao.module.bpm.enums.definition;
  2 +
  3 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
  4 +import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
  5 +import lombok.AllArgsConstructor;
  6 +import lombok.Getter;
  7 +
  8 +/**
  9 + * 流程节点进度的枚举
  10 + *
  11 + * @author jason
  12 + */
  13 +@Getter
  14 +@AllArgsConstructor
  15 +public enum BpmProcessNodeProgressEnum {
  16 + // 0 未开始
  17 + NOT_START(0,"未开始"),
  18 + // 1 ~ 20 进行中
  19 + RUNNING(1, "进行中"), // 节点的进行
  20 + // 特殊的进行中状态
  21 + USER_TASK_DELEGATE(10, "委派中"), // 审批节点
  22 + USER_TASK_APPROVING(11, "向后加签审批通过中"), //向后加签 审批通过中.
  23 + USER_TASK_WAIT(12, "待审批"), // 一般用于先前加签
  24 +
  25 + // 30 ~ 50 已经结束
  26 + // 30 ~ 40 审批节点的结束状态
  27 + USER_TASK_APPROVE(30, "审批通过"), // 审批节点
  28 + USER_TASK_REJECT(31, "审批不通过"), // 审批节点
  29 + USER_TASK_RETURN(32, "已退回"), // 审批节点
  30 + USER_TASK_CANCEL(34, "已取消"), // 审批节点
  31 + // 40 ~ 50 一般节点的接榫状态
  32 + FINISHED(41, "已结束"), // 一般节点的节点的结束状态
  33 + SKIP(42, "跳过"); // 未执行，跳过的节点
  34 +
  35 + private final Integer status;
  36 + private final String name;
  37 +
  38 + public static Integer convertBpmnTaskStatus(Integer taskStatus) {
  39 + Integer convertStatus = null;
  40 + if (BpmTaskStatusEnum.RUNNING.getStatus().equals(taskStatus)) {
  41 + convertStatus = RUNNING.getStatus();
  42 + } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(taskStatus)) {
  43 + convertStatus = USER_TASK_REJECT.getStatus();
  44 + } else if( BpmTaskStatusEnum.APPROVE.getStatus().equals(taskStatus) ) {
  45 + convertStatus = USER_TASK_APPROVE.getStatus();
  46 + } else if (BpmTaskStatusEnum.DELEGATE.getStatus().equals(taskStatus)) {
  47 + convertStatus = USER_TASK_DELEGATE.getStatus();
  48 + } else if (BpmTaskStatusEnum.APPROVING.getStatus().equals(taskStatus)) {
  49 + convertStatus = USER_TASK_APPROVE.getStatus();
  50 + } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(taskStatus)) {
  51 + convertStatus = USER_TASK_CANCEL.getStatus();
  52 + } else if (BpmTaskStatusEnum.WAIT.getStatus().equals(taskStatus)) {
  53 + convertStatus = USER_TASK_WAIT.getStatus();
  54 + }
  55 + return convertStatus;
  56 + }
  57 +
  58 + /**
  59 + * 判断用户节点是不是未通过
  60 + *
  61 + * @param status 状态
  62 + */
  63 + public static boolean isUserTaskNotApproved(Integer status) {
  64 + return ObjectUtils.equalsAny(status,
  65 + USER_TASK_REJECT.getStatus(), USER_TASK_RETURN.getStatus(), USER_TASK_CANCEL.getStatus());
  66 + }
  67 +}
... ...
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
  View file @f03e26b
1 1 package cn.iocoder.yudao.module.bpm.enums.task;
2 2  
3 3 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
  4 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
4 5 import lombok.AllArgsConstructor;
5 6 import lombok.Getter;
6 7  
... ... @@ -36,4 +37,9 @@ public enum BpmProcessInstanceStatusEnum implements IntArrayValuable {
36 37 return ARRAYS;
37 38 }
38 39  
  40 + public static boolean isProcessEndStatus(Integer status) {
  41 + return ObjectUtils.equalsAny(status,
  42 + APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus());
  43 + }
  44 +
39 45 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java
  View file @f03e26b
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.task;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
  5 +import cn.iocoder.yudao.module.bpm.convert.task.BpmActivityConvert;
5 6 import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService;
6 7 import io.swagger.v3.oas.annotations.tags.Tag;
7 8 import io.swagger.v3.oas.annotations.Parameter;
... ... @@ -34,6 +35,6 @@ public class BpmActivityController {
34 35 @PreAuthorize("@ss.hasPermission('bpm:task:query')")
35 36 public CommonResult<List<BpmActivityRespVO>> getActivityList(
36 37 @RequestParam("processInstanceId") String processInstanceId) {
37   - return success(activityService.getActivityListByProcessInstanceId(processInstanceId));
  38 + return success(BpmActivityConvert.INSTANCE.convertList(activityService.getActivityListByProcessInstanceId(processInstanceId)));
38 39 }
39 40 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
  View file @f03e26b
... ... @@ -47,6 +47,7 @@ public class BpmProcessInstanceController {
47 47 private BpmProcessInstanceService processInstanceService;
48 48 @Resource
49 49 private BpmTaskService taskService;
  50 +
50 51 @Resource
51 52 private BpmProcessDefinitionService processDefinitionService;
52 53 @Resource
... ... @@ -158,11 +159,19 @@ public class BpmProcessInstanceController {
158 159 }
159 160  
160 161 @GetMapping("/get-form-fields-permission")
161   - @Operation(summary = "获得流程实例表单字段权限", description = "在【我的流程】菜单中，进行调用")
  162 + @Operation(summary = "获得流程实例表单字段权限")
162 163 @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
163 164 public CommonResult<Map<String, String>> getProcessInstanceFormFieldsPermission(
164   - @Valid BpmProcessInstanceFormFieldsPermissionReqVO reqVO){
  165 + @Valid BpmProcessInstanceFormFieldsPermissionReqVO reqVO) {
165 166 return success(processInstanceService.getProcessInstanceFormFieldsPermission(reqVO));
166 167 }
167 168  
  169 + @GetMapping("/get-progress")
  170 + @Operation(summary = "获得流程实例的进度")
  171 + @Parameter(name = "id", description = "流程实例的编号", required = true)
  172 + @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
  173 + public CommonResult<BpmProcessInstanceProgressRespVO> getProcessInstanceProgress(@RequestParam("id") String id) {
  174 + return success(processInstanceService.getProcessInstanceProgress(id));
  175 + }
  176 +
168 177 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceProgressRespVO.java 0 → 100644
  View file @f03e26b
  1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +import java.util.List;
  8 +
  9 +
  10 +@Schema(description = "管理后台 - 流程实例的进度 Response VO")
  11 +@Data
  12 +public class BpmProcessInstanceProgressRespVO {
  13 +
  14 + @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  15 + private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举
  16 +
  17 + private List<ProcessNodeProgress> nodeProgressList;
  18 +
  19 + @Schema(description = "节点进度信息")
  20 + @Data
  21 + public static class ProcessNodeProgress {
  22 +
  23 + @Schema(description = "节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartUserNode")
  24 + private String id; // Bpmn XML 节点 Id
  25 + @Schema(description = "节点名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "发起人")
  26 + private String name;
  27 + private String displayText;
  28 + @Schema(description = "节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  29 + private Integer nodeType; // 参见 BpmSimpleModelNodeType 枚举
  30 + @Schema(description = "节点状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  31 + private Integer status; // 参见 BpmProcessNodeProgressEnum 枚举
  32 + @Schema(description = "节点的开始时间")
  33 + private LocalDateTime startTime;
  34 + @Schema(description = "节点的结束时间")
  35 + private LocalDateTime endTime;
  36 + @Schema(description = "用户列表")
  37 + private List<User> userList;
  38 + @Schema(description = "分支节点")
  39 + private List<ProcessNodeProgress> branchNodes; // 有且仅有条件、并行、包容节点才会有分支节点
  40 +
  41 + // TODO 用户意见，评论
  42 +
  43 + }
  44 +
  45 + @Schema(description = "用户信息")
  46 + @Data
  47 + public static class User {
  48 +
  49 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  50 + private Long id;
  51 + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  52 + private String nickname;
  53 + @Schema(description = "用户头像", example = "芋艿")
  54 + private String avatar;
  55 + @Schema(description = "是否已处理", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
  56 + private Boolean processed;
  57 + @Schema(description = "用户任务的处理状态", example = "1")
  58 + private Integer userTaskStatus;
  59 + }
  60 +}
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
  View file @f03e26b
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum;
  5 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum;
5 6 import com.baomidou.mybatisplus.annotation.TableField;
6 7 import com.baomidou.mybatisplus.annotation.TableId;
7 8 import com.baomidou.mybatisplus.annotation.TableName;
... ... @@ -48,7 +49,7 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
48 49 /**
49 50 * 流程模型的类型
50 51 *
51   - * 枚举 {@link BpmModelFormTypeEnum}
  52 + * 枚举 {@link BpmModelTypeEnum}
52 53 */
53 54 private Integer modelType;
54 55  
... ... @@ -106,6 +107,12 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
106 107 private String formCustomViewPath;
107 108  
108 109 /**
  110 + * SIMPLE 设计器模型数据 json 格式
  111 + *
  112 + * 目的：当使用仿钉钉设计器时。流程模型发布的时候，需要保存流程模型设计器的快照数据。
  113 + */
  114 + private String simpleModel;
  115 + /**
109 116 * 是否可见
110 117 *
111 118 * 目的：如果 false 不可见，则不展示在“发起流程”的列表里
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceCopyMapper.java
  View file @f03e26b
... ... @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI
7 7 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
  10 +import java.util.List;
  11 +
10 12 @Mapper
11 13 public interface BpmProcessInstanceCopyMapper extends BaseMapperX<BpmProcessInstanceCopyDO> {
12 14  
... ... @@ -18,4 +20,7 @@ public interface BpmProcessInstanceCopyMapper extends BaseMapperX&lt;BpmProcessInst
18 20 .orderByDesc(BpmProcessInstanceCopyDO::getId));
19 21 }
20 22  
  23 + default List<BpmProcessInstanceCopyDO> selectListByProcInstIdAndActId(String processInstanceId, String activityId) {
  24 + return selectList(BpmProcessInstanceCopyDO::getProcessInstanceId, processInstanceId, BpmProcessInstanceCopyDO::getActivityId, activityId);
  25 + }
21 26 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
  View file @f03e26b
... ... @@ -150,7 +150,7 @@ public class BpmTaskCandidateInvoker {
150 150 assigneeUserIds.remove(Long.valueOf(processInstance.getStartUserId()));
151 151 }
152 152  
153   - private BpmTaskCandidateStrategy getCandidateStrategy(Integer strategy) {
  153 + public BpmTaskCandidateStrategy getCandidateStrategy(Integer strategy) {
154 154 BpmTaskCandidateStrategyEnum strategyEnum = BpmTaskCandidateStrategyEnum.valueOf(strategy);
155 155 Assert.notNull(strategyEnum, "策略(%s) 不存在", strategy);
156 156 BpmTaskCandidateStrategy strategyObj = strategyMap.get(strategyEnum);
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateStrategy.java
  View file @f03e26b
... ... @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate;
3 3 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
4 4 import org.flowable.engine.delegate.DelegateExecution;
5 5  
  6 +import java.util.Collections;
6 7 import java.util.Set;
7 8  
8 9 /**
... ... @@ -36,6 +37,18 @@ public interface BpmTaskCandidateStrategy {
36 37 */
37 38 Set<Long> calculateUsers(DelegateExecution execution, String param);
38 39  
  40 +
  41 + /**
  42 + * 基于流程实例，获得任务的候选用户们。 用于获取未执行节点的候选用户们
  43 + *
  44 + * @param processInstanceId 流程实例
  45 + * @param param 节点的参数
  46 + * @return 用户编号集合
  47 + */
  48 + default Set<Long> calculateUsers(String processInstanceId, String param) {
  49 + return Collections.emptySet();
  50 + }
  51 +
39 52 /**
40 53 * 是否一定要输入参数
41 54 *
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
  View file @f03e26b
... ... @@ -41,6 +41,16 @@ public class BpmTaskCandidateDeptMemberStrategy implements BpmTaskCandidateStrat
41 41  
42 42 @Override
43 43 public Set<Long> calculateUsers(DelegateExecution execution, String param) {
  44 + return calculateUsersByParam(param);
  45 + }
  46 +
  47 + @Override
  48 + public Set<Long> calculateUsers(String processInstanceId, String param) {
  49 + return calculateUsersByParam(param);
  50 + }
  51 +
  52 + private Set<Long> calculateUsersByParam(String param) {
  53 +
44 54 Set<Long> deptIds = StrUtils.splitToLongSet(param);
45 55 List<AdminUserRespDTO> users = adminUserApi.getUserListByDeptIds(deptIds);
46 56 return convertSet(users, AdminUserRespDTO::getId);
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
  View file @f03e26b
... ... @@ -37,6 +37,15 @@ public class BpmTaskCandidateRoleStrategy implements BpmTaskCandidateStrategy {
37 37  
38 38 @Override
39 39 public Set<Long> calculateUsers(DelegateExecution execution, String param) {
  40 + return calculateUsersByParam(param);
  41 + }
  42 +
  43 + @Override
  44 + public Set<Long> calculateUsers(String processInstanceId, String param) {
  45 + return calculateUsersByParam(param);
  46 + }
  47 +
  48 + private Set<Long> calculateUsersByParam(String param) {
40 49 Set<Long> roleIds = StrUtils.splitToLongSet(param);
41 50 return permissionApi.getUserRoleIdListByRoleIds(roleIds);
42 51 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserStrategy.java
  View file @f03e26b
... ... @@ -35,8 +35,7 @@ public class BpmTaskCandidateStartUserStrategy implements BpmTaskCandidateStrate
35 35  
36 36 @Override
37 37 public Set<Long> calculateUsers(DelegateExecution execution, String param) {
38   - String startUserId = processInstanceService.getProcessInstance(execution.getProcessInstanceId()).getStartUserId();
39   - return SetUtils.asSet(Long.valueOf(startUserId));
  38 + return getStartUserOfProcessInstance(execution.getProcessInstanceId());
40 39 }
41 40  
42 41 @Override
... ... @@ -44,4 +43,14 @@ public class BpmTaskCandidateStartUserStrategy implements BpmTaskCandidateStrate
44 43 return false;
45 44 }
46 45  
  46 + @Override
  47 + public Set<Long> calculateUsers(String processInstanceId, String param) {
  48 + return getStartUserOfProcessInstance(processInstanceId);
  49 + }
  50 +
  51 + private Set<Long> getStartUserOfProcessInstance(String processInstanceId) {
  52 + String startUserId = processInstanceService.getProcessInstance(processInstanceId).getStartUserId();
  53 + return SetUtils.asSet(Long.valueOf(startUserId));
  54 + }
  55 +
47 56 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
  View file @f03e26b
... ... @@ -36,4 +36,9 @@ public class BpmTaskCandidateUserStrategy implements BpmTaskCandidateStrategy {
36 36 return StrUtils.splitToLongSet(param);
37 37 }
38 38  
  39 + @Override
  40 + public Set<Long> calculateUsers(String processInstanceId, String param) {
  41 + return StrUtils.splitToLongSet(param);
  42 + }
  43 +
39 44 }
40 45 \ No newline at end of file
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
  View file @f03e26b
... ... @@ -7,24 +7,30 @@ import cn.hutool.core.lang.TypeReference;
7 7 import cn.hutool.core.map.MapUtil;
8 8 import cn.hutool.core.util.*;
9 9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  10 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
  11 +import cn.iocoder.yudao.framework.common.util.spring.SpringUtils;
10 12 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
11 13 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.RejectHandler;
  14 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ProcessNodeProgress;
12 15 import cn.iocoder.yudao.module.bpm.enums.definition.*;
13 16 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
14 17 import cn.iocoder.yudao.module.bpm.framework.flowable.core.listener.BpmCopyTaskDelegate;
15 18 import cn.iocoder.yudao.module.bpm.framework.flowable.core.simplemodel.SimpleModelConditionGroups;
  19 +import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService;
16 20 import org.flowable.bpmn.BpmnAutoLayout;
17 21 import org.flowable.bpmn.model.Process;
18 22 import org.flowable.bpmn.model.*;
  23 +import org.flowable.engine.history.HistoricActivityInstance;
  24 +import org.flowable.engine.history.HistoricProcessInstance;
19 25  
20   -import java.util.ArrayList;
21   -import java.util.List;
22   -import java.util.Map;
23   -import java.util.Objects;
  26 +import java.util.*;
24 27  
25 28 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.OperationButtonSetting;
26 29 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.TimeoutHandler;
27 30 import static cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType.*;
  31 +import static cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveMethodEnum.RANDOM;
  32 +import static cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveMethodEnum.RATIO;
  33 +import static cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveTypeEnum.USER;
28 34 import static cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskAssignStartUserHandlerTypeEnum.SKIP;
29 35 import static cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskTimeoutHandlerTypeEnum.REMINDER;
30 36 import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum.START_USER;
... ... @@ -361,7 +367,7 @@ public class SimpleModelUtils {
361 367 /**
362 368 * 添加 UserTask 用户的审批超时 BoundaryEvent 事件
363 369 *
364   - * @param userTask 审批任务
  370 + * @param userTask 审批任务
365 371 * @param timeoutHandler 超时处理器
366 372 * @return BoundaryEvent 超时事件
367 373 */
... ... @@ -463,7 +469,7 @@ public class SimpleModelUtils {
463 469  
464 470 // 如果不是审批人节点，则直接返回
465 471 addExtensionElement(userTask, USER_TASK_APPROVE_TYPE, StrUtil.toStringOrNull(node.getApproveType()));
466   - if (ObjectUtil.notEqual(node.getApproveType(), BpmUserTaskApproveTypeEnum.USER.getType())) {
  472 + if (ObjectUtil.notEqual(node.getApproveType(), USER.getType())) {
467 473 return userTask;
468 474 }
469 475  
... ... @@ -513,7 +519,7 @@ public class SimpleModelUtils {
513 519  
514 520 private static void processMultiInstanceLoopCharacteristics(Integer approveMethod, Integer approveRatio, UserTask userTask) {
515 521 BpmUserTaskApproveMethodEnum approveMethodEnum = BpmUserTaskApproveMethodEnum.valueOf(approveMethod);
516   - if (approveMethodEnum == null || approveMethodEnum == BpmUserTaskApproveMethodEnum.RANDOM) {
  522 + if (approveMethodEnum == null || approveMethodEnum == RANDOM) {
517 523 return;
518 524 }
519 525 // 添加审批方式的扩展属性
... ... @@ -531,7 +537,7 @@ public class SimpleModelUtils {
531 537 multiInstanceCharacteristics.setSequential(true);
532 538 multiInstanceCharacteristics.setLoopCardinality("1");
533 539 userTask.setLoopCharacteristics(multiInstanceCharacteristics);
534   - } else if (approveMethodEnum == BpmUserTaskApproveMethodEnum.RATIO) {
  540 + } else if (approveMethodEnum == RATIO) {
535 541 Assert.notNull(approveRatio, "通过比例不能为空");
536 542 multiInstanceCharacteristics.setCompletionCondition(
537 543 String.format(APPROVE_BY_RATIO_COMPLETE_EXPRESSION, String.format("%.2f", approveRatio / (double) 100)));
... ... @@ -607,9 +613,9 @@ public class SimpleModelUtils {
607 613 userTask.setId(node.getId());
608 614 userTask.setName(node.getName());
609 615 // 人工审批
610   - addExtensionElement(userTask, USER_TASK_APPROVE_TYPE, BpmUserTaskApproveTypeEnum.USER.getType().toString());
  616 + addExtensionElement(userTask, USER_TASK_APPROVE_TYPE, USER.getType().toString());
611 617 // 候选人策略为发起人自己
612   - addCandidateElements(START_USER.getStrategy(),null, userTask);
  618 + addCandidateElements(START_USER.getStrategy(), null, userTask);
613 619 // 添加表单字段权限属性元素
614 620 addFormFieldsPermission(node.getFieldsPermission(), userTask);
615 621 // 添加操作按钮配置属性元素
... ... @@ -628,4 +634,114 @@ public class SimpleModelUtils {
628 634 return endEvent;
629 635 }
630 636  
  637 + /**
  638 + * 遍历简单模型, 构建节点的进度。 TODO 回退节点暂未处理
  639 + *
  640 + * @param processInstance 流程实例
  641 + * @param simpleModel 简单模型
  642 + * @param historicActivityList 流程实例的活力列表
  643 + * @param activityInstanceMap 流程实例的活力 Map。 key: activityId
  644 + * @param nodeProgresses 节点的进度列表
  645 + * @param returnNodePosition 回退节点的位置。 TODO 处理回退节点，还未处理。还没想好
  646 + */
  647 + public static void traverseNodeToBuildNodeProgress(HistoricProcessInstance processInstance, BpmSimpleModelNodeVO simpleModel
  648 + , List<HistoricActivityInstance> historicActivityList, Map<String, HistoricActivityInstance> activityInstanceMap
  649 + , List<ProcessNodeProgress> nodeProgresses, List<Integer> returnNodePosition) {
  650 + // 判断是否有效节点
  651 + if (!isValidNode(simpleModel)) {
  652 + return;
  653 + }
  654 + buildNodeProgress(processInstance, simpleModel, nodeProgresses, historicActivityList, activityInstanceMap, returnNodePosition);
  655 + // 如果有“子”节点，则递归处理子节点
  656 + traverseNodeToBuildNodeProgress(processInstance, simpleModel.getChildNode(), historicActivityList, activityInstanceMap, nodeProgresses, returnNodePosition);
  657 + }
  658 +
  659 +
  660 + private static void buildNodeProgress(HistoricProcessInstance processInstance, BpmSimpleModelNodeVO node, List<ProcessNodeProgress> nodeProgresses,
  661 + List<HistoricActivityInstance> historicActivityList, Map<String, HistoricActivityInstance> activityInstanceMap, List<Integer> returnNodePosition) {
  662 + BpmSimpleModelNodeType nodeType = BpmSimpleModelNodeType.valueOf(node.getType());
  663 + Assert.notNull(nodeType, "模型节点类型不支持");
  664 +
  665 + ProcessNodeProgress nodeProgress = new ProcessNodeProgress();
  666 + nodeProgress.setNodeType(nodeType.getType());
  667 + nodeProgress.setName(node.getName());
  668 + nodeProgress.setDisplayText(node.getShowText());
  669 + BpmActivityService activityService = SpringUtils.getBean(BpmActivityService.class);
  670 + if (!activityInstanceMap.containsKey(node.getId())) { // 说明这些节点没有执行过
  671 + // 1. 得到流程状态
  672 + Integer processInstanceStatus = FlowableUtils.getProcessInstanceStatus(processInstance);
  673 + // 2. 设置节点状态
  674 + nodeProgress.setStatus(activityService.getNotRunActivityProgressStatus(processInstanceStatus));
  675 + // 3. 抄送节点, 审批节点设置用户列表
  676 + if (COPY_NODE.getType().equals(node.getType()) ||
  677 + (APPROVE_NODE.getType().equals(node.getType()) && USER.getType().equals(node.getApproveType()))) {
  678 + nodeProgress.setUserList(activityService.getNotRunActivityUserList(processInstance.getId()
  679 + , processInstanceStatus, node.getCandidateStrategy(), node.getCandidateParam()));
  680 + }
  681 + } else {
  682 + nodeProgress.setStatus(BpmProcessNodeProgressEnum.FINISHED.getStatus()); // 默认设置成结束状态
  683 + HistoricActivityInstance historicActivity = activityInstanceMap.get(node.getId());
  684 + nodeProgress.setStartTime(DateUtils.of(historicActivity.getStartTime()));
  685 + nodeProgress.setEndTime(DateUtils.of(historicActivity.getEndTime()));
  686 + nodeProgress.setId(historicActivity.getId());
  687 + switch (nodeType) {
  688 + case START_USER_NODE: { // 发起人节点
  689 + nodeProgress.setDisplayText(""); // 发起人节点不需要显示 displayText
  690 + // 1. 设置节点的状态
  691 + nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));
  692 + // 2. 设置用户信息
  693 + nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, false, historicActivityList));
  694 + break;
  695 + }
  696 + case APPROVE_NODE: { // 审批节点
  697 + if (USER.getType().equals(node.getApproveType())) { // 人工审批
  698 + // 1. 判断是否多人审批
  699 + boolean isMultiInstance = !RANDOM.getMethod().equals(node.getApproveMethod());
  700 + // 2. 设置节点的状态
  701 + nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, isMultiInstance, historicActivityList));
  702 + // 3. 设置用户信息
  703 + nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, isMultiInstance, historicActivityList));
  704 + } else {
  705 + nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));
  706 + }
  707 + break;
  708 + }
  709 + case COPY_NODE: { // 抄送节点
  710 + // 1. 设置节点的状态
  711 + nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));
  712 + // 2. 设置用户信息
  713 + nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, false, historicActivityList));
  714 + break;
  715 + }
  716 +
  717 + default: {
  718 + // TODO 其它节点类型的实现
  719 + }
  720 + }
  721 + }
  722 + // 如果是“分支”节点，
  723 + if (BpmSimpleModelNodeType.isBranchNode(node.getType())
  724 + && ArrayUtil.isNotEmpty(node.getConditionNodes())) {
  725 + // 网关是否执行了， 执行了。只包含运行的分支。 未执行包含所有的分支
  726 + final boolean executed = activityInstanceMap.containsKey(node.getId());
  727 + LinkedList<ProcessNodeProgress> branchNodeList = new LinkedList<>();
  728 + node.getConditionNodes().forEach(item -> {
  729 + // 如果条件节点执行了。 ACT_HI_ACTINST 表会记录
  730 + if (executed) {
  731 + if (activityInstanceMap.containsKey(item.getId())) {
  732 + List<Integer> branchReturnNodePosition = new ArrayList<>();
  733 + traverseNodeToBuildNodeProgress(processInstance, item, historicActivityList, activityInstanceMap, branchNodeList, branchReturnNodePosition);
  734 + // TODO 处理回退节点
  735 + }
  736 + } else {
  737 + List<Integer> branchReturnNodePosition = new ArrayList<>();
  738 + traverseNodeToBuildNodeProgress(processInstance, item, historicActivityList, activityInstanceMap, branchNodeList, branchReturnNodePosition);
  739 + // TODO 处理回退节点
  740 + }
  741 + });
  742 + nodeProgress.setBranchNodes(branchNodeList);
  743 + }
  744 + nodeProgresses.add(nodeProgress);
  745 + }
  746 +
631 747 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
  View file @f03e26b
... ... @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
7 7 import cn.iocoder.yudao.framework.common.util.object.PageUtils;
8 8 import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
  9 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
9 10 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelPageReqVO;
10 11 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelSaveReqVO;
11 12 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
... ... @@ -17,7 +18,6 @@ import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCand
17 18 import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
18 19 import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
19 20 import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.SimpleModelUtils;
20   -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
21 21 import jakarta.annotation.Resource;
22 22 import jakarta.validation.Valid;
23 23 import lombok.extern.slf4j.Slf4j;
... ... @@ -143,9 +143,11 @@ public class BpmModelServiceImpl implements BpmModelService {
143 143 BpmFormDO form = validateFormConfig(metaInfo);
144 144 // 1.4 校验任务分配规则已配置
145 145 taskCandidateInvoker.validateBpmnConfig(bpmnBytes);
  146 + // 1.5 获取仿钉钉流程设计器模型数据
  147 + byte[] simpleBytes = getModelSimpleJson(model.getId());
146 148  
147 149 // 2.1 创建流程定义
148   - String definitionId = processDefinitionService.createProcessDefinition(model, metaInfo, bpmnBytes, form);
  150 + String definitionId = processDefinitionService.createProcessDefinition(model, metaInfo, bpmnBytes, simpleBytes, form);
149 151  
150 152 // 2.2 将老的流程定义进行挂起。也就是说，只有最新部署的流程定义，才可以发起任务。
151 153 updateProcessDefinitionSuspended(model.getDeploymentId());
... ... @@ -276,7 +278,7 @@ public class BpmModelServiceImpl implements BpmModelService {
276 278  
277 279 /**
278 280 * 挂起 deploymentId 对应的流程定义
279   - *
  281 + * <p>
280 282 * 注意：这里一个 deploymentId 只关联一个流程定义
281 283 *
282 284 * @param deploymentId 流程发布Id
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionService.java
  View file @f03e26b
... ... @@ -48,10 +48,11 @@ public interface BpmProcessDefinitionService {
48 48 * @param model 流程模型
49 49 * @param modelMetaInfo 流程模型元信息
50 50 * @param bpmnBytes BPMN XML 字节数组
  51 + * @param simpleBytes simple model json 字节数组
51 52 * @param form 表单
52 53 * @return 流程编号
53 54 */
54   - String createProcessDefinition(Model model, BpmModelMetaInfoVO modelMetaInfo, byte[] bpmnBytes, BpmFormDO form);
  55 + String createProcessDefinition(Model model, BpmModelMetaInfoVO modelMetaInfo, byte[] bpmnBytes, byte[] simpleBytes, BpmFormDO form);
55 56  
56 57 /**
57 58 * 更新流程定义状态
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
  View file @f03e26b
... ... @@ -5,13 +5,13 @@ import cn.hutool.core.util.StrUtil;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 7 import cn.iocoder.yudao.framework.common.util.object.PageUtils;
  8 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
8 9 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
9 10 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
10 11 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
11 12 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionInfoMapper;
12 13 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
13 14 import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
14   -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
15 15 import jakarta.annotation.Resource;
16 16 import lombok.extern.slf4j.Slf4j;
17 17 import org.flowable.bpmn.model.BpmnModel;
... ... @@ -24,6 +24,7 @@ import org.flowable.engine.repository.ProcessDefinitionQuery;
24 24 import org.springframework.stereotype.Service;
25 25 import org.springframework.validation.annotation.Validated;
26 26  
  27 +import java.nio.charset.StandardCharsets;
27 28 import java.util.*;
28 29  
29 30 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
... ... @@ -106,7 +107,7 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
106 107  
107 108 @Override
108 109 public String createProcessDefinition(Model model, BpmModelMetaInfoVO modelMetaInfo,
109   - byte[] bpmnBytes, BpmFormDO form) {
  110 + byte[] bpmnBytes, byte[] simpleBytes, BpmFormDO form) {
110 111 // 创建 Deployment 部署
111 112 Deployment deploy = repositoryService.createDeployment()
112 113 .key(model.getKey()).name(model.getName()).category(model.getCategory())
... ... @@ -131,7 +132,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
131 132  
132 133 // 插入拓展表
133 134 BpmProcessDefinitionInfoDO definitionDO = BeanUtils.toBean(modelMetaInfo, BpmProcessDefinitionInfoDO.class)
134   - .setModelId(model.getId()).setProcessDefinitionId(definition.getId());
  135 + .setModelId(model.getId()).setProcessDefinitionId(definition.getId()).setModelType(modelMetaInfo.getType())
  136 + .setSimpleModel(StrUtil.str(simpleBytes, StandardCharsets.UTF_8));
  137 +
135 138 if (form != null) {
136 139 definitionDO.setFormFields(form.getFields()).setFormConf(form.getConf());
137 140 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java
  View file @f03e26b
1 1 package cn.iocoder.yudao.module.bpm.service.task;
2 2  
3   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
  3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO;
4 4 import org.flowable.engine.history.HistoricActivityInstance;
5 5  
6 6 import java.util.List;
... ... @@ -18,7 +18,7 @@ public interface BpmActivityService {
18 18 * @param processInstanceId 流程实例的编号
19 19 * @return 活动实例列表
20 20 */
21   - List<BpmActivityRespVO> getActivityListByProcessInstanceId(String processInstanceId);
  21 + List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId);
22 22  
23 23 /**
24 24 * 获得执行编号对应的活动实例
... ... @@ -28,4 +28,31 @@ public interface BpmActivityService {
28 28 */
29 29 List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId);
30 30  
  31 + /**
  32 + * 获取活动的用户列表。 例如：抄送人列表。 审批人列表
  33 + *
  34 + * @param historicActivity 活动
  35 + * @param isMultiInstance 是否多实例 (会签，或签 )
  36 + * @param historicActivityList 某个流程实例的所有活动列表
  37 + * @return 用户列表
  38 + */
  39 + List<BpmProcessInstanceProgressRespVO.User> getHistoricActivityUserList(HistoricActivityInstance historicActivity,
  40 + Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList);
  41 +
  42 + /**
  43 + * 获取活动的进度状态。
  44 + *
  45 + * @param historicActivity 活动
  46 + * @param isMultiInstance 是否多实例 (会签，或签 )
  47 + * @param historicActivityList 某个流程实例的所有活动列表
  48 + * @return 活动的进度状态
  49 + */
  50 + Integer getHistoricActivityProgressStatus(HistoricActivityInstance historicActivity,
  51 + Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList);
  52 +
  53 + Integer getNotRunActivityProgressStatus(Integer processInstanceStatus);
  54 +
  55 + List<BpmProcessInstanceProgressRespVO.User> getNotRunActivityUserList(String processInstanceId, Integer processInstanceStatus
  56 + , Integer candidateStrategy, String candidateParam);
  57 +
31 58 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
  View file @f03e26b
1 1 package cn.iocoder.yudao.module.bpm.service.task;
2 2  
3   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
4   -import cn.iocoder.yudao.module.bpm.convert.task.BpmActivityConvert;
  3 +import cn.hutool.core.collection.ListUtil;
  4 +import cn.hutool.core.lang.Assert;
  5 +import cn.hutool.core.util.NumberUtil;
  6 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  7 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  8 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.User;
  9 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmProcessNodeProgressEnum;
  10 +import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
  11 +import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
  12 +import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
  13 +import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
  14 +import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
  15 +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
  16 +import jakarta.annotation.Resource;
5 17 import lombok.extern.slf4j.Slf4j;
6 18 import org.flowable.engine.HistoryService;
7 19 import org.flowable.engine.history.HistoricActivityInstance;
  20 +import org.flowable.task.api.history.HistoricTaskInstance;
  21 +import org.springframework.context.annotation.Lazy;
8 22 import org.springframework.stereotype.Service;
9 23 import org.springframework.validation.annotation.Validated;
10 24  
11   -import jakarta.annotation.Resource;
  25 +import java.util.Collections;
12 26 import java.util.List;
  27 +import java.util.Map;
  28 +import java.util.Set;
  29 +
  30 +import static cn.iocoder.yudao.module.bpm.enums.definition.BpmProcessNodeProgressEnum.*;
13 31  
14 32  
15 33 /**
... ... @@ -22,14 +40,31 @@ import java.util.List;
22 40 @Validated
23 41 public class BpmActivityServiceImpl implements BpmActivityService {
24 42  
  43 + /**
  44 + * 抄送节点活动类型
  45 + */
  46 + private static final String COPY_NODE_ACTIVITY_TYPE = "serviceTask";
  47 + /**
  48 + * 审批节点活动类型
  49 + */
  50 + private static final String APPROVE_NODE_ACTIVITY_TYPE = "userTask";
  51 +
25 52 @Resource
26 53 private HistoryService historyService;
  54 + @Resource
  55 + @Lazy
  56 + private BpmTaskService bpmTaskService;
  57 + @Resource
  58 + private BpmProcessInstanceCopyService bpmProcessInstanceCopyService;
  59 + @Resource
  60 + private AdminUserApi adminUserApi;
  61 + @Resource
  62 + private BpmTaskCandidateInvoker bpmTaskCandidateInvoker;
27 63  
28 64 @Override
29   - public List<BpmActivityRespVO> getActivityListByProcessInstanceId(String processInstanceId) {
30   - List<HistoricActivityInstance> activityList = historyService.createHistoricActivityInstanceQuery()
31   - .processInstanceId(processInstanceId).list();
32   - return BpmActivityConvert.INSTANCE.convertList(activityList);
  65 + public List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId) {
  66 + return historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId)
  67 + .orderByHistoricActivityInstanceStartTime().asc().list();
33 68 }
34 69  
35 70 @Override
... ... @@ -37,4 +72,129 @@ public class BpmActivityServiceImpl implements BpmActivityService {
37 72 return historyService.createHistoricActivityInstanceQuery().executionId(executionId).list();
38 73 }
39 74  
  75 + @Override
  76 + public List<User> getHistoricActivityUserList(HistoricActivityInstance historicActivity
  77 + , Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList) {
  78 + Assert.notNull(historicActivity, "historicActivity 不能为 null ");
  79 + List<User> returnUserList = Collections.emptyList();
  80 + if (COPY_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {
  81 + Set<Long> copyUserIds = bpmProcessInstanceCopyService.getCopyUserIds(historicActivity.getProcessInstanceId(),
  82 + historicActivity.getActivityId());
  83 + List<AdminUserRespDTO> userList = adminUserApi.getUserList(copyUserIds);
  84 + returnUserList = CollectionUtils.convertList(userList, item -> {
  85 + User user = BeanUtils.toBean(item, User.class);
  86 + user.setProcessed(Boolean.TRUE);
  87 + return user;
  88 + });
  89 + } else if (APPROVE_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {
  90 + if (isMultiInstance) { // 多人 (会签 、 或签） // TODO 依次审批可能要特殊处理一下
  91 + // 多个任务列表
  92 + List<HistoricActivityInstance> taskList = CollectionUtils.filterList(historicActivityList,
  93 + item -> historicActivity.getActivityId().equals(item.getActivityId()));
  94 + List<Long> userIds = CollectionUtils.convertList(taskList, item -> NumberUtil.parseLong(item.getAssignee(), null));
  95 + List<String> taskIds = CollectionUtils.convertList(taskList, HistoricActivityInstance::getTaskId);
  96 + Map<Long, AdminUserRespDTO> adminUserMap = CollectionUtils.convertMap(adminUserApi.getUserList(userIds), AdminUserRespDTO::getId);
  97 + Map<String, HistoricTaskInstance> historicTaskInstanceMap = CollectionUtils.convertMap(bpmTaskService.getHistoricTasks(taskIds), HistoricTaskInstance::getId);
  98 + returnUserList = CollectionUtils.convertList(taskList, item -> {
  99 + AdminUserRespDTO adminUser = adminUserMap.get(NumberUtil.parseLong(item.getAssignee(), null));
  100 + User user = BeanUtils.toBean(adminUser, User.class);
  101 + if (user != null) {
  102 + HistoricTaskInstance taskInstance = historicTaskInstanceMap.get(item.getTaskId());
  103 + if (taskInstance != null) {
  104 + user.setProcessed(taskInstance.getEndTime() != null);
  105 + user.setUserTaskStatus(FlowableUtils.getTaskStatus(taskInstance));
  106 + }
  107 + }
  108 + return user;
  109 + });
  110 + } else {
  111 + AdminUserRespDTO adminUserResp = adminUserApi.getUser(Long.valueOf(historicActivity.getAssignee()));
  112 + if (adminUserResp != null) {
  113 + User user = BeanUtils.toBean(adminUserResp, User.class);
  114 + // TODO 需要处理加签
  115 + // 查询任务状态
  116 + HistoricTaskInstance historicTask = bpmTaskService.getHistoricTask(historicActivity.getTaskId());
  117 + if (historicTask != null) {
  118 + Integer taskStatus = FlowableUtils.getTaskStatus(historicTask);
  119 + user.setProcessed(historicTask.getEndTime() != null);
  120 + user.setUserTaskStatus(taskStatus);
  121 + }
  122 + returnUserList = ListUtil.of(user);
  123 + }
  124 + }
  125 + }
  126 + return returnUserList;
  127 + }
  128 +
  129 + @Override
  130 + public Integer getHistoricActivityProgressStatus(HistoricActivityInstance historicActivity
  131 + , Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList) {
  132 + Assert.notNull(historicActivity, "historicActivity 不能为 null ");
  133 + Integer progressStatus = null;
  134 + if (APPROVE_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {
  135 + if (isMultiInstance) { // 多人 (会签 、 或签）
  136 + // 多个任务列表
  137 + List<HistoricActivityInstance> taskList = CollectionUtils.filterList(historicActivityList,
  138 + item -> historicActivity.getActivityId().equals(item.getActivityId()));
  139 + List<String> taskIds = CollectionUtils.convertList(taskList, HistoricActivityInstance::getTaskId);
  140 + Map<String, HistoricTaskInstance> historicTaskMap = CollectionUtils.convertMap(bpmTaskService.getHistoricTasks(taskIds), HistoricTaskInstance::getId);
  141 + for (HistoricActivityInstance activity : taskList) {
  142 + if (activity.getEndTime() == null) {
  143 + progressStatus = RUNNING.getStatus();
  144 + } else {
  145 + HistoricTaskInstance task = historicTaskMap.get(activity.getTaskId());
  146 + if (task != null) {
  147 + Integer taskStatus = FlowableUtils.getTaskStatus(task);
  148 + progressStatus = BpmProcessNodeProgressEnum.convertBpmnTaskStatus(taskStatus);
  149 + }
  150 + }
  151 + // 运行中或者未通过状态。退出循环 (会签可能需要多人通过）
  152 + if (RUNNING.getStatus().equals(progressStatus) || isUserTaskNotApproved(progressStatus)) {
  153 + break;
  154 + }
  155 + }
  156 + } else {
  157 + HistoricTaskInstance historicTask = bpmTaskService.getHistoricTask(historicActivity.getTaskId());
  158 + if (historicTask != null) {
  159 + Integer taskStatus = FlowableUtils.getTaskStatus(historicTask);
  160 + progressStatus = BpmProcessNodeProgressEnum.convertBpmnTaskStatus(taskStatus);
  161 + }
  162 + }
  163 + } else {
  164 + if (historicActivity.getEndTime() == null) {
  165 + progressStatus = RUNNING.getStatus();
  166 + }else {
  167 + progressStatus = BpmProcessNodeProgressEnum.FINISHED.getStatus();
  168 + }
  169 +
  170 + }
  171 + return progressStatus;
  172 + }
  173 +
  174 + @Override
  175 + public Integer getNotRunActivityProgressStatus(Integer processInstanceStatus) {
  176 + if(BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)){
  177 + return SKIP.getStatus();
  178 + }else {
  179 + return NOT_START.getStatus();
  180 + }
  181 + }
  182 +
  183 + @Override
  184 + public List<User> getNotRunActivityUserList(String processInstanceId, Integer processInstanceStatus, Integer candidateStrategy, String candidateParam) {
  185 + if(BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)){
  186 + // 跳过节点。返回空
  187 + return Collections.emptyList();
  188 + }else {
  189 + BpmTaskCandidateStrategy taskCandidateStrategy = bpmTaskCandidateInvoker.getCandidateStrategy(candidateStrategy);
  190 + Set<Long> userIds = taskCandidateStrategy.calculateUsers(processInstanceId, candidateParam);
  191 + List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIds);
  192 + return CollectionUtils.convertList(userList, item -> {
  193 + User user = BeanUtils.toBean(item, User.class);
  194 + user.setProcessed(Boolean.FALSE);
  195 + return user;
  196 + });
  197 + }
  198 + }
  199 +
40 200 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyService.java
  View file @f03e26b
... ... @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI
5 5 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
6 6  
7 7 import java.util.Collection;
  8 +import java.util.Set;
8 9  
9 10 /**
10 11 * 流程抄送 Service 接口
... ... @@ -42,5 +43,13 @@ public interface BpmProcessInstanceCopyService {
42 43 */
43 44 PageResult<BpmProcessInstanceCopyDO> getProcessInstanceCopyPage(Long userId,
44 45 BpmProcessInstanceCopyPageReqVO pageReqVO);
  46 + /**
  47 + * 通过流程实例和流程活动编号获取抄送人的 Id
  48 + *
  49 + * @param processInstanceId 流程实例 Id
  50 + * @param activityId 流程活动编号 Id
  51 + * @return 抄送人 Ids
  52 + */
  53 + Set<Long> getCopyUserIds(String processInstanceId, String activityId);
45 54  
46 55 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java
  View file @f03e26b
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bpm.service.task;
2 2  
3 3 import cn.hutool.core.util.ObjectUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
5 6 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCopyPageReqVO;
6 7 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
7 8 import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmProcessInstanceCopyMapper;
... ... @@ -18,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
18 19  
19 20 import java.util.Collection;
20 21 import java.util.List;
  22 +import java.util.Set;
21 23  
22 24 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
23 25 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
... ... @@ -85,4 +87,10 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
85 87 return processInstanceCopyMapper.selectPage(userId, pageReqVO);
86 88 }
87 89  
  90 + @Override
  91 + public Set<Long> getCopyUserIds(String processInstanceId, String activityId) {
  92 + return CollectionUtils.convertSet(processInstanceCopyMapper.selectListByProcInstIdAndActId(processInstanceId, activityId),
  93 + BpmProcessInstanceCopyDO::getUserId);
  94 + }
  95 +
88 96 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
  View file @f03e26b
... ... @@ -2,10 +2,7 @@ package cn.iocoder.yudao.module.bpm.service.task;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
5   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO;
6   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCreateReqVO;
7   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceFormFieldsPermissionReqVO;
8   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
9 6 import jakarta.validation.Valid;
10 7 import org.flowable.engine.history.HistoricProcessInstance;
11 8 import org.flowable.engine.runtime.ProcessInstance;
... ... @@ -95,6 +92,14 @@ public interface BpmProcessInstanceService {
95 92 */
96 93 Map<String, String> getProcessInstanceFormFieldsPermission(@Valid BpmProcessInstanceFormFieldsPermissionReqVO reqVO);
97 94  
  95 + /**
  96 + * 获取流程实例的进度
  97 + *
  98 + * @param id 流程 Id
  99 + * @return 流程实例的进度
  100 + */
  101 + BpmProcessInstanceProgressRespVO getProcessInstanceProgress(String id);
  102 +
98 103 // ========== Update 写入相关方法 ==========
99 104  
100 105 /**
... ... @@ -148,4 +153,5 @@ public interface BpmProcessInstanceService {
148 153 */
149 154 void processProcessInstanceCompleted(ProcessInstance instance);
150 155  
  156 +
151 157 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
  View file @f03e26b
1   -package cn.iocoder.yudao.module.bpm.service.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.common.util.object.PageUtils; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCreateReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceFormFieldsPermissionReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageReqVO; import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum; import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum; import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.BpmTaskCandidateStartUserSelectStrategy; import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants; import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.UserTask; import org.flowable.engine.HistoryService; import org.flowable.engine.RuntimeService; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstanceQuery; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.history.HistoricTaskInstance; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.util.*; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; /** * 流程实例 Service 实现类 * <p> * ProcessDefinition & ProcessInstance & Execution & Task 的关系： * 1. <a href="https://blog.csdn.net/bobozai86/article/details/105210414" /> * <p> * HistoricProcessInstance & ProcessInstance 的关系： * 1. <a href=" https://my.oschina.net/843294669/blog/71902" /> * <p> * 简单来说，前者 = 历史 + 运行中的流程实例，后者仅是运行中的流程实例 * * @author 芋道源码 */ @Service @Validated @Slf4j public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService { @Resource private RuntimeService runtimeService; @Resource private HistoryService historyService; @Resource private BpmProcessDefinitionService processDefinitionService; @Resource @Lazy // 避免循环依赖 private BpmTaskService taskService; @Resource private BpmMessageService messageService; @Resource private AdminUserApi adminUserApi; @Resource private BpmProcessInstanceEventPublisher processInstanceEventPublisher; // ========== Query 查询相关方法 ========== @Override public ProcessInstance getProcessInstance(String id) { return runtimeService.createProcessInstanceQuery() .includeProcessVariables() .processInstanceId(id) .singleResult(); } @Override public List<ProcessInstance> getProcessInstances(Set<String> ids) { return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list(); } @Override public HistoricProcessInstance getHistoricProcessInstance(String id) { return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables().singleResult(); } @Override public List<HistoricProcessInstance> getHistoricProcessInstances(Set<String> ids) { return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).list(); } @Override public PageResult<HistoricProcessInstance> getProcessInstancePage(Long userId, BpmProcessInstancePageReqVO pageReqVO) { // 通过 BpmProcessInstanceExtDO 表，先查询到对应的分页 HistoricProcessInstanceQuery processInstanceQuery = historyService.createHistoricProcessInstanceQuery() .includeProcessVariables() .processInstanceTenantId(FlowableUtils.getTenantId()) .orderByProcessInstanceStartTime().desc(); if (userId != null) { // 【我的流程】菜单时，需要传递该字段 processInstanceQuery.startedBy(String.valueOf(userId)); } else if (pageReqVO.getStartUserId() != null) { // 【管理流程】菜单时，才会传递该字段 processInstanceQuery.startedBy(String.valueOf(pageReqVO.getStartUserId())); } if (StrUtil.isNotEmpty(pageReqVO.getName())) { processInstanceQuery.processInstanceNameLike("%" + pageReqVO.getName() + "%"); } if (StrUtil.isNotEmpty(pageReqVO.getProcessDefinitionId())) { processInstanceQuery.processDefinitionId("%" + pageReqVO.getProcessDefinitionId() + "%"); } if (StrUtil.isNotEmpty(pageReqVO.getCategory())) { processInstanceQuery.processDefinitionCategory(pageReqVO.getCategory()); } if (pageReqVO.getStatus() != null) { processInstanceQuery.variableValueEquals(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, pageReqVO.getStatus()); } if (ArrayUtil.isNotEmpty(pageReqVO.getCreateTime())) { processInstanceQuery.startedAfter(DateUtils.of(pageReqVO.getCreateTime()[0])); processInstanceQuery.startedBefore(DateUtils.of(pageReqVO.getCreateTime()[1])); } // 查询数量 long processInstanceCount = processInstanceQuery.count(); if (processInstanceCount == 0) { return PageResult.empty(processInstanceCount); } // 查询列表 List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO), pageReqVO.getPageSize()); return new PageResult<>(processInstanceList, processInstanceCount); } @Override public Map<String, String> getProcessInstanceFormFieldsPermission(BpmProcessInstanceFormFieldsPermissionReqVO reqVO) { HistoricProcessInstance processInstance = getHistoricProcessInstance(reqVO.getId()); // 1.1 查询流程实例. 不存在返回 null if (processInstance == null) { return null; } // 1.2 通过流程活动编号 String activityId = reqVO.getActivityId(); if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(reqVO.getTaskId())) { // 流程活动 Id 为空。从流程任务中获取流程活动 Id activityId = Optional.ofNullable(taskService.getHistoricTask(reqVO.getTaskId())) .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null); } if (StrUtil.isEmpty(activityId)) { return null; } // 2. 从 BpmnModel 中解析表单字段权限 return BpmnModelUtils.parseFormFieldsPermission( processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()), activityId); } // ========== Update 写入相关方法 ========== @Override @Transactional(rollbackFor = Exception.class) public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) { // 获得流程定义 ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId()); // 发起流程 return createProcessInstance0(userId, definition, createReqVO.getVariables(), null, createReqVO.getStartUserSelectAssignees()); } @Override public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) { // 获得流程定义 ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey()); // 发起流程 return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(), createReqDTO.getStartUserSelectAssignees()); } private String createProcessInstance0(Long userId, ProcessDefinition definition, Map<String, Object> variables, String businessKey, Map<String, List<Long>> startUserSelectAssignees) { // 1.1 校验流程定义 if (definition == null) { throw exception(PROCESS_DEFINITION_NOT_EXISTS); } if (definition.isSuspended()) { throw exception(PROCESS_DEFINITION_IS_SUSPENDED); } // 1.2 校验发起人自选审批人 validateStartUserSelectAssignees(definition, startUserSelectAssignees); // 2. 创建流程实例 if (variables == null) { variables = new HashMap<>(); } FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下，避免 ProcessInstance 系统级的变量被占用 variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 流程实例状态：审批中 BpmProcessInstanceStatusEnum.RUNNING.getStatus()); if (CollUtil.isNotEmpty(startUserSelectAssignees)) { variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees); } ProcessInstance instance = runtimeService.createProcessInstanceBuilder() .processDefinitionId(definition.getId()) .businessKey(businessKey) .name(definition.getName().trim()) .variables(variables) .start(); return instance.getId(); } private void validateStartUserSelectAssignees(ProcessDefinition definition, Map<String, List<Long>> startUserSelectAssignees) { // 1. 获得发起人自选审批人的 UserTask 列表 BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId()); List<UserTask> userTaskList = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectUserTaskList(bpmnModel); if (CollUtil.isEmpty(userTaskList)) { return; } // 2. 校验发起人自选审批人的 UserTask 是否都配置了 userTaskList.forEach(userTask -> { List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(userTask.getId()) : null; if (CollUtil.isEmpty(assignees)) { throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, userTask.getName()); } Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(assignees); assignees.forEach(assignee -> { if (userMap.get(assignee) == null) { throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS, userTask.getName(), assignee); } }); }); } @Override public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) { // 1.1 校验流程实例存在 ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); if (instance == null) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); } // 1.2 只能取消自己的 if (!Objects.equals(instance.getStartUserId(), String.valueOf(userId))) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF); } // 2. 取消流程 updateProcessInstanceCancel(cancelReqVO.getId(), BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_START_USER.format(cancelReqVO.getReason())); } @Override public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) { // 1.1 校验流程实例存在 ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); if (instance == null) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); } // 2. 取消流程 AdminUserRespDTO user = adminUserApi.getUser(userId); updateProcessInstanceCancel(cancelReqVO.getId(), BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_ADMIN.format(user.getNickname(), cancelReqVO.getReason())); } private void updateProcessInstanceCancel(String id, String reason) { // 1. 更新流程实例 status runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmProcessInstanceStatusEnum.CANCEL.getStatus()); runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, reason); // 2. 结束流程 taskService.moveTaskToEnd(id); } @Override public void updateProcessInstanceReject(ProcessInstance processInstance, String reason) { runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmProcessInstanceStatusEnum.REJECT.getStatus()); runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, BpmReasonEnum.REJECT_TASK.format(reason)); } // ========== Event 事件相关方法 ========== @Override public void processProcessInstanceCompleted(ProcessInstance instance) { // 注意：需要基于 instance 设置租户编号，避免 Flowable 内部异步时，丢失租户编号 FlowableUtils.execute(instance.getTenantId(), () -> { // 1.1 获取当前状态 Integer status = (Integer) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS); String reason = (String) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON); // 1.2 当流程状态还是审批状态中，说明审批通过了，则变更下它的状态 // 为什么这么处理？因为流程完成，并且完成了，说明审批通过了 if (Objects.equals(status, BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { status = BpmProcessInstanceStatusEnum.APPROVE.getStatus(); runtimeService.setVariable(instance.getId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, status); } // 2. 发送对应的消息通知 if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) { messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance)); } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) { messageService.sendMessageWhenProcessInstanceReject( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason)); } // 3. 发送流程实例的状态事件 processInstanceEventPublisher.sendProcessInstanceResultEvent( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, instance, status)); }); } }
2 1 \ No newline at end of file
  2 +package cn.iocoder.yudao.module.bpm.service.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.object.PageUtils; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO; import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum; import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum; import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.BpmTaskCandidateStartUserSelectStrategy; import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants; import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.SimpleModelUtils; import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.UserTask; import org.flowable.engine.HistoryService; import org.flowable.engine.RuntimeService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstanceQuery; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.history.HistoricTaskInstance; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.util.*; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ProcessNodeProgress; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; /** * 流程实例 Service 实现类 * <p> * ProcessDefinition & ProcessInstance & Execution & Task 的关系： * 1. <a href="https://blog.csdn.net/bobozai86/article/details/105210414" /> * <p> * HistoricProcessInstance & ProcessInstance 的关系： * 1. <a href=" https://my.oschina.net/843294669/blog/71902" /> * <p> * 简单来说，前者 = 历史 + 运行中的流程实例，后者仅是运行中的流程实例 * * @author 芋道源码 */ @Service @Validated @Slf4j public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService { @Resource private RuntimeService runtimeService; @Resource private HistoryService historyService; @Resource private BpmActivityService activityService; @Resource private BpmProcessDefinitionService processDefinitionService; @Resource @Lazy // 避免循环依赖 private BpmTaskService taskService; @Resource private BpmMessageService messageService; @Resource private AdminUserApi adminUserApi; @Resource private BpmProcessInstanceEventPublisher processInstanceEventPublisher; // ========== Query 查询相关方法 ========== @Override public ProcessInstance getProcessInstance(String id) { return runtimeService.createProcessInstanceQuery() .includeProcessVariables() .processInstanceId(id) .singleResult(); } @Override public List<ProcessInstance> getProcessInstances(Set<String> ids) { return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list(); } @Override public HistoricProcessInstance getHistoricProcessInstance(String id) { return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables().singleResult(); } @Override public List<HistoricProcessInstance> getHistoricProcessInstances(Set<String> ids) { return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).list(); } @Override public PageResult<HistoricProcessInstance> getProcessInstancePage(Long userId, BpmProcessInstancePageReqVO pageReqVO) { // 通过 BpmProcessInstanceExtDO 表，先查询到对应的分页 HistoricProcessInstanceQuery processInstanceQuery = historyService.createHistoricProcessInstanceQuery() .includeProcessVariables() .processInstanceTenantId(FlowableUtils.getTenantId()) .orderByProcessInstanceStartTime().desc(); if (userId != null) { // 【我的流程】菜单时，需要传递该字段 processInstanceQuery.startedBy(String.valueOf(userId)); } else if (pageReqVO.getStartUserId() != null) { // 【管理流程】菜单时，才会传递该字段 processInstanceQuery.startedBy(String.valueOf(pageReqVO.getStartUserId())); } if (StrUtil.isNotEmpty(pageReqVO.getName())) { processInstanceQuery.processInstanceNameLike("%" + pageReqVO.getName() + "%"); } if (StrUtil.isNotEmpty(pageReqVO.getProcessDefinitionId())) { processInstanceQuery.processDefinitionId("%" + pageReqVO.getProcessDefinitionId() + "%"); } if (StrUtil.isNotEmpty(pageReqVO.getCategory())) { processInstanceQuery.processDefinitionCategory(pageReqVO.getCategory()); } if (pageReqVO.getStatus() != null) { processInstanceQuery.variableValueEquals(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, pageReqVO.getStatus()); } if (ArrayUtil.isNotEmpty(pageReqVO.getCreateTime())) { processInstanceQuery.startedAfter(DateUtils.of(pageReqVO.getCreateTime()[0])); processInstanceQuery.startedBefore(DateUtils.of(pageReqVO.getCreateTime()[1])); } // 查询数量 long processInstanceCount = processInstanceQuery.count(); if (processInstanceCount == 0) { return PageResult.empty(processInstanceCount); } // 查询列表 List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO), pageReqVO.getPageSize()); return new PageResult<>(processInstanceList, processInstanceCount); } @Override public Map<String, String> getProcessInstanceFormFieldsPermission(BpmProcessInstanceFormFieldsPermissionReqVO reqVO) { HistoricProcessInstance processInstance = getHistoricProcessInstance(reqVO.getId()); // 1.1 查询流程实例. 不存在返回 null if (processInstance == null) { return null; } // 1.2 通过流程活动编号 String activityId = reqVO.getActivityId(); if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(reqVO.getTaskId())) { // 流程活动 Id 为空。从流程任务中获取流程活动 Id activityId = Optional.ofNullable(taskService.getHistoricTask(reqVO.getTaskId())) .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null); } if (StrUtil.isEmpty(activityId)) { return null; } // 2. 从 BpmnModel 中解析表单字段权限 return BpmnModelUtils.parseFormFieldsPermission( processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()), activityId); } @Override public BpmProcessInstanceProgressRespVO getProcessInstanceProgress(String id) { HistoricProcessInstance processInstance = getHistoricProcessInstance(id); if (processInstance == null) { return null; } BpmProcessInstanceProgressRespVO respVO = new BpmProcessInstanceProgressRespVO() .setStatus(FlowableUtils.getProcessInstanceStatus(processInstance)); BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo( processInstance.getProcessDefinitionId()); List<HistoricActivityInstance> historicActivityList = activityService.getActivityListByProcessInstanceId( processInstance.getId()); // if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) { // 仿钉钉流程设计器 BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); List<ProcessNodeProgress> nodeProgresses = new LinkedList<>(); Map<String, HistoricActivityInstance> activityInstanceMap = CollectionUtils.convertMap(historicActivityList, HistoricActivityInstance::getActivityId); // TODO 回退节点需要处理。 List<Integer> returnNodePosition = new ArrayList<>(); SimpleModelUtils.traverseNodeToBuildNodeProgress(processInstance, simpleModel, historicActivityList, activityInstanceMap, nodeProgresses, returnNodePosition); respVO.setNodeProgressList(nodeProgresses); } else if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) { // TODO 待实现 } return respVO; } // ========== Update 写入相关方法 ========== @Override @Transactional(rollbackFor = Exception.class) public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) { // 获得流程定义 ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId()); // 发起流程 return createProcessInstance0(userId, definition, createReqVO.getVariables(), null, createReqVO.getStartUserSelectAssignees()); } @Override public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) { // 获得流程定义 ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey()); // 发起流程 return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(), createReqDTO.getStartUserSelectAssignees()); } private String createProcessInstance0(Long userId, ProcessDefinition definition, Map<String, Object> variables, String businessKey, Map<String, List<Long>> startUserSelectAssignees) { // 1.1 校验流程定义 if (definition == null) { throw exception(PROCESS_DEFINITION_NOT_EXISTS); } if (definition.isSuspended()) { throw exception(PROCESS_DEFINITION_IS_SUSPENDED); } // 1.2 校验发起人自选审批人 validateStartUserSelectAssignees(definition, startUserSelectAssignees); // 2. 创建流程实例 if (variables == null) { variables = new HashMap<>(); } FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下，避免 ProcessInstance 系统级的变量被占用 variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 流程实例状态：审批中 BpmProcessInstanceStatusEnum.RUNNING.getStatus()); if (CollUtil.isNotEmpty(startUserSelectAssignees)) { variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees); } ProcessInstance instance = runtimeService.createProcessInstanceBuilder() .processDefinitionId(definition.getId()) .businessKey(businessKey) .name(definition.getName().trim()) .variables(variables) .start(); return instance.getId(); } private void validateStartUserSelectAssignees(ProcessDefinition definition, Map<String, List<Long>> startUserSelectAssignees) { // 1. 获得发起人自选审批人的 UserTask 列表 BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId()); List<UserTask> userTaskList = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectUserTaskList(bpmnModel); if (CollUtil.isEmpty(userTaskList)) { return; } // 2. 校验发起人自选审批人的 UserTask 是否都配置了 userTaskList.forEach(userTask -> { List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(userTask.getId()) : null; if (CollUtil.isEmpty(assignees)) { throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, userTask.getName()); } Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(assignees); assignees.forEach(assignee -> { if (userMap.get(assignee) == null) { throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS, userTask.getName(), assignee); } }); }); } @Override public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) { // 1.1 校验流程实例存在 ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); if (instance == null) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); } // 1.2 只能取消自己的 if (!Objects.equals(instance.getStartUserId(), String.valueOf(userId))) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF); } // 2. 取消流程 updateProcessInstanceCancel(cancelReqVO.getId(), BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_START_USER.format(cancelReqVO.getReason())); } @Override public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) { // 1.1 校验流程实例存在 ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); if (instance == null) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); } // 2. 取消流程 AdminUserRespDTO user = adminUserApi.getUser(userId); updateProcessInstanceCancel(cancelReqVO.getId(), BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_ADMIN.format(user.getNickname(), cancelReqVO.getReason())); } private void updateProcessInstanceCancel(String id, String reason) { // 1. 更新流程实例 status runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmProcessInstanceStatusEnum.CANCEL.getStatus()); runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, reason); // 2. 结束流程 taskService.moveTaskToEnd(id); } @Override public void updateProcessInstanceReject(ProcessInstance processInstance, String reason) { runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmProcessInstanceStatusEnum.REJECT.getStatus()); runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, BpmReasonEnum.REJECT_TASK.format(reason)); } // ========== Event 事件相关方法 ========== @Override public void processProcessInstanceCompleted(ProcessInstance instance) { // 注意：需要基于 instance 设置租户编号，避免 Flowable 内部异步时，丢失租户编号 FlowableUtils.execute(instance.getTenantId(), () -> { // 1.1 获取当前状态 Integer status = (Integer) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS); String reason = (String) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON); // 1.2 当流程状态还是审批状态中，说明审批通过了，则变更下它的状态 // 为什么这么处理？因为流程完成，并且完成了，说明审批通过了 if (Objects.equals(status, BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { status = BpmProcessInstanceStatusEnum.APPROVE.getStatus(); runtimeService.setVariable(instance.getId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, status); } // 2. 发送对应的消息通知 if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) { messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance)); } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) { messageService.sendMessageWhenProcessInstanceReject( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason)); } // 3. 发送流程实例的状态事件 processInstanceEventPublisher.sendProcessInstanceResultEvent( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, instance, status)); }); } }
3 3 \ No newline at end of file
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
  View file @f03e26b
... ... @@ -94,6 +94,14 @@ public interface BpmTaskService {
94 94 HistoricTaskInstance getHistoricTask(String id);
95 95  
96 96 /**
  97 + * 获取历史任务列表
  98 + *
  99 + * @param taskIds 任务编号集合
  100 + * @return 历史任务列表
  101 + */
  102 + List<HistoricTaskInstance> getHistoricTasks(Collection<String> taskIds);
  103 +
  104 + /**
97 105 * 根据条件查询正在进行中的任务
98 106 *
99 107 * @param processInstanceId 流程实例编号，不允许为空
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
  View file @f03e26b
... ... @@ -218,6 +218,11 @@ public class BpmTaskServiceImpl implements BpmTaskService {
218 218 }
219 219  
220 220 @Override
  221 + public List<HistoricTaskInstance> getHistoricTasks(Collection<String> taskIds) {
  222 + return historyService.createHistoricTaskInstanceQuery().taskIds(taskIds).includeTaskLocalVariables().list();
  223 + }
  224 +
  225 + @Override
221 226 public List<Task> getRunningTaskListByProcessInstanceId(String processInstanceId, Boolean assigned, String defineKey) {
222 227 Assert.notNull(processInstanceId, "processInstanceId 不能为空");
223 228 TaskQuery taskQuery = taskService.createTaskQuery().processInstanceId(processInstanceId).active()
... ...