Commit da398dfefc60f0af42b3d0fa853cfbad2339ab38

Authored by jason
1 parent b28d917d

仿钉钉流程设计- 获取审批记录第二版

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmProcessNodeProgressEnum.java deleted
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 -  
17 - // 0 未开始  
18 - NOT_START(0,"未开始"),  
19 - // 1 ~ 20 进行中  
20 - RUNNING(1, "进行中"), // 节点的进行  
21 - // 特殊的进行中状态  
22 - USER_TASK_DELEGATE(10, "委派中"), // 审批节点  
23 - USER_TASK_APPROVING(11, "向后加签审批通过中"), //向后加签 审批通过中.  
24 - USER_TASK_WAIT(12, "待审批"), // 一般用于先前加签  
25 -  
26 - // 30 ~ 50 已经结束  
27 - // 30 ~ 40 审批节点的结束状态  
28 - USER_TASK_APPROVE(30, "审批通过"), // 审批节点  
29 - USER_TASK_REJECT(31, "审批不通过"), // 审批节点  
30 - USER_TASK_RETURN(32, "已退回"), // 审批节点  
31 - USER_TASK_CANCEL(34, "已取消"), // 审批节点  
32 - // 40 ~ 50 节点的通用结束状态  
33 - FINISHED(41, "已结束"), // 一般节点的节点的结束状态  
34 - SKIP(42, "跳过"); // 未执行,跳过的节点  
35 -  
36 - private final Integer status;  
37 - private final String name;  
38 -  
39 - public static Integer convertBpmnTaskStatus(Integer taskStatus) {  
40 - Integer convertStatus = null;  
41 - if (BpmTaskStatusEnum.RUNNING.getStatus().equals(taskStatus)) {  
42 - convertStatus = RUNNING.getStatus();  
43 - } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(taskStatus)) {  
44 - convertStatus = USER_TASK_REJECT.getStatus();  
45 - } else if( BpmTaskStatusEnum.APPROVE.getStatus().equals(taskStatus) ) {  
46 - convertStatus = USER_TASK_APPROVE.getStatus();  
47 - } else if (BpmTaskStatusEnum.DELEGATE.getStatus().equals(taskStatus)) {  
48 - convertStatus = USER_TASK_DELEGATE.getStatus();  
49 - } else if (BpmTaskStatusEnum.APPROVING.getStatus().equals(taskStatus)) {  
50 - convertStatus = USER_TASK_APPROVE.getStatus();  
51 - } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(taskStatus)) {  
52 - convertStatus = USER_TASK_CANCEL.getStatus();  
53 - } else if (BpmTaskStatusEnum.WAIT.getStatus().equals(taskStatus)) {  
54 - convertStatus = USER_TASK_WAIT.getStatus();  
55 - }  
56 - return convertStatus;  
57 - }  
58 -  
59 - /**  
60 - * 判断用户节点是不是未通过  
61 - *  
62 - * @param status 状态  
63 - */  
64 - public static boolean isUserTaskNotApproved(Integer status) {  
65 - return ObjectUtils.equalsAny(status,  
66 - USER_TASK_REJECT.getStatus(), USER_TASK_RETURN.getStatus(), USER_TASK_CANCEL.getStatus());  
67 - }  
68 -}  
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
@@ -18,26 +18,27 @@ import java.util.Objects; @@ -18,26 +18,27 @@ import java.util.Objects;
18 public enum BpmSimpleModelNodeType implements IntArrayValuable { 18 public enum BpmSimpleModelNodeType implements IntArrayValuable {
19 19
20 // 0 ~ 1 开始和结束 20 // 0 ~ 1 开始和结束
21 - START_NODE(0, "开始节点"),  
22 - END_NODE(1, "结束节点"), 21 + START_NODE(0, "startEvent", "开始节点"),
  22 + END_NODE(1, "endEvent", "结束节点"),
23 23
24 // 10 ~ 49 各种节点 24 // 10 ~ 49 各种节点
25 - START_USER_NODE(10, "发起人节点"), // 发起人节点。前端的开始节点,Id 固定  
26 - APPROVE_NODE(11, "审批人节点"),  
27 - COPY_NODE(12, "抄送人节点"), 25 + START_USER_NODE(10, "userTask", "发起人节点"), // 发起人节点。前端的开始节点,Id 固定
  26 + APPROVE_NODE(11, "userTask", "审批人节点"),
  27 + COPY_NODE(12, "serviceTask", "抄送人节点"),
28 28
29 // 50 ~ 条件分支 29 // 50 ~ 条件分支
30 - CONDITION_NODE(50, "条件节点"), // 用于构建流转条件的表达式  
31 - CONDITION_BRANCH_NODE(51, "条件分支节点"), // TODO @jason:是不是改成叫 条件分支?  
32 - PARALLEL_BRANCH_NODE(52, "并行分支节点"), // TODO @jason:是不是一个 并行分支 ?就可以啦? 后面是否去掉并行网关。只用包容网关  
33 - INCLUSIVE_BRANCH_NODE(53, "包容分支节点"), 30 + CONDITION_NODE(50, "sequenceFlow", "条件节点"), // 用于构建流转条件的表达式
  31 + CONDITION_BRANCH_NODE(51, " “parallelGateway”", "条件分支节点"), // TODO @jason:是不是改成叫 条件分支?
  32 + PARALLEL_BRANCH_NODE(52, "exclusiveGateway", "并行分支节点"), // TODO @jason:是不是一个 并行分支 ?就可以啦? 后面是否去掉并行网关。只用包容网关
  33 + INCLUSIVE_BRANCH_NODE(53, "inclusiveGateway", "包容分支节点"),
34 // TODO @jason:建议整合 join,最终只有 条件分支、并行分支、包容分支,三种~ 34 // TODO @jason:建议整合 join,最终只有 条件分支、并行分支、包容分支,三种~
35 // TODO @芋艿。 感觉还是分开好理解一点,也好处理一点。前端结构中把聚合节点显示并传过来。 35 // TODO @芋艿。 感觉还是分开好理解一点,也好处理一点。前端结构中把聚合节点显示并传过来。
36 ; 36 ;
37 37
38 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModelNodeType::getType).toArray(); 38 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModelNodeType::getType).toArray();
39 - 39 + public static final String BPMN_USER_TASK_TYPE ="userTask";
40 private final Integer type; 40 private final Integer type;
  41 + private final String bpmnType;
41 private final String name; 42 private final String name;
42 43
43 /** 44 /**
@@ -48,7 +49,17 @@ public enum BpmSimpleModelNodeType implements IntArrayValuable { @@ -48,7 +49,17 @@ public enum BpmSimpleModelNodeType implements IntArrayValuable {
48 public static boolean isBranchNode(Integer type) { 49 public static boolean isBranchNode(Integer type) {
49 return Objects.equals(CONDITION_BRANCH_NODE.getType(), type) 50 return Objects.equals(CONDITION_BRANCH_NODE.getType(), type)
50 || Objects.equals(PARALLEL_BRANCH_NODE.getType(), type) 51 || Objects.equals(PARALLEL_BRANCH_NODE.getType(), type)
51 - || Objects.equals(INCLUSIVE_BRANCH_NODE.getType(), type) ; 52 + || Objects.equals(INCLUSIVE_BRANCH_NODE.getType(), type);
  53 + }
  54 +
  55 + /**
  56 + * 判断是否需要记录的节点
  57 + *
  58 + * @param bpmnType bpmn节点类型
  59 + */
  60 + public static boolean isRecordNode(String bpmnType) {
  61 + return Objects.equals(APPROVE_NODE.getBpmnType(), bpmnType)
  62 + || Objects.equals(END_NODE.getBpmnType(), bpmnType);
52 } 63 }
53 64
54 public static BpmSimpleModelNodeType valueOf(Integer type) { 65 public static BpmSimpleModelNodeType valueOf(Integer type) {
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
@@ -12,7 +12,7 @@ import lombok.Getter; @@ -12,7 +12,7 @@ import lombok.Getter;
12 @Getter 12 @Getter
13 @AllArgsConstructor 13 @AllArgsConstructor
14 public enum BpmTaskStatusEnum { 14 public enum BpmTaskStatusEnum {
15 - 15 + NOT_START(-1, "未开始"),
16 RUNNING(1, "审批中"), 16 RUNNING(1, "审批中"),
17 APPROVE(2, "审批通过"), 17 APPROVE(2, "审批通过"),
18 REJECT(3, "审批不通过"), 18 REJECT(3, "审批不通过"),
@@ -57,5 +57,9 @@ public enum BpmTaskStatusEnum { @@ -57,5 +57,9 @@ public enum BpmTaskStatusEnum {
57 APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus(), 57 APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus(),
58 RETURN.getStatus(), APPROVING.getStatus()); 58 RETURN.getStatus(), APPROVING.getStatus());
59 } 59 }
  60 + public static boolean isEndStatusButNotApproved(Integer status) {
  61 + return ObjectUtils.equalsAny(status,
  62 + REJECT.getStatus(), CANCEL.getStatus(), RETURN.getStatus());
  63 + }
60 64
61 } 65 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceProgressRespVO.java
@@ -14,41 +14,35 @@ public class BpmProcessInstanceProgressRespVO { @@ -14,41 +14,35 @@ public class BpmProcessInstanceProgressRespVO {
14 @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 14 @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
15 private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举 15 private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举
16 16
17 - private List<ProcessNodeProgress> nodeProgressList; 17 + @Schema(description = "审批信息列表", requiredMode = Schema.RequiredMode.REQUIRED)
  18 + private List<ApproveNodeInfo> approveNodeList;
18 19
19 - @Schema(description = "节点进度信息") 20 + @Schema(description = "审批节点信息")
20 @Data 21 @Data
21 - public static class ProcessNodeProgress { 22 + public static class ApproveNodeInfo {
22 23
23 @Schema(description = "节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartUserNode") 24 @Schema(description = "节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartUserNode")
24 - private String id; // Bpmn XML 节点 Id 25 + private String id;
25 26
26 @Schema(description = "节点名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "发起人") 27 @Schema(description = "节点名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "发起人")
27 private String name; 28 private String name;
28 29
29 - @Schema(description = "节点展示内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "指定成员: 芋道源码")  
30 - private String displayText;  
31 -  
32 @Schema(description = "节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 30 @Schema(description = "节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
33 private Integer nodeType; // 参见 BpmSimpleModelNodeType 枚举 31 private Integer nodeType; // 参见 BpmSimpleModelNodeType 枚举
34 32
35 - // TODO @jason:可以复用 BpmTaskStatusEnum 么?非必要不加太多状态枚举哈  
36 @Schema(description = "节点状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") 33 @Schema(description = "节点状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
37 - private Integer status; // 参见 BpmProcessNodeProgressEnum 枚举 34 + private Integer status; // 参见 BpmTaskStatusEnum 枚举
38 35
39 @Schema(description = "节点的开始时间") 36 @Schema(description = "节点的开始时间")
40 private LocalDateTime startTime; 37 private LocalDateTime startTime;
41 @Schema(description = "节点的结束时间") 38 @Schema(description = "节点的结束时间")
42 private LocalDateTime endTime; 39 private LocalDateTime endTime;
43 40
44 - @Schema(description = "用户列表")  
45 - private List<User> userList;  
46 -  
47 - // TODO @jason:如果条件信息,怎么展示哈?  
48 - @Schema(description = "分支节点")  
49 - private List<ProcessNodeProgress> branchNodes; // 有且仅有条件、并行、包容节点才会有分支节点 41 + @Schema(description = "审批节点的任务信息")
  42 + private List<ApproveTaskInfo> tasks;
50 43
51 - // TODO 用户意见,评论 44 + @Schema(description = "候选人用户列表")
  45 + private List<User> candidateUserList; // 用于未运行任务节点
52 46
53 } 47 }
54 48
@@ -65,14 +59,25 @@ public class BpmProcessInstanceProgressRespVO { @@ -65,14 +59,25 @@ public class BpmProcessInstanceProgressRespVO {
65 @Schema(description = "用户头像", example = "芋艿") 59 @Schema(description = "用户头像", example = "芋艿")
66 private String avatar; 60 private String avatar;
67 61
68 - // TODO @jason:是不是把 processed 和 userTaskStatus 合并? 62 + }
  63 + @Schema(description = "审批任务信息")
  64 + @Data
  65 + public static class ApproveTaskInfo {
  66 +
  67 + @Schema(description = "任务编号", example = "1")
  68 + private String id;
  69 +
  70 + @Schema(description = "任务所属人")
  71 + private User ownerUser;
69 72
70 - @Schema(description = "是否已处理", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")  
71 - private Boolean processed; 73 + @Schema(description = "任务分配人")
  74 + private User assigneeUser;
72 75
73 - @Schema(description = "用户任务的处理状态", example = "1")  
74 - private Integer userTaskStatus; 76 + @Schema(description = "任务状态", example = "1")
  77 + private Integer status; // 参见 BpmTaskStatusEnum 枚举
75 78
  79 + @Schema(description = "审批意见", example = "同意")
  80 + private String reason;
76 } 81 }
77 82
78 } 83 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java
@@ -109,4 +109,9 @@ public interface BpmnModelConstants { @@ -109,4 +109,9 @@ public interface BpmnModelConstants {
109 */ 109 */
110 String START_EVENT_NODE_NAME = "开始"; 110 String START_EVENT_NODE_NAME = "开始";
111 111
  112 + /**
  113 + * 发起人节点 Id
  114 + */
  115 + String START_USER_NODE_ID = "StartUserNode";
  116 +
112 } 117 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
@@ -7,23 +7,23 @@ import cn.hutool.core.lang.TypeReference; @@ -7,23 +7,23 @@ import cn.hutool.core.lang.TypeReference;
7 import cn.hutool.core.map.MapUtil; 7 import cn.hutool.core.map.MapUtil;
8 import cn.hutool.core.util.*; 8 import cn.hutool.core.util.*;
9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 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;  
12 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; 10 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
13 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.RejectHandler; 11 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;  
15 -import cn.iocoder.yudao.module.bpm.enums.definition.*; 12 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmBoundaryEventType;
  13 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModeConditionType;
  14 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType;
  15 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveMethodEnum;
16 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants; 16 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
17 import cn.iocoder.yudao.module.bpm.framework.flowable.core.listener.BpmCopyTaskDelegate; 17 import cn.iocoder.yudao.module.bpm.framework.flowable.core.listener.BpmCopyTaskDelegate;
18 import cn.iocoder.yudao.module.bpm.framework.flowable.core.simplemodel.SimpleModelConditionGroups; 18 import cn.iocoder.yudao.module.bpm.framework.flowable.core.simplemodel.SimpleModelConditionGroups;
19 -import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService;  
20 import org.flowable.bpmn.BpmnAutoLayout; 19 import org.flowable.bpmn.BpmnAutoLayout;
21 import org.flowable.bpmn.model.Process; 20 import org.flowable.bpmn.model.Process;
22 import org.flowable.bpmn.model.*; 21 import org.flowable.bpmn.model.*;
23 -import org.flowable.engine.history.HistoricActivityInstance;  
24 -import org.flowable.engine.history.HistoricProcessInstance;  
25 22
26 -import java.util.*; 23 +import java.util.ArrayList;
  24 +import java.util.List;
  25 +import java.util.Map;
  26 +import java.util.Objects;
27 27
28 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.OperationButtonSetting; 28 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.OperationButtonSetting;
29 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.TimeoutHandler; 29 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.TimeoutHandler;
@@ -218,7 +218,7 @@ public class SimpleModelUtils { @@ -218,7 +218,7 @@ public class SimpleModelUtils {
218 * 218 *
219 * @param conditionNode 条件节点 219 * @param conditionNode 条件节点
220 */ 220 */
221 - private static String buildConditionExpression(BpmSimpleModelNodeVO conditionNode) { 221 + public static String buildConditionExpression(BpmSimpleModelNodeVO conditionNode) {
222 Integer conditionType = MapUtil.getInt(conditionNode.getAttributes(), CONDITION_TYPE_ATTRIBUTE); 222 Integer conditionType = MapUtil.getInt(conditionNode.getAttributes(), CONDITION_TYPE_ATTRIBUTE);
223 BpmSimpleModeConditionType conditionTypeEnum = BpmSimpleModeConditionType.valueOf(conditionType); 223 BpmSimpleModeConditionType conditionTypeEnum = BpmSimpleModeConditionType.valueOf(conditionType);
224 String conditionExpression = null; 224 String conditionExpression = null;
@@ -293,7 +293,7 @@ public class SimpleModelUtils { @@ -293,7 +293,7 @@ public class SimpleModelUtils {
293 traverseNodeToBuildFlowNode(node.getChildNode(), process); 293 traverseNodeToBuildFlowNode(node.getChildNode(), process);
294 } 294 }
295 295
296 - private static boolean isValidNode(BpmSimpleModelNodeVO node) { 296 + public static boolean isValidNode(BpmSimpleModelNodeVO node) {
297 return node != null && node.getId() != null; 297 return node != null && node.getId() != null;
298 } 298 }
299 299
@@ -635,117 +635,4 @@ public class SimpleModelUtils { @@ -635,117 +635,4 @@ public class SimpleModelUtils {
635 return endEvent; 635 return endEvent;
636 } 636 }
637 637
638 - /**  
639 - * 遍历简单模型, 构建节点的进度。 TODO 回退节点暂未处理  
640 - *  
641 - * @param processInstance 流程实例  
642 - * @param simpleModel 简单模型  
643 - * @param historicActivityList 流程实例的活力列表  
644 - * @param activityInstanceMap 流程实例的活力 Map。 key: activityId  
645 - * @param nodeProgresses 节点的进度列表  
646 - * @param returnNodePosition 回退节点的位置。 TODO 处理回退节点,还未处理。还没想好  
647 - */  
648 - public static void traverseNodeToBuildNodeProgress(HistoricProcessInstance processInstance, BpmSimpleModelNodeVO simpleModel  
649 - , List<HistoricActivityInstance> historicActivityList, Map<String, HistoricActivityInstance> activityInstanceMap  
650 - , List<ProcessNodeProgress> nodeProgresses, List<Integer> returnNodePosition) {  
651 - // 判断是否有效节点  
652 - if (!isValidNode(simpleModel)) {  
653 - return;  
654 - }  
655 - buildNodeProgress(processInstance, simpleModel, nodeProgresses, historicActivityList, activityInstanceMap, returnNodePosition);  
656 - // 如果有“子”节点,则递归处理子节点  
657 - // TODO @jason:需要根据条件,是否继续递归。例如说,一共有 3 个 node;第 2 个 node 审批不通过了。那么第 3 个 node 就不用了。(微信讨论下)  
658 - traverseNodeToBuildNodeProgress(processInstance, simpleModel.getChildNode(), historicActivityList, activityInstanceMap, nodeProgresses, returnNodePosition);  
659 - }  
660 -  
661 - // TODO @芋艿,@jason:可重构优化的点,SimpleModelUtils 负责提供一个遍历的方法,有个 Function 进行每个节点的处理。目的是,把逻辑拿回到 Service 里面;或者说,减少 Utils 去调用 Service  
662 - private static void buildNodeProgress(HistoricProcessInstance processInstance, BpmSimpleModelNodeVO node, List<ProcessNodeProgress> nodeProgresses,  
663 - List<HistoricActivityInstance> historicActivityList, Map<String, HistoricActivityInstance> activityInstanceMap, List<Integer> returnNodePosition) {  
664 - BpmSimpleModelNodeType nodeType = BpmSimpleModelNodeType.valueOf(node.getType());  
665 - Assert.notNull(nodeType, "模型节点类型不支持");  
666 -  
667 - ProcessNodeProgress nodeProgress = new ProcessNodeProgress();  
668 - nodeProgress.setNodeType(nodeType.getType());  
669 - nodeProgress.setName(node.getName());  
670 - nodeProgress.setDisplayText(node.getShowText());  
671 - BpmActivityService activityService = SpringUtils.getBean(BpmActivityService.class);  
672 - if (!activityInstanceMap.containsKey(node.getId())) { // 说明这些节点没有执行过  
673 - // 1. 得到流程状态  
674 - Integer processInstanceStatus = FlowableUtils.getProcessInstanceStatus(processInstance);  
675 - // 2. 设置节点状态  
676 - nodeProgress.setStatus(activityService.getNotRunActivityProgressStatus(processInstanceStatus));  
677 - // 3. 抄送节点, 审批节点设置用户列表  
678 - // TODO @芋艿:抄送节点,要不要跳过(不展示)  
679 - if (COPY_NODE.getType().equals(node.getType()) ||  
680 - (APPROVE_NODE.getType().equals(node.getType()) && USER.getType().equals(node.getApproveType()))) {  
681 - nodeProgress.setUserList(activityService.getNotRunActivityUserList(processInstance.getId()  
682 - , processInstanceStatus, node.getCandidateStrategy(), node.getCandidateParam()));  
683 - }  
684 - } else {  
685 - nodeProgress.setStatus(BpmProcessNodeProgressEnum.FINISHED.getStatus()); // 默认设置成结束状态  
686 - HistoricActivityInstance historicActivity = activityInstanceMap.get(node.getId());  
687 - nodeProgress.setStartTime(DateUtils.of(historicActivity.getStartTime()));  
688 - nodeProgress.setEndTime(DateUtils.of(historicActivity.getEndTime()));  
689 - nodeProgress.setId(historicActivity.getId());  
690 - switch (nodeType) {  
691 - case START_USER_NODE: { // 发起人节点  
692 - nodeProgress.setDisplayText(""); // 发起人节点不需要显示 displayText  
693 - // 1. 设置节点的状态  
694 - nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));  
695 - // 2. 设置用户信息  
696 - nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, false, historicActivityList));  
697 - break;  
698 - }  
699 - case APPROVE_NODE: { // 审批节点  
700 - if (USER.getType().equals(node.getApproveType())) { // 人工审批  
701 - // 1. 判断是否多人审批  
702 - boolean isMultiInstance = !RANDOM.getMethod().equals(node.getApproveMethod());  
703 - // 2. 设置节点的状态  
704 - nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, isMultiInstance, historicActivityList));  
705 - // 3. 设置用户信息  
706 - nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, isMultiInstance, historicActivityList));  
707 - } else {  
708 - nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));  
709 - }  
710 - break;  
711 - }  
712 - // TODO @芋艿:抄送节点,要不要跳过(不展示)  
713 - case COPY_NODE: { // 抄送节点  
714 - // 1. 设置节点的状态  
715 - nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));  
716 - // 2. 设置用户信息  
717 - nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, false, historicActivityList));  
718 - break;  
719 - }  
720 -  
721 - default: {  
722 - // TODO 其它节点类型的实现  
723 - }  
724 - }  
725 - }  
726 - // 如果是“分支”节点,  
727 - if (BpmSimpleModelNodeType.isBranchNode(node.getType())  
728 - && ArrayUtil.isNotEmpty(node.getConditionNodes())) {  
729 - // 网关是否执行了, 执行了。只包含运行的分支。 未执行包含所有的分支  
730 - final boolean executed = activityInstanceMap.containsKey(node.getId());  
731 - LinkedList<ProcessNodeProgress> branchNodeList = new LinkedList<>();  
732 - node.getConditionNodes().forEach(item -> {  
733 - // 如果条件节点执行了。 ACT_HI_ACTINST 表会记录  
734 - if (executed) {  
735 - if (activityInstanceMap.containsKey(item.getId())) {  
736 - List<Integer> branchReturnNodePosition = new ArrayList<>();  
737 - traverseNodeToBuildNodeProgress(processInstance, item, historicActivityList, activityInstanceMap, branchNodeList, branchReturnNodePosition);  
738 - // TODO 处理回退节点  
739 - }  
740 - } else {  
741 - List<Integer> branchReturnNodePosition = new ArrayList<>();  
742 - traverseNodeToBuildNodeProgress(processInstance, item, historicActivityList, activityInstanceMap, branchNodeList, branchReturnNodePosition);  
743 - // TODO 处理回退节点  
744 - }  
745 - });  
746 - nodeProgress.setBranchNodes(branchNodeList);  
747 - }  
748 - nodeProgresses.add(nodeProgress);  
749 - }  
750 -  
751 } 638 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java
1 package cn.iocoder.yudao.module.bpm.service.task; 1 package cn.iocoder.yudao.module.bpm.service.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO;  
4 -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;  
5 import org.flowable.engine.history.HistoricActivityInstance; 3 import org.flowable.engine.history.HistoricActivityInstance;
6 4
7 import java.util.List; 5 import java.util.List;
@@ -29,52 +27,4 @@ public interface BpmActivityService { @@ -29,52 +27,4 @@ public interface BpmActivityService {
29 */ 27 */
30 List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId); 28 List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId);
31 29
32 - /**  
33 - * 获取活动的用户列表。  
34 - *  
35 - * 例如:抄送人列表、审批人列表  
36 - *  
37 - * @param historicActivity 活动  
38 - * @param isMultiInstance 是否多实例 (会签,或签 )  
39 - * @param historicActivityList 某个流程实例的所有活动列表  
40 - * @return 用户列表  
41 - */  
42 - List<BpmProcessInstanceProgressRespVO.User> getHistoricActivityUserList(HistoricActivityInstance historicActivity,  
43 - Boolean isMultiInstance,  
44 - List<HistoricActivityInstance> historicActivityList);  
45 -  
46 - /**  
47 - * 获取活动的进度状态  
48 - *  
49 - * @param historicActivity 活动  
50 - * @param isMultiInstance 是否多实例 (会签,或签 )  
51 - * @param historicActivityList 某个流程实例的所有活动列表  
52 - * @return 活动的进度状态  
53 - */  
54 - Integer getHistoricActivityProgressStatus(HistoricActivityInstance historicActivity,  
55 - Boolean isMultiInstance,  
56 - List<HistoricActivityInstance> historicActivityList);  
57 -  
58 - /**  
59 - * 获取未执行活动的进度状态  
60 - *  
61 - * @param processInstanceStatus 流程实例的状态 {@link BpmProcessInstanceStatusEnum}  
62 - * @return 活动的进度状态  
63 - */  
64 - Integer getNotRunActivityProgressStatus(Integer processInstanceStatus);  
65 -  
66 - /**  
67 - * 获取未执行活动的用户列表  
68 - *  
69 - * @param processInstanceId 流程实例的编号  
70 - * @param processInstanceStatus 流程实例的状态 {@link BpmProcessInstanceStatusEnum}  
71 - * @param candidateStrategy 活动的候选人策略  
72 - * @param candidateParam 活动的候选人参数  
73 - * @return 用户列表  
74 - */  
75 - List<BpmProcessInstanceProgressRespVO.User> getNotRunActivityUserList(String processInstanceId,  
76 - Integer processInstanceStatus,  
77 - Integer candidateStrategy,  
78 - String candidateParam);  
79 -  
80 } 30 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
1 package cn.iocoder.yudao.module.bpm.service.task; 1 package cn.iocoder.yudao.module.bpm.service.task;
2 2
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; 3 import jakarta.annotation.Resource;
17 import lombok.extern.slf4j.Slf4j; 4 import lombok.extern.slf4j.Slf4j;
18 import org.flowable.engine.HistoryService; 5 import org.flowable.engine.HistoryService;
19 import org.flowable.engine.history.HistoricActivityInstance; 6 import org.flowable.engine.history.HistoricActivityInstance;
20 -import org.flowable.task.api.history.HistoricTaskInstance;  
21 -import org.springframework.context.annotation.Lazy;  
22 import org.springframework.stereotype.Service; 7 import org.springframework.stereotype.Service;
23 import org.springframework.validation.annotation.Validated; 8 import org.springframework.validation.annotation.Validated;
24 9
25 -import java.util.Collections;  
26 import java.util.List; 10 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.*;  
31 11
32 12
33 /** 13 /**
@@ -40,26 +20,8 @@ import static cn.iocoder.yudao.module.bpm.enums.definition.BpmProcessNodeProgres @@ -40,26 +20,8 @@ import static cn.iocoder.yudao.module.bpm.enums.definition.BpmProcessNodeProgres
40 @Validated 20 @Validated
41 public class BpmActivityServiceImpl implements BpmActivityService { 21 public class BpmActivityServiceImpl implements BpmActivityService {
42 22
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 -  
52 @Resource 23 @Resource
53 private HistoryService historyService; 24 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;  
63 25
64 @Override 26 @Override
65 public List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId) { 27 public List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId) {
@@ -72,130 +34,4 @@ public class BpmActivityServiceImpl implements BpmActivityService { @@ -72,130 +34,4 @@ public class BpmActivityServiceImpl implements BpmActivityService {
72 return historyService.createHistoricActivityInstanceQuery().executionId(executionId).list(); 34 return historyService.createHistoricActivityInstanceQuery().executionId(executionId).list();
73 } 35 }
74 36
75 - // TODO @芋艿:重点在 review 下~  
76 - @Override  
77 - public List<User> getHistoricActivityUserList(HistoricActivityInstance historicActivity  
78 - , Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList) {  
79 - Assert.notNull(historicActivity, "historicActivity 不能为 null ");  
80 - List<User> returnUserList = Collections.emptyList();  
81 - if (COPY_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {  
82 - Set<Long> copyUserIds = bpmProcessInstanceCopyService.getCopyUserIds(historicActivity.getProcessInstanceId(),  
83 - historicActivity.getActivityId());  
84 - List<AdminUserRespDTO> userList = adminUserApi.getUserList(copyUserIds);  
85 - returnUserList = CollectionUtils.convertList(userList, item -> {  
86 - User user = BeanUtils.toBean(item, User.class);  
87 - user.setProcessed(Boolean.TRUE);  
88 - return user;  
89 - });  
90 - } else if (APPROVE_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {  
91 - if (isMultiInstance) { // 多人 (会签 、 或签) // TODO 依次审批可能要特殊处理一下  
92 - // 多个任务列表  
93 - List<HistoricActivityInstance> taskList = CollectionUtils.filterList(historicActivityList,  
94 - item -> historicActivity.getActivityId().equals(item.getActivityId()));  
95 - List<Long> userIds = CollectionUtils.convertList(taskList, item -> NumberUtil.parseLong(item.getAssignee(), null));  
96 - List<String> taskIds = CollectionUtils.convertList(taskList, HistoricActivityInstance::getTaskId);  
97 - Map<Long, AdminUserRespDTO> adminUserMap = CollectionUtils.convertMap(adminUserApi.getUserList(userIds), AdminUserRespDTO::getId);  
98 - Map<String, HistoricTaskInstance> historicTaskInstanceMap = CollectionUtils.convertMap(bpmTaskService.getHistoricTasks(taskIds), HistoricTaskInstance::getId);  
99 - returnUserList = CollectionUtils.convertList(taskList, item -> {  
100 - AdminUserRespDTO adminUser = adminUserMap.get(NumberUtil.parseLong(item.getAssignee(), null));  
101 - User user = BeanUtils.toBean(adminUser, User.class);  
102 - if (user != null) {  
103 - HistoricTaskInstance taskInstance = historicTaskInstanceMap.get(item.getTaskId());  
104 - if (taskInstance != null) {  
105 - user.setProcessed(taskInstance.getEndTime() != null);  
106 - user.setUserTaskStatus(FlowableUtils.getTaskStatus(taskInstance));  
107 - }  
108 - }  
109 - return user;  
110 - });  
111 - } else {  
112 - AdminUserRespDTO adminUserResp = adminUserApi.getUser(Long.valueOf(historicActivity.getAssignee()));  
113 - if (adminUserResp != null) {  
114 - User user = BeanUtils.toBean(adminUserResp, User.class);  
115 - // TODO 需要处理加签  
116 - // 查询任务状态  
117 - HistoricTaskInstance historicTask = bpmTaskService.getHistoricTask(historicActivity.getTaskId());  
118 - if (historicTask != null) {  
119 - Integer taskStatus = FlowableUtils.getTaskStatus(historicTask);  
120 - user.setProcessed(historicTask.getEndTime() != null);  
121 - user.setUserTaskStatus(taskStatus);  
122 - }  
123 - returnUserList = ListUtil.of(user);  
124 - }  
125 - }  
126 - }  
127 - return returnUserList;  
128 - }  
129 -  
130 - @Override  
131 - public Integer getHistoricActivityProgressStatus(HistoricActivityInstance historicActivity  
132 - , Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList) {  
133 - Assert.notNull(historicActivity, "historicActivity 不能为 null ");  
134 - Integer progressStatus = null;  
135 - if (APPROVE_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {  
136 - if (isMultiInstance) { // 多人 (会签 、 或签)  
137 - // 多个任务列表  
138 - List<HistoricActivityInstance> taskList = CollectionUtils.filterList(historicActivityList,  
139 - item -> historicActivity.getActivityId().equals(item.getActivityId()));  
140 - List<String> taskIds = CollectionUtils.convertList(taskList, HistoricActivityInstance::getTaskId);  
141 - Map<String, HistoricTaskInstance> historicTaskMap = CollectionUtils.convertMap(bpmTaskService.getHistoricTasks(taskIds), HistoricTaskInstance::getId);  
142 - for (HistoricActivityInstance activity : taskList) {  
143 - if (activity.getEndTime() == null) {  
144 - progressStatus = RUNNING.getStatus();  
145 - } else {  
146 - HistoricTaskInstance task = historicTaskMap.get(activity.getTaskId());  
147 - if (task != null) {  
148 - Integer taskStatus = FlowableUtils.getTaskStatus(task);  
149 - progressStatus = BpmProcessNodeProgressEnum.convertBpmnTaskStatus(taskStatus);  
150 - }  
151 - }  
152 - // 运行中或者未通过状态。退出循环 (会签可能需要多人通过)  
153 - if (RUNNING.getStatus().equals(progressStatus) || isUserTaskNotApproved(progressStatus)) {  
154 - break;  
155 - }  
156 - }  
157 - } else {  
158 - HistoricTaskInstance historicTask = bpmTaskService.getHistoricTask(historicActivity.getTaskId());  
159 - if (historicTask != null) {  
160 - Integer taskStatus = FlowableUtils.getTaskStatus(historicTask);  
161 - progressStatus = BpmProcessNodeProgressEnum.convertBpmnTaskStatus(taskStatus);  
162 - }  
163 - }  
164 - } else {  
165 - if (historicActivity.getEndTime() == null) {  
166 - progressStatus = RUNNING.getStatus();  
167 - }else {  
168 - progressStatus = BpmProcessNodeProgressEnum.FINISHED.getStatus();  
169 - }  
170 -  
171 - }  
172 - return progressStatus;  
173 - }  
174 -  
175 - @Override  
176 - public Integer getNotRunActivityProgressStatus(Integer processInstanceStatus) {  
177 - if(BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)){  
178 - return SKIP.getStatus();  
179 - }else {  
180 - return NOT_START.getStatus();  
181 - }  
182 - }  
183 -  
184 - @Override  
185 - public List<User> getNotRunActivityUserList(String processInstanceId, Integer processInstanceStatus, Integer candidateStrategy, String candidateParam) {  
186 - if(BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)){  
187 - // 跳过节点。返回空  
188 - return Collections.emptyList();  
189 - }else {  
190 - BpmTaskCandidateStrategy taskCandidateStrategy = bpmTaskCandidateInvoker.getCandidateStrategy(candidateStrategy);  
191 - Set<Long> userIds = taskCandidateStrategy.calculateUsers(processInstanceId, candidateParam);  
192 - List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIds);  
193 - return CollectionUtils.convertList(userList, item -> {  
194 - User user = BeanUtils.toBean(item, User.class);  
195 - user.setProcessed(Boolean.FALSE);  
196 - return user;  
197 - });  
198 - }  
199 - }  
200 -  
201 } 37 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
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.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)); }); } }  
2 \ No newline at end of file 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.NumberUtil; 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.BeanUtils; 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.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ApproveTaskInfo; 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.definition.BpmSimpleModelNodeType; 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.BpmTaskCandidateInvoker; import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy; 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.bpm.service.task.bo.AlreadyRunApproveNodeRespBO; 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.ApproveNodeInfo; import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.User; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType.*; import static cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveTypeEnum.USER; import static cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum.APPROVE; import static cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum.NOT_START; import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.START_USER_NODE_ID; /** * 流程实例 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 BpmTaskCandidateInvoker bpmTaskCandidateInvoker; @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) { // 1. 获取流程实例信息 HistoricProcessInstance processInstance = getHistoricProcessInstance(id); if (processInstance == null) { return null; } // 2. 获取流程实例状态 Integer processInstanceStatus = FlowableUtils.getProcessInstanceStatus(processInstance); BpmProcessInstanceProgressRespVO respVO = new BpmProcessInstanceProgressRespVO() .setStatus(processInstanceStatus); // 3. 构建已运行节点的审批信息 List<HistoricActivityInstance> historicActivityList = activityService.getActivityListByProcessInstanceId( processInstance.getId()); AlreadyRunApproveNodeRespBO respBO = buildAlreadyRunApproveNodes(processInstance.getId(), historicActivityList); if (BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)) { // 流程已经结束 respVO.setApproveNodeList(respBO.getApproveNodeList()); } else { // 区分 BPMN 设计器 和 SIMPLE 设计器 BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo( processInstance.getProcessDefinitionId()); if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) { // 4.1 仿钉钉流程设计器, 构建未运行节点的审批信息 List<ApproveNodeInfo> approveNodeList = respBO.getApproveNodeList(); BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); List<ApproveNodeInfo> notRunApproveNodes = new ArrayList<>(); traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstance.getId(), simpleModel, respBO.getRunNodeIds(), notRunApproveNodes); approveNodeList.addAll(notRunApproveNodes); respVO.setApproveNodeList(approveNodeList); } else if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) { // TODO Bpmn 设计器, 构建未运行节点的审批信息 respVO.setApproveNodeList(respBO.getApproveNodeList()); } } return respVO; } /** * 遍历 SIMPLE 设计器模型 构建未运行节点的审批信息 * * @param processInstanceId 流程实例 Id * @param simpleModelNode SIMPLE 设计器模型 * @param runNodeIds 已经运行节点的 Ids * @param approveNodeList 未运行节点的审批信息列表 */ private void traverseSimpleModelNodeToBuildNotRunApproveNodes(String processInstanceId, BpmSimpleModelNodeVO simpleModelNode , Set<String> runNodeIds, List<ApproveNodeInfo> approveNodeList) { if (!SimpleModelUtils.isValidNode(simpleModelNode)) { return; } buildNotRunApproveNodes(processInstanceId, simpleModelNode, runNodeIds, approveNodeList); // 如果有子节点递归遍历子节点 traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstanceId, simpleModelNode.getChildNode(), runNodeIds, approveNodeList); } private void buildNotRunApproveNodes(String processInstanceId, BpmSimpleModelNodeVO node, Set<String> runNodeIds, List<ApproveNodeInfo> approveNodeList) { if (!runNodeIds.contains(node.getId())) { // 节点未运行。需要进行预测 // 1. 对需要人工审批的审批节点。进行预测 if (APPROVE_NODE.getType().equals(node.getType()) && USER.getType().equals(node.getApproveType())) { ApproveNodeInfo nodeProgress = new ApproveNodeInfo(); nodeProgress.setNodeType(node.getType()); nodeProgress.setName(node.getName()); nodeProgress.setStatus(NOT_START.getStatus()); nodeProgress.setCandidateUserList(getNotRunTaskCandidateUserList(processInstanceId, node.getCandidateStrategy(), node.getCandidateParam())); approveNodeList.add(nodeProgress); } // 2. 对分支节点进行预测 if (BpmSimpleModelNodeType.isBranchNode(node.getType())) { // 并行分支。不用预测条件。所有分支都需要遍历 if (PARALLEL_BRANCH_NODE.getType().equals(node.getType())) { node.getConditionNodes().forEach(conditionNode -> traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstanceId, conditionNode.getChildNode() , runNodeIds, approveNodeList) ); } // TODO 条件分支如何预测待研究 } // 3. 结束节点 if (END_NODE.getType().equals(node.getType())) { ApproveNodeInfo nodeProgress = new ApproveNodeInfo(); nodeProgress.setNodeType(node.getType()); nodeProgress.setName(node.getName()); nodeProgress.setStatus(NOT_START.getStatus()); approveNodeList.add(nodeProgress); } } else { // 节点已经运行。如果是分支节点。需要检查分支节点的运行情况 if (BpmSimpleModelNodeType.isBranchNode(node.getType()) && ArrayUtil.isNotEmpty(node.getConditionNodes())) { node.getConditionNodes().forEach(conditionNode -> { // 只有运行的条件,才需要遍历 if (runNodeIds.contains(conditionNode.getId())) { traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstanceId, conditionNode.getChildNode() , runNodeIds, approveNodeList); } }); } } } /** * 从已经运行活动节点构建的审批信息列表 * * @param processInstanceId 流程实例 Id * @param historicActivityList 已经运行活动 */ private AlreadyRunApproveNodeRespBO buildAlreadyRunApproveNodes(String processInstanceId, List<HistoricActivityInstance> historicActivityList) { // 待处理活动 只有 "userTask" 和 "endEvent"。 活动需要处理 List<HistoricActivityInstance> pendingActivityNodes = new ArrayList<>(); // 运行的节点 activityId。 Set<String> runNodeIds = new HashSet<>(); // 1. 遍历所有已运行和运行中的活动。 获取待处理的活动 historicActivityList.forEach(activity -> { runNodeIds.add(activity.getActivityId()); if (BpmSimpleModelNodeType.isRecordNode(activity.getActivityType())) { pendingActivityNodes.add(activity); } }); // 2.1 获取已运行和运行中的任务 List<HistoricTaskInstance> taskList = taskService.getTaskListByProcessInstanceId(processInstanceId); Map<String, HistoricTaskInstance> taskMap = CollectionUtils.convertMap(taskList, HistoricTaskInstance::getId); // 2.2 获取加签的任务 Map<String, List<HistoricTaskInstance>> addSignTaskMap = CollectionUtils.convertMultiMap( CollectionUtils.filterList(taskList, task -> StrUtil.isNotEmpty(task.getParentTaskId())), HistoricTaskInstance::getParentTaskId); // 3. 转换为节点审批信息 List<ApproveNodeInfo> nodeProgressList = CollectionUtils.convertList(pendingActivityNodes, activity -> { ApproveNodeInfo nodeProgress = new ApproveNodeInfo().setName(activity.getActivityName()) .setId(activity.getId()) .setStartTime(DateUtils.of(activity.getStartTime())) .setEndTime(DateUtils.of(activity.getEndTime())); if (BPMN_USER_TASK_TYPE.equals(activity.getActivityType())) { // 用户任务 if (START_USER_NODE_ID.equals(activity.getActivityId())) { nodeProgress.setNodeType(START_USER_NODE.getType()); } else { nodeProgress.setNodeType(APPROVE_NODE.getType()); } HistoricTaskInstance task = taskMap.get(activity.getTaskId()); nodeProgress.setStatus(FlowableUtils.getTaskStatus(task)); ApproveTaskInfo approveTask = convertApproveTaskInfo(task); List<ApproveTaskInfo> approveTasks = CollUtil.newArrayList(approveTask); // 处理加签任务 List<HistoricTaskInstance> addSignTasks = addSignTaskMap.get(activity.getTaskId()); if (CollUtil.isNotEmpty(addSignTasks)) { approveTasks.addAll(CollectionUtils.convertList(addSignTasks, this::convertApproveTaskInfo)); } nodeProgress.setTasks(approveTasks); } else if (END_NODE.getBpmnType().equals(activity.getActivityType())) { nodeProgress.setNodeType(APPROVE_NODE.getType()); nodeProgress.setStatus(APPROVE.getStatus()); } return nodeProgress; }); return new AlreadyRunApproveNodeRespBO() .setApproveNodeList(nodeProgressList) .setRunNodeIds(runNodeIds); } private ApproveTaskInfo convertApproveTaskInfo(HistoricTaskInstance task) { if (task == null) { return null; } ApproveTaskInfo approveTask = BeanUtils.toBean(task, ApproveTaskInfo.class); approveTask.setStatus(FlowableUtils.getTaskStatus(task)); approveTask.setReason(FlowableUtils.getTaskReason(task)); if (StrUtil.isNotEmpty(task.getAssignee())) { AdminUserRespDTO adminUserResp = adminUserApi.getUser(NumberUtil.parseLong(task.getAssignee())); approveTask.setAssigneeUser(BeanUtils.toBean(adminUserResp, User.class)); } if (StrUtil.isNotEmpty(task.getOwner())) { AdminUserRespDTO adminUserResp = adminUserApi.getUser(NumberUtil.parseLong(task.getOwner())); approveTask.setOwnerUser(BeanUtils.toBean(adminUserResp, User.class)); } return approveTask; } private List<User> getNotRunTaskCandidateUserList(String processInstanceId, Integer candidateStrategy, String candidateParam) { BpmTaskCandidateStrategy taskCandidateStrategy = bpmTaskCandidateInvoker.getCandidateStrategy(candidateStrategy); Set<Long> userIds = taskCandidateStrategy.calculateUsers(processInstanceId, candidateParam); List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIds); return CollectionUtils.convertList(userList, item -> BeanUtils.toBean(item, User.class)); } // ========== 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 \ No newline at end of file 3 \ No newline at end of file
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/bo/AlreadyRunApproveNodeRespBO.java 0 → 100644
  1 +package cn.iocoder.yudao.module.bpm.service.task.bo;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.util.List;
  6 +import java.util.Set;
  7 +
  8 +import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ApproveNodeInfo;
  9 +
  10 +/**
  11 + * @author jason
  12 + */
  13 +@Data
  14 +public class AlreadyRunApproveNodeRespBO {
  15 +
  16 + private List<ApproveNodeInfo> approveNodeList;
  17 +
  18 + private Set<String> runNodeIds;
  19 +
  20 +}