Commit b1afcef86f25397543f9a4c5d2b9f4fc38013526
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
# Conflicts: # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
Showing
23 changed files
with
270 additions
and
210 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
| ... | ... | @@ -332,7 +332,7 @@ public class CollectionUtils { |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | public static <T> List<T> newArrayList(List<List<T>> list) { |
| 335 | - return list.stream().flatMap(Collection::stream).collect(Collectors.toList()); | |
| 335 | + return list.stream().filter(Objects::nonNull).flatMap(Collection::stream).collect(Collectors.toList()); | |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | } |
| 339 | 339 | \ No newline at end of file | ... | ... |
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
| ... | ... | @@ -18,28 +18,26 @@ import java.util.Objects; |
| 18 | 18 | public enum BpmSimpleModelNodeType implements IntArrayValuable { |
| 19 | 19 | |
| 20 | 20 | // 0 ~ 1 开始和结束 |
| 21 | - START_NODE(0, "startEvent", "开始节点"), | |
| 22 | - END_NODE(1, "endEvent", "结束节点"), | |
| 21 | + START_NODE(0, "开始", "startEvent"), | |
| 22 | + END_NODE(1, "结束", "endEvent"), | |
| 23 | 23 | |
| 24 | 24 | // 10 ~ 49 各种节点 |
| 25 | - START_USER_NODE(10, "userTask", "发起人节点"), // 发起人节点。前端的开始节点，Id 固定 | |
| 26 | - APPROVE_NODE(11, "userTask", "审批人节点"), | |
| 27 | - COPY_NODE(12, "serviceTask", "抄送人节点"), | |
| 25 | + START_USER_NODE(10, "发起人", "userTask"), // 发起人节点。前端的开始节点，Id 固定 | |
| 26 | + APPROVE_NODE(11, "审批人", "userTask"), | |
| 27 | + COPY_NODE(12, "抄送人", "serviceTask"), | |
| 28 | 28 | |
| 29 | 29 | // 50 ~ 条件分支 |
| 30 | - CONDITION_NODE(50, "sequenceFlow", "条件节点"), // 用于构建流转条件的表达式 | |
| 31 | - CONDITION_BRANCH_NODE(51, "exclusiveGateway", "条件分支节点"), | |
| 32 | - PARALLEL_BRANCH_NODE(52, "parallelGateway", "并行分支节点"), | |
| 33 | - INCLUSIVE_BRANCH_NODE(53, "inclusiveGateway", "包容分支节点"), | |
| 30 | + CONDITION_NODE(50, "条件", "sequenceFlow"), // 用于构建流转条件的表达式 | |
| 31 | + CONDITION_BRANCH_NODE(51, "条件分支", "exclusiveGateway"), | |
| 32 | + PARALLEL_BRANCH_NODE(52, "并行分支", "parallelGateway"), | |
| 33 | + INCLUSIVE_BRANCH_NODE(53, "包容分支", "inclusiveGateway"), | |
| 34 | 34 | ; |
| 35 | 35 | |
| 36 | 36 | public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModelNodeType::getType).toArray(); |
| 37 | 37 | |
| 38 | - public static final String BPMN_USER_TASK_TYPE = "userTask"; | |
| 39 | - | |
| 40 | 38 | private final Integer type; |
| 41 | - private final String bpmnType; | |
| 42 | 39 | private final String name; |
| 40 | + private final String bpmnType; | |
| 43 | 41 | |
| 44 | 42 | /** |
| 45 | 43 | * 判断是否为分支节点 |
| ... | ... | @@ -52,16 +50,6 @@ public enum BpmSimpleModelNodeType implements IntArrayValuable { |
| 52 | 50 | || Objects.equals(INCLUSIVE_BRANCH_NODE.getType(), type); |
| 53 | 51 | } |
| 54 | 52 | |
| 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); | |
| 63 | - } | |
| 64 | - | |
| 65 | 53 | public static BpmSimpleModelNodeType valueOf(Integer type) { |
| 66 | 54 | return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values()); |
| 67 | 55 | } | ... | ... |
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
| 1 | 1 | package cn.iocoder.yudao.module.bpm.enums.task; |
| 2 | 2 | |
| 3 | +import cn.hutool.core.util.ObjUtil; | |
| 3 | 4 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; |
| 4 | 5 | import lombok.AllArgsConstructor; |
| 5 | 6 | import lombok.Getter; |
| ... | ... | @@ -63,4 +64,8 @@ public enum BpmTaskStatusEnum { |
| 63 | 64 | RETURN.getStatus(), APPROVING.getStatus()); |
| 64 | 65 | } |
| 65 | 66 | |
| 67 | + public static boolean isCancelStatus(Integer status) { | |
| 68 | + return ObjUtil.equal(status, CANCEL.getStatus()); | |
| 69 | + } | |
| 70 | + | |
| 66 | 71 | } | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java
| ... | ... | @@ -9,11 +9,14 @@ public class UserSimpleBaseVO { |
| 9 | 9 | |
| 10 | 10 | @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 11 | 11 | private Long id; |
| 12 | - | |
| 13 | 12 | @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") |
| 14 | 13 | private String nickname; |
| 15 | - | |
| 16 | 14 | @Schema(description = "用户头像", example = "https://www.iocoder.cn/1.png") |
| 17 | 15 | private String avatar; |
| 18 | 16 | |
| 17 | + @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | |
| 18 | + private Long deptId; | |
| 19 | + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部") | |
| 20 | + private String deptName; | |
| 21 | + | |
| 19 | 22 | } |
| 20 | 23 | \ No newline at end of file | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
| ... | ... | @@ -30,7 +30,6 @@ public class BpmSimpleModelNodeVO { |
| 30 | 30 | @Schema(description = "模型节点名称", example = "领导审批") |
| 31 | 31 | private String name; |
| 32 | 32 | |
| 33 | - // TODO @jason：和 gpt 大模型对了下这个字段的命名，貌似叫 displayText 合适点。可以等最后我们全局替换下。（优先级：低） | |
| 34 | 33 | @Schema(description = "节点展示内容", example = "指定成员: 芋道源码") |
| 35 | 34 | private String showText; |
| 36 | 35 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.http
| ... | ... | @@ -7,7 +7,10 @@ Authorization: Bearer {{token}} |
| 7 | 7 | ### 请求 /bpm/process-instance/get-bpmn 接口 => 失败 |
| 8 | 8 | #GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=1d5fb5a6-85f8-11ef-b717-7e93075f94e3 |
| 9 | 9 | #GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=3ee5c5ba-904a-11ef-a76e-b2ed5d6ef911 |
| 10 | -GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=f630dfa2-8f92-11ef-947c-ba5e239a6eb4 | |
| 10 | +#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=f630dfa2-8f92-11ef-947c-ba5e239a6eb4 | |
| 11 | +#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=9de8bdbf-9133-11ef-ae97-eaf49df1f932 | |
| 12 | +#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=dd2188eb-9394-11ef-a039-7a9ac3d9eb6b | |
| 13 | +GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processDefinitionId=test-auto:1:c70a799a-9394-11ef-a039-7a9ac3d9eb6b | |
| 11 | 14 | Content-Type: application/json |
| 12 | 15 | tenant-id: 1 |
| 13 | 16 | Authorization: Bearer {{token}} |
| 14 | 17 | \ No newline at end of file | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java
| ... | ... | @@ -6,15 +6,20 @@ import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | 6 | import jakarta.validation.constraints.AssertTrue; |
| 7 | 7 | import lombok.Data; |
| 8 | 8 | |
| 9 | +import java.util.Map; | |
| 10 | + | |
| 9 | 11 | @Schema(description = "管理后台 - 审批详情 Request VO") |
| 10 | 12 | @Data |
| 11 | 13 | public class BpmApprovalDetailReqVO { |
| 12 | 14 | |
| 13 | 15 | @Schema(description = "流程定义的编号", example = "1024") |
| 14 | - private String processDefinitionId; // 发起流程的时候传流程定义 ID | |
| 16 | + private String processDefinitionId; // 使用场景：发起流程时，传流程定义 ID | |
| 17 | + | |
| 18 | + @Schema(description = "流程变量") | |
| 19 | + private Map<String, Object> processVariables; // 使用场景：同 processDefinitionId，用于流程预测 | |
| 15 | 20 | |
| 16 | 21 | @Schema(description = "流程实例的编号", example = "1024") |
| 17 | - private String processInstanceId; // 流程已发起时候传流程实例 ID | |
| 22 | + private String processInstanceId; // 使用场景：流程已发起时候传流程实例 ID | |
| 18 | 23 | |
| 19 | 24 | // TODO @芋艿：如果未来 BPMN 增加流程图，它没有发起人节点，会有问题。 |
| 20 | 25 | @Schema(description = "流程活动编号", example = "StartUserNode") | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailRespVO.java
| ... | ... | @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; |
| 3 | 3 | import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; |
| 4 | 4 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; |
| 5 | 5 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; |
| 6 | +import com.fasterxml.jackson.annotation.JsonIgnore; | |
| 6 | 7 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | 8 | import lombok.Data; |
| 8 | 9 | |
| ... | ... | @@ -18,8 +19,8 @@ public class BpmApprovalDetailRespVO { |
| 18 | 19 | @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 19 | 20 | private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举 |
| 20 | 21 | |
| 21 | - @Schema(description = "审批信息列表", requiredMode = Schema.RequiredMode.REQUIRED) | |
| 22 | - private List<ApprovalNodeInfo> approveNodes; | |
| 22 | + @Schema(description = "活动节点列表", requiredMode = Schema.RequiredMode.REQUIRED) | |
| 23 | + private List<ActivityNode> activityNodes; | |
| 23 | 24 | |
| 24 | 25 | @Schema(description = "表单字段权限") |
| 25 | 26 | private Map<String, String> formFieldsPermission; |
| ... | ... | @@ -37,9 +38,9 @@ public class BpmApprovalDetailRespVO { |
| 37 | 38 | */ |
| 38 | 39 | private BpmProcessInstanceRespVO processInstance; |
| 39 | 40 | |
| 40 | - @Schema(description = "审批节点信息") | |
| 41 | + @Schema(description = "活动节点信息") | |
| 41 | 42 | @Data |
| 42 | - public static class ApprovalNodeInfo { | |
| 43 | + public static class ActivityNode { | |
| 43 | 44 | |
| 44 | 45 | @Schema(description = "节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartUserNode") |
| 45 | 46 | private String id; |
| ... | ... | @@ -59,23 +60,35 @@ public class BpmApprovalDetailRespVO { |
| 59 | 60 | private LocalDateTime endTime; |
| 60 | 61 | |
| 61 | 62 | @Schema(description = "审批节点的任务信息") |
| 62 | - private List<ApprovalTaskInfo> tasks; | |
| 63 | + private List<ActivityNodeTask> tasks; | |
| 64 | + | |
| 65 | + @Schema(description = "候选人用户 ID 列表", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1818") | |
| 66 | + @JsonIgnore // 不返回，只是方便后续读取，赋值给 candidateUsers | |
| 67 | + private List<Long> candidateUserIds; | |
| 63 | 68 | |
| 64 | 69 | @Schema(description = "候选人用户列表") |
| 65 | - private List<UserSimpleBaseVO> candidateUsers; // 用于未运行任务节点 | |
| 70 | + private List<UserSimpleBaseVO> candidateUsers; // 只包含未生成 ApprovalTaskInfo 的用户列表 | |
| 66 | 71 | |
| 67 | 72 | } |
| 68 | 73 | |
| 69 | - @Schema(description = "审批任务信息") | |
| 74 | + @Schema(description = "活动节点的任务信息") | |
| 70 | 75 | @Data |
| 71 | - public static class ApprovalTaskInfo { | |
| 76 | + public static class ActivityNodeTask { | |
| 72 | 77 | |
| 73 | 78 | @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 74 | 79 | private String id; |
| 75 | 80 | |
| 81 | + @Schema(description = "任务所属人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1818") | |
| 82 | + @JsonIgnore // 不返回，只是方便后续读取，赋值给 ownerUser | |
| 83 | + private Long owner; | |
| 84 | + | |
| 76 | 85 | @Schema(description = "任务所属人", example = "1024") |
| 77 | 86 | private UserSimpleBaseVO ownerUser; |
| 78 | 87 | |
| 88 | + @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048") | |
| 89 | + @JsonIgnore // 不返回，只是方便后续读取，赋值给 assigneeUser | |
| 90 | + private Long assignee; | |
| 91 | + | |
| 79 | 92 | @Schema(description = "任务分配人", example = "2048") |
| 80 | 93 | private UserSimpleBaseVO assigneeUser; |
| 81 | 94 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
| 1 | 1 | package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; |
| 2 | 2 | |
| 3 | +import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; | |
| 3 | 4 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; |
| 4 | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | 6 | import lombok.Data; |
| ... | ... | @@ -44,7 +45,7 @@ public class BpmProcessInstanceRespVO { |
| 44 | 45 | /** |
| 45 | 46 | * 发起流程的用户 |
| 46 | 47 | */ |
| 47 | - private User startUser; | |
| 48 | + private UserSimpleBaseVO startUser; | |
| 48 | 49 | |
| 49 | 50 | @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048") |
| 50 | 51 | private String processDefinitionId; |
| ... | ... | @@ -58,24 +59,6 @@ public class BpmProcessInstanceRespVO { |
| 58 | 59 | */ |
| 59 | 60 | private List<Task> tasks; // 仅在流程实例分页才返回 |
| 60 | 61 | |
| 61 | - @Schema(description = "用户信息") | |
| 62 | - @Data | |
| 63 | - public static class User { | |
| 64 | - | |
| 65 | - @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | |
| 66 | - private Long id; | |
| 67 | - @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") | |
| 68 | - private String nickname; | |
| 69 | - @Schema(description = "用户头像", example = "https://www.iocoder.cn/1.png") | |
| 70 | - private String avatar; | |
| 71 | - | |
| 72 | - @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | |
| 73 | - private Long deptId; | |
| 74 | - @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部") | |
| 75 | - private String deptName; | |
| 76 | - | |
| 77 | - } | |
| 78 | - | |
| 79 | 62 | @Schema(description = "流程任务") |
| 80 | 63 | @Data |
| 81 | 64 | public static class Task { | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
| 1 | 1 | package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO; | |
| 3 | +import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; | |
| 4 | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | 5 | import lombok.Data; |
| 6 | 6 | |
| ... | ... | @@ -36,11 +36,11 @@ public class BpmTaskRespVO { |
| 36 | 36 | /** |
| 37 | 37 | * 负责人的用户信息 |
| 38 | 38 | */ |
| 39 | - private BpmProcessInstanceRespVO.User ownerUser; | |
| 39 | + private UserSimpleBaseVO ownerUser; | |
| 40 | 40 | /** |
| 41 | 41 | * 审核的用户信息 |
| 42 | 42 | */ |
| 43 | - private BpmProcessInstanceRespVO.User assigneeUser; | |
| 43 | + private UserSimpleBaseVO assigneeUser; | |
| 44 | 44 | |
| 45 | 45 | @Schema(description = "任务定义的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "Activity_one") |
| 46 | 46 | private String taskDefinitionKey; |
| ... | ... | @@ -55,7 +55,7 @@ public class BpmTaskRespVO { |
| 55 | 55 | @Schema(description = "父任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 56 | 56 | private String parentTaskId; |
| 57 | 57 | @Schema(description = "子任务列表（由加签生成）", requiredMode = Schema.RequiredMode.REQUIRED, example = "childrenTask") |
| 58 | - private List<BpmTaskRespVO> children; | |
| 58 | + private List<BpmTaskRespVO> children; // 由加签生成，包含多层子任务 | |
| 59 | 59 | |
| 60 | 60 | @Schema(description = "表单编号", example = "1024") |
| 61 | 61 | private Long formId; |
| ... | ... | @@ -89,7 +89,7 @@ public class BpmTaskRespVO { |
| 89 | 89 | /** |
| 90 | 90 | * 发起人的用户信息 |
| 91 | 91 | */ |
| 92 | - private BpmProcessInstanceRespVO.User startUser; | |
| 92 | + private UserSimpleBaseVO startUser; | |
| 93 | 93 | |
| 94 | 94 | } |
| 95 | 95 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
| 1 | 1 | package cn.iocoder.yudao.module.bpm.convert.task; |
| 2 | 2 | |
| 3 | +import cn.hutool.core.collection.CollUtil; | |
| 3 | 4 | import cn.hutool.core.util.StrUtil; |
| 4 | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 6 | import cn.iocoder.yudao.framework.common.util.collection.MapUtils; |
| 7 | +import cn.iocoder.yudao.framework.common.util.collection.SetUtils; | |
| 6 | 8 | import cn.iocoder.yudao.framework.common.util.number.NumberUtils; |
| 7 | 9 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 8 | 10 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; |
| 11 | +import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; | |
| 9 | 12 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; |
| 13 | +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO; | |
| 10 | 14 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceBpmnModelViewRespVO; |
| 11 | 15 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO; |
| 12 | 16 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; |
| 17 | +import cn.iocoder.yudao.module.bpm.convert.definition.BpmProcessDefinitionConvert; | |
| 13 | 18 | import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO; |
| 14 | 19 | import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO; |
| 15 | 20 | import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEvent; |
| 21 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.BpmTaskCandidateStartUserSelectStrategy; | |
| 16 | 22 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; |
| 17 | 23 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; |
| 18 | 24 | import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; |
| ... | ... | @@ -20,6 +26,7 @@ import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcess |
| 20 | 26 | import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; |
| 21 | 27 | import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; |
| 22 | 28 | import org.flowable.bpmn.model.BpmnModel; |
| 29 | +import org.flowable.bpmn.model.UserTask; | |
| 23 | 30 | import org.flowable.engine.history.HistoricProcessInstance; |
| 24 | 31 | import org.flowable.engine.repository.ProcessDefinition; |
| 25 | 32 | import org.flowable.engine.runtime.ProcessInstance; |
| ... | ... | @@ -30,11 +37,13 @@ import org.mapstruct.Mapping; |
| 30 | 37 | import org.mapstruct.MappingTarget; |
| 31 | 38 | import org.mapstruct.factory.Mappers; |
| 32 | 39 | |
| 40 | +import java.util.HashSet; | |
| 33 | 41 | import java.util.List; |
| 34 | 42 | import java.util.Map; |
| 35 | 43 | import java.util.Set; |
| 36 | 44 | |
| 37 | 45 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; |
| 46 | +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; | |
| 38 | 47 | |
| 39 | 48 | /** |
| 40 | 49 | * 流程实例 Convert |
| ... | ... | @@ -65,7 +74,7 @@ public interface BpmProcessInstanceConvert { |
| 65 | 74 | if (userMap != null) { |
| 66 | 75 | AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(pageResult.getList().get(i).getStartUserId())); |
| 67 | 76 | if (startUser != null) { |
| 68 | - respVO.setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class)); | |
| 77 | + respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class)); | |
| 69 | 78 | MapUtils.findAndThen(deptMap, startUser.getDeptId(), dept -> respVO.getStartUser().setDeptName(dept.getName())); |
| 70 | 79 | } |
| 71 | 80 | } |
| ... | ... | @@ -75,7 +84,7 @@ public interface BpmProcessInstanceConvert { |
| 75 | 84 | |
| 76 | 85 | default BpmProcessInstanceRespVO buildProcessInstance(HistoricProcessInstance processInstance, |
| 77 | 86 | ProcessDefinition processDefinition, |
| 78 | - BpmProcessDefinitionInfoDO processDefinitionExt, | |
| 87 | + BpmProcessDefinitionInfoDO processDefinitionInfo, | |
| 79 | 88 | AdminUserRespDTO startUser, |
| 80 | 89 | DeptRespDTO dept) { |
| 81 | 90 | BpmProcessInstanceRespVO respVO = BeanUtils.toBean(processInstance, BpmProcessInstanceRespVO.class); |
| ... | ... | @@ -83,10 +92,10 @@ public interface BpmProcessInstanceConvert { |
| 83 | 92 | respVO.setFormVariables(FlowableUtils.getProcessInstanceFormVariable(processInstance)); |
| 84 | 93 | // definition |
| 85 | 94 | respVO.setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class)); |
| 86 | - copyTo(processDefinitionExt, respVO.getProcessDefinition()); | |
| 95 | + copyTo(processDefinitionInfo, respVO.getProcessDefinition()); | |
| 87 | 96 | // user |
| 88 | 97 | if (startUser != null) { |
| 89 | - respVO.setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class)); | |
| 98 | + respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class)); | |
| 90 | 99 | if (dept != null) { |
| 91 | 100 | respVO.getStartUser().setDeptName(dept.getName()); |
| 92 | 101 | } |
| ... | ... | @@ -146,17 +155,27 @@ public interface BpmProcessInstanceConvert { |
| 146 | 155 | return respVO; |
| 147 | 156 | } |
| 148 | 157 | |
| 149 | - default BpmProcessInstanceRespVO.User buildUser(String userId, | |
| 158 | + default UserSimpleBaseVO buildUser(String userIdStr, | |
| 159 | + Map<Long, AdminUserRespDTO> userMap, | |
| 160 | + Map<Long, DeptRespDTO> deptMap) { | |
| 161 | + if (StrUtil.isEmpty(userIdStr)) { | |
| 162 | + return null; | |
| 163 | + } | |
| 164 | + Long userId = NumberUtils.parseLong(userIdStr); | |
| 165 | + return buildUser(userId, userMap, deptMap); | |
| 166 | + } | |
| 167 | + | |
| 168 | + default UserSimpleBaseVO buildUser(Long userId, | |
| 150 | 169 | Map<Long, AdminUserRespDTO> userMap, |
| 151 | 170 | Map<Long, DeptRespDTO> deptMap) { |
| 152 | - if (StrUtil.isBlank(userId)) { | |
| 171 | + if (userId == null) { | |
| 153 | 172 | return null; |
| 154 | 173 | } |
| 155 | - AdminUserRespDTO user = userMap.get(NumberUtils.parseLong(userId)); | |
| 174 | + AdminUserRespDTO user = userMap.get(userId); | |
| 156 | 175 | if (user == null) { |
| 157 | 176 | return null; |
| 158 | 177 | } |
| 159 | - BpmProcessInstanceRespVO.User userVO = BeanUtils.toBean(user, BpmProcessInstanceRespVO.User.class); | |
| 178 | + UserSimpleBaseVO userVO = BeanUtils.toBean(user, UserSimpleBaseVO.class); | |
| 160 | 179 | DeptRespDTO dept = user.getDeptId() != null ? deptMap.get(user.getDeptId()) : null; |
| 161 | 180 | if (dept != null) { |
| 162 | 181 | userVO.setDeptName(dept.getName()); |
| ... | ... | @@ -164,4 +183,79 @@ public interface BpmProcessInstanceConvert { |
| 164 | 183 | return userVO; |
| 165 | 184 | } |
| 166 | 185 | |
| 186 | + default BpmApprovalDetailRespVO.ActivityNodeTask buildApprovalTaskInfo(HistoricTaskInstance task) { | |
| 187 | + if (task == null) { | |
| 188 | + return null; | |
| 189 | + } | |
| 190 | + return BeanUtils.toBean(task, BpmApprovalDetailRespVO.ActivityNodeTask.class) | |
| 191 | + .setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task)); | |
| 192 | + } | |
| 193 | + | |
| 194 | + default Set<Long> parseUserIds(HistoricProcessInstance processInstance, | |
| 195 | + List<BpmApprovalDetailRespVO.ActivityNode> activityNodes) { | |
| 196 | + Set<Long> userIds = new HashSet<>(); | |
| 197 | + if (processInstance != null) { | |
| 198 | + userIds.add(NumberUtils.parseLong(processInstance.getStartUserId())); | |
| 199 | + } | |
| 200 | + for (BpmApprovalDetailRespVO.ActivityNode activityNode : activityNodes) { | |
| 201 | + CollUtil.addAll(userIds, convertSet(activityNode.getTasks(), BpmApprovalDetailRespVO.ActivityNodeTask::getAssignee)); | |
| 202 | + CollUtil.addAll(userIds, convertSet(activityNode.getTasks(), BpmApprovalDetailRespVO.ActivityNodeTask::getOwner)); | |
| 203 | + CollUtil.addAll(userIds, activityNode.getCandidateUserIds()); | |
| 204 | + } | |
| 205 | + return userIds; | |
| 206 | + } | |
| 207 | + | |
| 208 | + default Set<Long> parseUserIds02(HistoricProcessInstance processInstance, | |
| 209 | + List<HistoricTaskInstance> tasks) { | |
| 210 | + Set<Long> userIds = SetUtils.asSet(Long.valueOf(processInstance.getStartUserId())); | |
| 211 | + tasks.forEach(task -> { | |
| 212 | + CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getAssignee()))); | |
| 213 | + CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getOwner()))); | |
| 214 | + }); | |
| 215 | + return userIds; | |
| 216 | + } | |
| 217 | + | |
| 218 | + default BpmApprovalDetailRespVO buildApprovalDetail(BpmnModel bpmnModel, | |
| 219 | + ProcessDefinition processDefinition, | |
| 220 | + BpmProcessDefinitionInfoDO processDefinitionInfo, | |
| 221 | + HistoricProcessInstance processInstance, | |
| 222 | + Integer processInstanceStatus, | |
| 223 | + List<BpmApprovalDetailRespVO.ActivityNode> activityNodes, | |
| 224 | + BpmTaskRespVO todoTask, | |
| 225 | + Map<String, String> formFieldsPermission, | |
| 226 | + Map<Long, AdminUserRespDTO> userMap, | |
| 227 | + Map<Long, DeptRespDTO> deptMap) { | |
| 228 | + // 1. 流程实例 | |
| 229 | + BpmProcessInstanceRespVO processInstanceResp = null; | |
| 230 | + if (processInstance != null) { | |
| 231 | + AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId())); | |
| 232 | + DeptRespDTO dept = startUser != null ? deptMap.get(startUser.getDeptId()) : null; | |
| 233 | + processInstanceResp = buildProcessInstance(processInstance, null, null, startUser, dept); | |
| 234 | + } | |
| 235 | + | |
| 236 | + // 2. 流程定义 | |
| 237 | + List<UserTask> userTaskList = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectUserTaskList(bpmnModel); | |
| 238 | + BpmProcessDefinitionRespVO definitionResp = BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinition( | |
| 239 | + processDefinition, null, processDefinitionInfo, null, null, bpmnModel, userTaskList); | |
| 240 | + | |
| 241 | + // 3. 流程节点 | |
| 242 | + activityNodes.forEach(approveNode -> { | |
| 243 | + if (approveNode.getTasks() != null) { | |
| 244 | + approveNode.getTasks().forEach(task -> { | |
| 245 | + task.setAssigneeUser(buildUser(task.getAssignee(), userMap, deptMap)); | |
| 246 | + task.setOwnerUser(buildUser(task.getOwner(), userMap, deptMap)); | |
| 247 | + }); | |
| 248 | + } | |
| 249 | + approveNode.setCandidateUsers(convertList(approveNode.getCandidateUserIds(), userId -> buildUser(userId, userMap, deptMap))); | |
| 250 | + }); | |
| 251 | + | |
| 252 | + // 4. 拼接起来 | |
| 253 | + return new BpmApprovalDetailRespVO().setStatus(processInstanceStatus) | |
| 254 | + .setProcessDefinition(definitionResp) | |
| 255 | + .setProcessInstance(processInstanceResp) | |
| 256 | + .setFormFieldsPermission(formFieldsPermission) | |
| 257 | + .setTodoTask(todoTask) | |
| 258 | + .setActivityNodes(activityNodes); | |
| 259 | + } | |
| 260 | + | |
| 167 | 261 | } | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
| ... | ... | @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; |
| 7 | 7 | import cn.iocoder.yudao.framework.common.util.number.NumberUtils; |
| 8 | 8 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 9 | -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO; | |
| 9 | +import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; | |
| 10 | 10 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; |
| 11 | 11 | import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; |
| 12 | 12 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; |
| ... | ... | @@ -30,7 +30,6 @@ import java.util.Map; |
| 30 | 30 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; |
| 31 | 31 | import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen; |
| 32 | 32 | import static cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils.isAddSignUserTask; |
| 33 | -import static cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils.isAssignUserTask; | |
| 34 | 33 | |
| 35 | 34 | /** |
| 36 | 35 | * Bpm 任务 Convert |
| ... | ... | @@ -52,7 +51,7 @@ public interface BpmTaskConvert { |
| 52 | 51 | } |
| 53 | 52 | taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class)); |
| 54 | 53 | AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId())); |
| 55 | - taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class)); | |
| 54 | + taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class)); | |
| 56 | 55 | }); |
| 57 | 56 | } |
| 58 | 57 | |
| ... | ... | @@ -66,7 +65,7 @@ public interface BpmTaskConvert { |
| 66 | 65 | // 用户信息 |
| 67 | 66 | AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee())); |
| 68 | 67 | if (assignUser != null) { |
| 69 | - taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class)); | |
| 68 | + taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class)); | |
| 70 | 69 | findAndThen(deptMap, assignUser.getDeptId(), dept -> taskVO.getAssigneeUser().setDeptName(dept.getName())); |
| 71 | 70 | } |
| 72 | 71 | // 流程实例 |
| ... | ... | @@ -74,7 +73,7 @@ public interface BpmTaskConvert { |
| 74 | 73 | if (processInstance != null) { |
| 75 | 74 | AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId())); |
| 76 | 75 | taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class)); |
| 77 | - taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class)); | |
| 76 | + taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class)); | |
| 78 | 77 | } |
| 79 | 78 | return taskVO; |
| 80 | 79 | }); |
| ... | ... | @@ -93,7 +92,7 @@ public interface BpmTaskConvert { |
| 93 | 92 | // 流程实例 |
| 94 | 93 | AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId())); |
| 95 | 94 | taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class)); |
| 96 | - taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class)); | |
| 95 | + taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class)); | |
| 97 | 96 | // 表单信息 |
| 98 | 97 | BpmFormDO form = MapUtil.get(formMap, NumberUtils.parseLong(task.getFormKey()), BpmFormDO.class); |
| 99 | 98 | if (form != null) { |
| ... | ... | @@ -113,7 +112,7 @@ public interface BpmTaskConvert { |
| 113 | 112 | return convertList(taskList, task -> BeanUtils.toBean(task, BpmTaskRespVO.class, taskVO -> { |
| 114 | 113 | AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee())); |
| 115 | 114 | if (assignUser != null) { |
| 116 | - taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class)); | |
| 115 | + taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class)); | |
| 117 | 116 | DeptRespDTO dept = deptMap.get(assignUser.getDeptId()); |
| 118 | 117 | if (dept != null) { |
| 119 | 118 | taskVO.getAssigneeUser().setDeptName(dept.getName()); |
| ... | ... | @@ -121,7 +120,7 @@ public interface BpmTaskConvert { |
| 121 | 120 | } |
| 122 | 121 | AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(task.getOwner())); |
| 123 | 122 | if (ownerUser != null) { |
| 124 | - taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, BpmProcessInstanceRespVO.User.class)); | |
| 123 | + taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, UserSimpleBaseVO.class)); | |
| 125 | 124 | findAndThen(deptMap, ownerUser.getDeptId(), dept -> taskVO.getOwnerUser().setDeptName(dept.getName())); |
| 126 | 125 | } |
| 127 | 126 | })); |
| ... | ... | @@ -134,7 +133,8 @@ public interface BpmTaskConvert { |
| 134 | 133 | Map<Long, DeptRespDTO> deptMap) { |
| 135 | 134 | return convertList(todoTaskList, task -> { |
| 136 | 135 | // 找到分配给当前用户，或者当前用户加签的任务（为了减签） |
| 137 | - if (!isAssignUserTask(userId, task) && !isAddSignUserTask(userId, task, childrenTaskMap)) { | |
| 136 | + if (!FlowableUtils.isAssignUserTask(userId, task) | |
| 137 | + && !FlowableUtils.isAddSignUserTask(userId, task, childrenTaskMap)) { | |
| 138 | 138 | return null; |
| 139 | 139 | } |
| 140 | 140 | BpmTaskRespVO taskVO = BeanUtils.toBean(task, BpmTaskRespVO.class); |
| ... | ... | @@ -166,7 +166,7 @@ public interface BpmTaskConvert { |
| 166 | 166 | Map<Long, DeptRespDTO> deptMap) { |
| 167 | 167 | AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(taskOwner)); |
| 168 | 168 | if (ownerUser != null) { |
| 169 | - task.setOwnerUser(BeanUtils.toBean(ownerUser, BpmProcessInstanceRespVO.User.class)); | |
| 169 | + task.setOwnerUser(BeanUtils.toBean(ownerUser, UserSimpleBaseVO.class)); | |
| 170 | 170 | findAndThen(deptMap, ownerUser.getDeptId(), dept -> task.getOwnerUser().setDeptName(dept.getName())); |
| 171 | 171 | } |
| 172 | 172 | } |
| ... | ... | @@ -192,7 +192,7 @@ public interface BpmTaskConvert { |
| 192 | 192 | Map<Long, DeptRespDTO> deptMap) { |
| 193 | 193 | AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(taskAssignee)); |
| 194 | 194 | if (assignUser != null) { |
| 195 | - task.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class)); | |
| 195 | + task.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class)); | |
| 196 | 196 | findAndThen(deptMap, assignUser.getDeptId(), dept -> task.getAssigneeUser().setDeptName(dept.getName())); |
| 197 | 197 | } |
| 198 | 198 | } | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
| 1 | 1 | package cn.iocoder.yudao.module.bpm.dal.dataobject.definition; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler; | |
| 4 | 5 | import cn.iocoder.yudao.framework.mybatis.core.type.StringListTypeHandler; |
| 5 | 6 | import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; |
| 6 | 7 | import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum; |
| ... | ... | @@ -132,7 +133,7 @@ public class BpmProcessDefinitionInfoDO extends BaseDO { |
| 132 | 133 | * 1. {@link #visible} 只是决定是否可见。即使不可见，还是可以发起 |
| 133 | 134 | * 2. startUserIds 决定某个用户是否可以发起。如果该用户不可发起，则他也是不可见的 |
| 134 | 135 | */ |
| 135 | - @TableField(typeHandler = StringListTypeHandler.class) // 为了可以使用 find_in_set 进行过滤 | |
| 136 | + @TableField(typeHandler = LongListTypeHandler.class) // 为了可以使用 find_in_set 进行过滤 | |
| 136 | 137 | private List<Long> startUserIds; |
| 137 | 138 | |
| 138 | 139 | /** | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java
| ... | ... | @@ -104,10 +104,6 @@ public interface BpmnModelConstants { |
| 104 | 104 | * BPMN Start Event Node Id |
| 105 | 105 | */ |
| 106 | 106 | String START_EVENT_NODE_ID = "StartEvent"; |
| 107 | - /** | |
| 108 | - * BPMN Start Event Node Name | |
| 109 | - */ | |
| 110 | - String START_EVENT_NODE_NAME = "开始"; | |
| 111 | 107 | |
| 112 | 108 | /** |
| 113 | 109 | * 发起人节点 ID | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java
| ... | ... | @@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.bpm.enums.definition.BpmBoundaryEventType; |
| 8 | 8 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants; |
| 9 | 9 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; |
| 10 | 10 | import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService; |
| 11 | -import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService; | |
| 12 | 11 | import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService; |
| 13 | 12 | import com.google.common.collect.ImmutableSet; |
| 14 | 13 | import jakarta.annotation.Resource; |
| ... | ... | @@ -44,9 +43,6 @@ public class BpmTaskEventListener extends AbstractFlowableEngineEventListener { |
| 44 | 43 | @Resource |
| 45 | 44 | @Lazy // 解决循环依赖 |
| 46 | 45 | private BpmTaskService taskService; |
| 47 | - @Resource | |
| 48 | - @Lazy // 解决循环依赖 | |
| 49 | - private BpmActivityService activityService; | |
| 50 | 46 | |
| 51 | 47 | public static final Set<FlowableEngineEventType> TASK_EVENTS = ImmutableSet.<FlowableEngineEventType>builder() |
| 52 | 48 | .add(FlowableEngineEventType.TASK_CREATED) |
| ... | ... | @@ -72,7 +68,7 @@ public class BpmTaskEventListener extends AbstractFlowableEngineEventListener { |
| 72 | 68 | |
| 73 | 69 | @Override |
| 74 | 70 | protected void activityCancelled(FlowableActivityCancelledEvent event) { |
| 75 | - List<HistoricActivityInstance> activityList = activityService.getHistoricActivityListByExecutionId(event.getExecutionId()); | |
| 71 | + List<HistoricActivityInstance> activityList = taskService.getHistoricActivityListByExecutionId(event.getExecutionId()); | |
| 76 | 72 | if (CollUtil.isEmpty(activityList)) { |
| 77 | 73 | log.error("[activityCancelled][使用 executionId({}) 查找不到对应的活动实例]", event.getExecutionId()); |
| 78 | 74 | return; | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java
| ... | ... | @@ -99,15 +99,35 @@ public class FlowableUtils { |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
| 102 | + * 获得流程实例的审批原因 | |
| 103 | + * | |
| 104 | + * @param processInstance 流程实例 | |
| 105 | + * @return 审批原因 | |
| 106 | + */ | |
| 107 | + public static String getProcessInstanceReason(HistoricProcessInstance processInstance) { | |
| 108 | + return (String) processInstance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON); | |
| 109 | + } | |
| 110 | + | |
| 111 | + /** | |
| 112 | + * 获得流程实例的表单 | |
| 113 | + * | |
| 114 | + * @param processInstance 流程实例 | |
| 115 | + * @return 表单 | |
| 116 | + */ | |
| 117 | + public static Map<String, Object> getProcessInstanceFormVariable(ProcessInstance processInstance) { | |
| 118 | + Map<String, Object> processVariables = new HashMap<>(processInstance.getProcessVariables()); | |
| 119 | + return filterProcessInstanceFormVariable(processVariables); | |
| 120 | + } | |
| 121 | + | |
| 122 | + /** | |
| 102 | 123 | * 获得流程实例的表单 |
| 103 | 124 | * |
| 104 | 125 | * @param processInstance 流程实例 |
| 105 | 126 | * @return 表单 |
| 106 | 127 | */ |
| 107 | 128 | public static Map<String, Object> getProcessInstanceFormVariable(HistoricProcessInstance processInstance) { |
| 108 | - Map<String, Object> formVariables = new HashMap<>(processInstance.getProcessVariables()); | |
| 109 | - filterProcessInstanceFormVariable(formVariables); | |
| 110 | - return formVariables; | |
| 129 | + Map<String, Object> processVariables = new HashMap<>(processInstance.getProcessVariables()); | |
| 130 | + return filterProcessInstanceFormVariable(processVariables); | |
| 111 | 131 | } |
| 112 | 132 | |
| 113 | 133 | /** |
| ... | ... | @@ -191,7 +211,8 @@ public class FlowableUtils { |
| 191 | 211 | * @return 是否 |
| 192 | 212 | */ |
| 193 | 213 | public static boolean isAssignUserTask(Long userId, Task task) { |
| 194 | - return ObjectUtil.equal(userId, NumberUtil.parseLong(task.getAssignee(), null)); | |
| 214 | + Long assignee = NumberUtil.parseLong(task.getAssignee(), null); | |
| 215 | + return ObjectUtil.equal(userId, assignee); | |
| 195 | 216 | } |
| 196 | 217 | |
| 197 | 218 | /** |
| ... | ... | @@ -202,11 +223,13 @@ public class FlowableUtils { |
| 202 | 223 | * @return 是否 |
| 203 | 224 | */ |
| 204 | 225 | public static boolean isOwnerUserTask(Long userId, Task task) { |
| 205 | - return ObjectUtil.equal(userId, NumberUtil.parseLong(task.getOwner(), null)); | |
| 226 | + Long assignee = NumberUtil.parseLong(task.getAssignee(), null); | |
| 227 | + return ObjectUtil.equal(userId, assignee); | |
| 206 | 228 | } |
| 207 | 229 | |
| 208 | 230 | /** |
| 209 | 231 | * 判断指定用户，是否是当前任务的加签人 |
| 232 | + * | |
| 210 | 233 | * @param userId 用户 Id |
| 211 | 234 | * @param task 任务 |
| 212 | 235 | * @param childrenTaskMap 子任务集合 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
| ... | ... | @@ -82,7 +82,8 @@ public class SimpleModelUtils { |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | private static BpmSimpleModelNodeVO buildStartNode() { |
| 85 | - return new BpmSimpleModelNodeVO().setId(START_EVENT_NODE_ID).setName(START_EVENT_NODE_NAME) | |
| 85 | + return new BpmSimpleModelNodeVO().setId(START_EVENT_NODE_ID) | |
| 86 | + .setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) | |
| 86 | 87 | .setType(BpmSimpleModelNodeType.START_NODE.getType()); |
| 87 | 88 | } |
| 88 | 89 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java deleted
| 1 | -package cn.iocoder.yudao.module.bpm.service.task; | |
| 2 | - | |
| 3 | -import org.flowable.engine.history.HistoricActivityInstance; | |
| 4 | - | |
| 5 | -import java.util.List; | |
| 6 | - | |
| 7 | -/** | |
| 8 | - * BPM 活动实例 Service 接口 | |
| 9 | - * | |
| 10 | - * @author 芋道源码 | |
| 11 | - */ | |
| 12 | -public interface BpmActivityService { | |
| 13 | - | |
| 14 | - /** | |
| 15 | - * 获得指定流程实例的活动实例列表 | |
| 16 | - * | |
| 17 | - * @param processInstanceId 流程实例的编号 | |
| 18 | - * @return 活动实例列表 | |
| 19 | - */ | |
| 20 | - List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId); | |
| 21 | - | |
| 22 | - /** | |
| 23 | - * 获得执行编号对应的活动实例 | |
| 24 | - * | |
| 25 | - * @param executionId 执行编号 | |
| 26 | - * @return 活动实例 | |
| 27 | - */ | |
| 28 | - List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId); | |
| 29 | - | |
| 30 | -} |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java deleted
| 1 | -package cn.iocoder.yudao.module.bpm.service.task; | |
| 2 | - | |
| 3 | -import jakarta.annotation.Resource; | |
| 4 | -import lombok.extern.slf4j.Slf4j; | |
| 5 | -import org.flowable.engine.HistoryService; | |
| 6 | -import org.flowable.engine.history.HistoricActivityInstance; | |
| 7 | -import org.springframework.stereotype.Service; | |
| 8 | -import org.springframework.validation.annotation.Validated; | |
| 9 | - | |
| 10 | -import java.util.List; | |
| 11 | - | |
| 12 | -// TODO 芋艿：准备废弃 | |
| 13 | -/** | |
| 14 | - * BPM 活动实例 Service 实现类 | |
| 15 | - * | |
| 16 | - * @author 芋道源码 | |
| 17 | - */ | |
| 18 | -@Service | |
| 19 | -@Slf4j | |
| 20 | -@Validated | |
| 21 | -public class BpmActivityServiceImpl implements BpmActivityService { | |
| 22 | - | |
| 23 | - @Resource | |
| 24 | - private HistoryService historyService; | |
| 25 | - | |
| 26 | - @Override | |
| 27 | - public List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId) { | |
| 28 | - return historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId) | |
| 29 | - .orderByHistoricActivityInstanceStartTime().asc().list(); | |
| 30 | - } | |
| 31 | - | |
| 32 | - @Override | |
| 33 | - public List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId) { | |
| 34 | - return historyService.createHistoricActivityInstanceQuery().executionId(executionId).list(); | |
| 35 | - } | |
| 36 | - | |
| 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.NumberUtil; import cn.hutool.core.util.ObjectUtil; 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.collection.SetUtils; 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.number.NumberUtils; 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.base.user.UserSimpleBaseVO; import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ApprovalTaskInfo; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; import cn.iocoder.yudao.module.bpm.convert.definition.BpmProcessDefinitionConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO; import cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants; 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.enums.task.BpmTaskStatusEnum; 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.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.constants.BpmnXMLConstants; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.EndEvent; import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.UserTask; import org.flowable.engine.HistoryService; import org.flowable.engine.ManagementService; 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 java.util.stream.Stream; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ApprovalNodeInfo; import static cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert.INSTANCE; 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.*; import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum.START_USER; 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 ManagementService managementService; @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 DeptApi deptApi; @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.getProcessDefinitionKey())) { processInstanceQuery.processDefinitionKey(pageReqVO.getProcessDefinitionKey()); } 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); } private Map<String, String> getFormFieldsPermission(BpmnModel bpmnModel, String activityId, String taskId) { // 1. 获取流程活动编号。流程活动 Id 为空事，从流程任务中获取流程活动 Id if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(taskId)) { activityId = Optional.ofNullable(taskService.getHistoricTask(taskId)) .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null); } if (StrUtil.isEmpty(activityId)) { return null; } // 2. 从 BpmnModel 中解析表单字段权限 return BpmnModelUtils.parseFormFieldsPermission(bpmnModel, activityId); } @Override public BpmApprovalDetailRespVO getApprovalDetail(Long loginUserId, BpmApprovalDetailReqVO reqVO) { // 1. 设置流程未发起的值 // 1.1 流程状态 Integer processInstanceStatus = BpmProcessInstanceStatusEnum.NOT_START.getStatus(); // 流程未发起的状态 // 1.2 流程定义 Id String processDefinitionId = reqVO.getProcessDefinitionId(); // 流程未发起前端传入 // 1.3. 流程实例 BpmProcessInstanceRespVO processInstanceResp = null; // 流程未发起时为 null // 1.4 以下是用于流程预测的值 Long startUserId = loginUserId; // 流程发起人。流程未发起时,发起人设置成登录人 ProcessInstance runProcessInstance = null; // 正在运行的流程实例,流程未发起时为 null Set<String> runNodeIds = new HashSet<>(); // 已经运行的节点 Ids (BPMN XML 节点 Id) Map<String, ApprovalNodeInfo> runningApprovalNodes = new HashMap<>(); // 正在运行的节点的审批信息 List<ApprovalNodeInfo> approvalNodes = new ArrayList<>(); // 审批节点的信息。流程未发起时为空 // 2 设置流程已发起的值 if (reqVO.getProcessInstanceId() != null) { // 2.1 流程状态 HistoricProcessInstance processInstance = getHistoricProcessInstance(reqVO.getProcessInstanceId()); if (processInstance == null) { throw exception(ErrorCodeConstants.PROCESS_INSTANCE_NOT_EXISTS); } processInstanceStatus = FlowableUtils.getProcessInstanceStatus(processInstance); // 2.2 流程定义 Id processDefinitionId = processInstance.getProcessDefinitionId(); // 2.3 流程实例 AdminUserRespDTO startUser = adminUserApi.getUser(NumberUtils.parseLong(processInstance.getStartUserId())); DeptRespDTO dept = null; if (startUser != null && startUser.getDeptId() != null) { dept = deptApi.getDept(startUser.getDeptId()); } processInstanceResp = INSTANCE.buildProcessInstance(processInstance, null, null, startUser, dept); // 2.4 以下是用于流程预测的值 startUserId = Long.valueOf(processInstance.getStartUserId()); // 流程发起人 runProcessInstance = getProcessInstance(processInstance.getId()); // 正在运行的流程实例 List<HistoricActivityInstance> historicActivityList = activityService.getActivityListByProcessInstanceId(processInstance.getId()); AlreadyRunApproveNodeRespBO respBO = buildAlreadyRunApproveNodes(processInstance.getId(), processInstanceStatus, historicActivityList); runNodeIds = respBO.getRunNodeIds(); // 已经运行的节点 ID 数组 approvalNodes = respBO.getApproveNodes(); // // 获取已运行节点的审批的信息 runningApprovalNodes = respBO.getRunningApprovalNodes(); // 正在运行的节点的审批信息 } // 3. 流程定义 ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition(processDefinitionId); BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinitionId); BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinitionId); // TODO 芋艿：这里仅仅用于临时测试，后续要清理 if (false && processInstanceResp != null) { ProcessInstance processInstance = getProcessInstance(processInstanceResp.getId()); List<FlowElement> flowElements = BpmnModelUtils.simulateProcess(bpmnModel, processInstance.getProcessVariables()); System.out.println(flowElements); } if (false && processInstanceResp != null) { BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); ProcessInstance processInstance = getProcessInstance(processInstanceResp.getId()); List<BpmSimpleModelNodeVO> flowElements = SimpleModelUtils.simulateProcess(simpleModel, processInstance.getProcessVariables()); System.out.println(flowElements); } List<UserTask> userTaskList = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectUserTaskList(bpmnModel); BpmProcessDefinitionRespVO definitionResp = BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinition( processDefinition, null, processDefinitionInfo, null, null, bpmnModel, userTaskList ); // 4. 表单权限 Map<String, String> formFieldsPermission = getFormFieldsPermission(bpmnModel, reqVO.getActivityId(), reqVO.getTaskId()); // 5 .登录用户的待办任务 // TODO @jason：有一个极端情况，如果一个用户有 2 个 task A 和 B，A 已经通过，B 需要审核。这个时，通过 A 进来，todo 拿到 B，会不会表单权限不一致哈。 // 目前的想法，是不是不依赖前端传递参数。而是后端推导，按照一个顺序。待审批 》 taskId/activityId BpmTaskRespVO todoTask = taskService.getFirstTodoTask(loginUserId, reqVO.getProcessInstanceId()); // 流程已经结束，直接 return，无需预测 if (BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)) { return new BpmApprovalDetailRespVO().setStatus(processInstanceStatus) .setProcessDefinition(definitionResp).setProcessInstance(processInstanceResp) .setFormFieldsPermission(formFieldsPermission) .setTodoTask(todoTask).setApproveNodes(approvalNodes); } // 6，预测未运行节点的审批信息。需要区分 BPMN 设计器 和 SIMPLE 设计器 // 6.1 情况一：仿钉钉流程设计器 if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) { BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); List<ApprovalNodeInfo> notRunApproveNodes = new ArrayList<>(); traverseSimpleModelNodeToBuildNotRunApproveNodes( startUserId, runProcessInstance, simpleModel, runNodeIds, runningApprovalNodes, notRunApproveNodes); approvalNodes.addAll(notRunApproveNodes); // 6.2 情况二：BPMN 流程设计器 } else if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) { // TODO 芋艿：需要把 start 节点加出来 // TODO Bpmn 设计器，构建未运行节点的审批信息；未完全实现 List<ApprovalNodeInfo> notRunApproveNodes = new ArrayList<>(); traverseSimpleModelNodeToBuildNotRunApproveNodes(startUserId, runProcessInstance, bpmnModel, runNodeIds, runningApprovalNodes, notRunApproveNodes); approvalNodes.addAll(notRunApproveNodes); } return new BpmApprovalDetailRespVO().setStatus(processInstanceStatus) .setProcessDefinition(definitionResp).setProcessInstance(processInstanceResp) .setFormFieldsPermission(formFieldsPermission) .setTodoTask(todoTask).setApproveNodes(approvalNodes); } /** * 遍历 SIMPLE 设计器模型 构建未运行节点的审批信息 * * @param startUserId 流程发起人编号 * @param processInstance 流程实例 * @param simpleModelNode SIMPLE 设计器模型 * @param runNodeIds 已经运行节点的 Ids * @param runningApprovalNodes 正在运行的节点的审批信息 * @param approveNodeList 未运行节点的审批信息列表 */ private void traverseSimpleModelNodeToBuildNotRunApproveNodes(Long startUserId, ProcessInstance processInstance, BpmSimpleModelNodeVO simpleModelNode, Set<String> runNodeIds, Map<String, ApprovalNodeInfo> runningApprovalNodes, List<ApprovalNodeInfo> approveNodeList) { List<BpmSimpleModelNodeVO> nodeElements = SimpleModelUtils.simulateProcess(simpleModelNode, processInstance.getProcessVariables()); if (CollUtil.isEmpty(nodeElements)) { return; } for (BpmSimpleModelNodeVO nodeElement : nodeElements) { buildNotRunApproveNodes(startUserId, processInstance, nodeElement, runNodeIds, runningApprovalNodes, approveNodeList); } } private void buildNotRunApproveNodes(Long startUserId, ProcessInstance processInstance, BpmSimpleModelNodeVO node, Set<String> runNodeIds, Map<String, ApprovalNodeInfo> runningApprovalNodes, List<ApprovalNodeInfo> approveNodeList) { // 情况一：节点未运行：需要进行预测 if (!runNodeIds.contains(node.getId())) { // 1. 对需要人工审批的审批节点，进行预测 if (APPROVE_NODE.getType().equals(node.getType()) && USER.getType().equals(node.getApproveType()) // TODO jason：非 USER 审批，也要展示哈。 || START_USER_NODE.getType().equals(node.getType())) { ApprovalNodeInfo approvalNodeInfo = new ApprovalNodeInfo().setNodeType(node.getType()) .setName(node.getName()).setStatus(NOT_START.getStatus()); Integer candidateStrategy = START_USER_NODE.getType().equals(node.getType()) ? START_USER.getStrategy() : node.getCandidateStrategy(); approvalNodeInfo.setCandidateUsers( getNotRunTaskCandidateUserList(startUserId, processInstance, node.getId(), candidateStrategy, node.getCandidateParam())); approveNodeList.add(approvalNodeInfo); // 2. 结束节点 } else if (END_NODE.getType().equals(node.getType())) { approveNodeList.add(new ApprovalNodeInfo().setNodeType(node.getType()) .setName(node.getName()).setStatus(NOT_START.getStatus())); } } else { // 情况二：节点已经运行 if (SimpleModelUtils.isSequentialApproveNode(node) && runningApprovalNodes.containsKey(node.getId())) { ApprovalNodeInfo approvalNodeInfo = runningApprovalNodes.get(node.getId()); List<UserSimpleBaseVO> candidateUserList = getNotRunTaskCandidateUserList( startUserId, processInstance, node.getId(), node.getCandidateStrategy(), node.getCandidateParam()); // TODO @jason：这里的逻辑，可能可以简化成，直接拿已经审批过的人的 userId 集合，从 candidateUserList remove 下。一方面简单一点，方面 calculateUsers 返回的是 set，目前不是很有序。 // TODO @芋艿 已经审批过的人的 userId 集合。不知道如何获取，不知道有啥好方法没。 如果取这个节点已经完成的审批任务。 是不是有可能包含退回的情况。就不太对了。 另外 candidateUserList 是按返回 set 遍历顺序返回的。和 set 的顺序是一致的。就不会有问题了 ApprovalTaskInfo approvalTaskInfo = CollUtil.getFirst(approvalNodeInfo.getTasks()); Long currentAssignedUserId = null; if (approvalTaskInfo != null && approvalTaskInfo.getAssigneeUser() != null) { currentAssignedUserId = approvalTaskInfo.getAssigneeUser().getId(); } // 找到当前审批人在候选人列表的位置 int index = 0; for (UserSimpleBaseVO user : candidateUserList) { if (user.getId().equals(currentAssignedUserId)) { break; } index++; } // 截取当前审批人位置后面的候选人, 不包含当前审批人 approvalNodeInfo.setCandidateUsers(CollUtil.sub(candidateUserList, ++index, candidateUserList.size())); } } } /** * 遍历 BPMN 设计器模型 构建未运行节点的审批信息 * * @param processInstance 流程实例 * @param bpmnModel BPMN 设计器模型 * @param runNodeIds 已经运行节点的 Ids * @param runningApprovalNodes 正在运行的节点的审批信息 * @param approveNodeList 未运行节点的审批信息列表 */ private void traverseSimpleModelNodeToBuildNotRunApproveNodes(Long startUserId, ProcessInstance processInstance, BpmnModel bpmnModel, Set<String> runNodeIds, Map<String, ApprovalNodeInfo> runningApprovalNodes, List<ApprovalNodeInfo> approveNodeList) { List<FlowElement> flowElements = BpmnModelUtils.simulateProcess(bpmnModel, processInstance.getProcessVariables()); if (CollUtil.isEmpty(flowElements)) { return; } for (FlowElement flowElement : flowElements) { buildNotRunApproveNodes(startUserId, processInstance, flowElement, runNodeIds, runningApprovalNodes, approveNodeList); } } private void buildNotRunApproveNodes(Long startUserId, ProcessInstance processInstance, FlowElement node, Set<String> runNodeIds, Map<String, ApprovalNodeInfo> runningApprovalNodes, List<ApprovalNodeInfo> approveNodeList) { // 情况一：节点未运行：需要进行预测 if (!runNodeIds.contains(node.getId())) { // 1. 对需要人工审批的审批节点，进行预测 if (node instanceof UserTask) { ApprovalNodeInfo approvalNodeInfo = new ApprovalNodeInfo().setNodeType(APPROVE_NODE.getType()) .setName(node.getName()).setStatus(NOT_START.getStatus()); Integer candidateStrategy = BpmnModelUtils.parseCandidateStrategy(node); String candidateParam = BpmnModelUtils.parseCandidateParam(node); approvalNodeInfo.setCandidateUsers( getNotRunTaskCandidateUserList(startUserId, processInstance, node.getId(), candidateStrategy, candidateParam)); approveNodeList.add(approvalNodeInfo); // 2. 结束节点 } else if (node instanceof EndEvent) { approveNodeList.add(new ApprovalNodeInfo().setNodeType(END_NODE.getType()) .setName(node.getName()).setStatus(NOT_START.getStatus())); } } else { // 情况二：节点已经运行 if (BpmnModelUtils.isSequentialUserTask(node) && runningApprovalNodes.containsKey(node.getId())) { ApprovalNodeInfo approvalNodeInfo = runningApprovalNodes.get(node.getId()); Integer candidateStrategy = BpmnModelUtils.parseCandidateStrategy(node); String candidateParam = BpmnModelUtils.parseCandidateParam(node); List<UserSimpleBaseVO> candidateUserList = getNotRunTaskCandidateUserList( startUserId, processInstance, node.getId(),candidateStrategy, candidateParam); // TODO @jason：这里的逻辑，可能可以简化成，直接拿已经审批过的人的 userId 集合，从 candidateUserList remove 下。一方面简单一点，方面 calculateUsers 返回的是 set，目前不是很有序。 // TODO @芋艿 已经审批过的人的 userId 集合。不知道如何获取，不知道有啥好方法没。 如果取这个节点已经完成的审批任务。 是不是有可能包含退回的情况。就不太对了。 另外 candidateUserList 是按返回 set 遍历顺序返回的。和 set 的顺序是一致的。就不会有问题了 ApprovalTaskInfo approvalTaskInfo = CollUtil.getFirst(approvalNodeInfo.getTasks()); Long currentAssignedUserId = null; if (approvalTaskInfo != null && approvalTaskInfo.getAssigneeUser() != null) { currentAssignedUserId = approvalTaskInfo.getAssigneeUser().getId(); } // 找到当前审批人在候选人列表的位置 int index = 0; for (UserSimpleBaseVO user : candidateUserList) { if (user.getId().equals(currentAssignedUserId)) { break; } index++; } // 截取当前审批人位置后面的候选人, 不包含当前审批人 approvalNodeInfo.setCandidateUsers(CollUtil.sub(candidateUserList, ++index, candidateUserList.size())); } } } /** * 从已经运行活动节点构建的审批信息列表 * * @param processInstanceId 流程实例 Id * @param processInstanceStatus 流程实例状态 * @param historicActivityList 已经运行活动 */ private AlreadyRunApproveNodeRespBO buildAlreadyRunApproveNodes(String processInstanceId, Integer processInstanceStatus, List<HistoricActivityInstance> historicActivityList) { // 1.1 获取待处理活动：只有 "userTask" 和 "endEvent" 需要处理 List<HistoricActivityInstance> pendingActivityNodes = filterList(historicActivityList, item -> BpmSimpleModelNodeType.isRecordNode(item.getActivityType())); // 1.2 已运行节点的 activityId Set<String> runNodeIds = convertSet(historicActivityList, HistoricActivityInstance::getActivityId); // 2.1 获取已运行的任务(包括运行中的任务) List<HistoricTaskInstance> taskList = taskService.getTaskListByProcessInstanceId(processInstanceId, false); Map<String, HistoricTaskInstance> taskMap = convertMap(taskList, HistoricTaskInstance::getId); // 2.2 获取加签的任务 Map<String, List<HistoricTaskInstance>> addSignTaskMap = convertMultiMap( filterList(taskList, task -> StrUtil.isNotEmpty(task.getParentTaskId())), HistoricTaskInstance::getParentTaskId); // 3.1 获取节点的用户信息 // TODO @芋艿：其实 user 信息的获取，可以最终返回的时候处理。这样，可以进一步简化此处的逻辑；在 ApprovalNodeInfo 搞个不返回给前端的字段。最终 convert 的时候，在把转换成 ownerUser、assigneeUser 这种 Set<Long> userIds = CollectionUtils.convertSetByFlatMap(pendingActivityNodes, activity -> { if (BPMN_USER_TASK_TYPE.equals(activity.getActivityType())) { HistoricTaskInstance task = taskMap.get(activity.getTaskId()); Set<Long> taskUsers = CollUtil.newHashSet(); CollUtil.addIfAbsent(taskUsers, NumberUtil.parseLong(task.getAssignee(), null)); CollUtil.addIfAbsent(taskUsers, NumberUtil.parseLong(task.getOwner(), null)); List<HistoricTaskInstance> addSignTasks = addSignTaskMap.get(activity.getTaskId()); if (CollUtil.isNotEmpty(addSignTasks)) { addSignTasks.forEach(item -> { CollUtil.addIfAbsent(taskUsers, NumberUtil.parseLong(item.getAssignee(), null)); CollUtil.addIfAbsent(taskUsers, NumberUtil.parseLong(item.getOwner(), null)); }); } return taskUsers.stream(); } else { return Stream.empty(); } }); Map<Long, AdminUserRespDTO> userMap = convertMap(adminUserApi.getUserList(userIds), AdminUserRespDTO::getId); // 3.2 已经结束的任务转换为审批信息 final Multimap<String, HistoricActivityInstance> runningTask = ArrayListMultimap.create(); // 运行中的任务 List<ApprovalNodeInfo> approvalNodeList = convertList(pendingActivityNodes, activity -> { ApprovalNodeInfo approvalNodeInfo = new ApprovalNodeInfo().setId(activity.getId()).setName(activity.getActivityName()) .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime())); if (BPMN_USER_TASK_TYPE.equals(activity.getActivityType())) { // 用户任务 // nodeType approvalNodeInfo.setNodeType(START_USER_NODE_ID.equals(activity.getActivityId()) ? START_USER_NODE.getType() : APPROVE_NODE.getType()); // status HistoricTaskInstance task = taskMap.get(activity.getTaskId()); Integer taskStatus = FlowableUtils.getTaskStatus(task); // 运行中的任务, 会签，或签任务聚合在一起。 if (!BpmTaskStatusEnum.isEndStatus(taskStatus)) { runningTask.put(activity.getActivityId(), activity); return null; } // tasks ApprovalTaskInfo approveTask = convertApproveTaskInfo(task, userMap); List<ApprovalTaskInfo> approveTasks = CollUtil.newArrayList(approveTask); // TODO @jason：会有加签任务的加签，A 加 B，B 加 C，C 加 D 这种；最好么，477 到 480 这种，和 510 到 513 这种，封装个小方法。 List<HistoricTaskInstance> addSignTasks = addSignTaskMap.get(activity.getTaskId()); if (CollUtil.isNotEmpty(addSignTasks)) { // 处理加签任务 approveTasks.addAll(convertList(addSignTasks, item -> convertApproveTaskInfo(item, userMap))); } approvalNodeInfo.setStatus(taskStatus); approvalNodeInfo.setTasks(approveTasks); } else if (END_NODE.getBpmnType().equals(activity.getActivityType())) { approvalNodeInfo.setNodeType(END_NODE.getType()); approvalNodeInfo.setStatus(processInstanceStatus); } return approvalNodeInfo; }); // 3.3 运行中的任务转换为审批信息。 final Map<String, ApprovalNodeInfo> runningApprovalNodes = new HashMap<>(); // 正在运行节点的审批信息 runningTask.asMap().forEach((activityId, activities) -> { if (CollUtil.isNotEmpty(activities)) { ApprovalNodeInfo approvalNodeInfo = new ApprovalNodeInfo(); approvalNodeInfo.setNodeType(APPROVE_NODE.getType()); approvalNodeInfo.setStatus(RUNNING.getStatus()); List<ApprovalTaskInfo> approveTasks = CollUtil.newArrayList(); int i = 0; // TODO @jason：直接获取第一个，这样逻辑会更简单纯粹一点，firActivity；这样，循环里面，就不用做这个事情了哈。 for (HistoricActivityInstance activity : activities) { HistoricTaskInstance task = taskMap.get(activity.getTaskId()); // 取第一个任务， 会签/或签的任务。开始时间相同的 if (i == 0) { approvalNodeInfo.setId(activity.getId()).setName(activity.getActivityName()). setStartTime(DateUtils.of(activity.getStartTime())); } // tasks ApprovalTaskInfo approveTask = convertApproveTaskInfo(task, userMap); approveTasks.add(approveTask); List<HistoricTaskInstance> addSignTasks = addSignTaskMap.get(activity.getTaskId()); if (CollUtil.isNotEmpty(addSignTasks)) { // 处理加签任务 approveTasks.addAll(convertList(addSignTasks, item -> convertApproveTaskInfo(item, userMap))); } i++; } approvalNodeInfo.setTasks(approveTasks); approvalNodeList.add(approvalNodeInfo); runningApprovalNodes.put(activityId, approvalNodeInfo); } }); // TODO 芋艿：从 bpmn 视角，可能 startEvent 也需要 if (StrUtil.isNotEmpty(processInstanceId)) { ApprovalNodeInfo startNode = CollUtil.getFirst(approvalNodeList); if (startNode == null || !START_USER_NODE.getType().equals(startNode.getNodeType())) { startNode = new ApprovalNodeInfo().setId(START_USER_NODE_ID).setName(START_USER_NODE.getName()) .setNodeType(START_USER_NODE.getType()).setStatus(APPROVE.getStatus()); // .setCandidateUsers(singletonList(BeanUtils.toBean(userMap.get()))); // TODO 芋艿：发起人的信息，没读取。 approvalNodeList.add(0, startNode); } } return new AlreadyRunApproveNodeRespBO().setApproveNodes(approvalNodeList).setRunNodeIds(runNodeIds) .setRunningApprovalNodes(runningApprovalNodes); } private ApprovalTaskInfo convertApproveTaskInfo(HistoricTaskInstance task, Map<Long, AdminUserRespDTO> userMap) { if (task == null) { return null; } ApprovalTaskInfo approveTask = BeanUtils.toBean(task, ApprovalTaskInfo.class); approveTask.setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task)); Long taskAssignee = NumberUtil.parseLong(task.getAssignee(), null); if (taskAssignee != null) { approveTask.setAssigneeUser(BeanUtils.toBean(userMap.get(taskAssignee), UserSimpleBaseVO.class)); } Long taskOwner = NumberUtil.parseLong(task.getOwner(), null); if (taskOwner != null) { approveTask.setOwnerUser(BeanUtils.toBean(userMap.get(taskOwner), UserSimpleBaseVO.class)); } return approveTask; } private List<UserSimpleBaseVO> getNotRunTaskCandidateUserList(Long startUserId, ProcessInstance processInstance, String activityId, Integer candidateStrategy, String candidateParam) { BpmTaskCandidateStrategy taskCandidateStrategy = bpmTaskCandidateInvoker.getCandidateStrategy(candidateStrategy); Set<Long> userIds = taskCandidateStrategy.calculateUsers(startUserId, processInstance, activityId, candidateParam); Map<Long, AdminUserRespDTO> adminUserMap = adminUserApi.getUserMap(userIds); // 需要按照候选人的顺序返回。原因是，依次审批需要按顺序展示用户 return convertList(userIds, userId -> BeanUtils.toBean(adminUserMap.get(userId), UserSimpleBaseVO.class)); } @Override public BpmProcessInstanceBpmnModelViewRespVO getProcessInstanceBpmnModelView(String id) { // 1.1 获得流程实例 HistoricProcessInstance processInstance = getHistoricProcessInstance(id); if (processInstance == null) { return null; } // 1.2 获得流程定义 BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()); if (bpmnModel == null) { return null; } BpmSimpleModelNodeVO simpleModel = null; BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processInstance.getProcessDefinitionId()); if (processDefinitionInfo != null) { simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); } // 1.3 获得流程实例对应的活动实例列表 + 任务列表 List<HistoricActivityInstance> activityInstances = getActivityListByProcessInstanceId(id); List<HistoricTaskInstance> taskInstances = taskService.getTaskListByProcessInstanceId(id, true); // 2.1 拼接进度信息 Set<String> unfinishedTaskActivityIds = convertSet(activityInstances, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() == null); Set<String> finishedTaskActivityIds = convertSet(activityInstances, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() != null && ObjectUtil.notEqual(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); Set<String> finishedSequenceFlowActivityIds = convertSet(activityInstances, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() != null && ObjectUtil.equals(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); // 特殊：会签情况下，会有部分已完成（审批）、部分未完成（待审批），此时需要 finishedTaskActivityIds 移除掉 unfinishedTaskActivityIds.removeAll(finishedTaskActivityIds); // 特殊：如果流程实例被拒绝，则需要计算是哪个活动节点。 // 注意，只取最后一个。因为会存在多次拒绝的情况，拒绝驳回到指定节点 Set<String> rejectTaskActivityIds = CollUtil.newHashSet(); if (BpmProcessInstanceStatusEnum.isRejectStatus(FlowableUtils.getProcessInstanceStatus(processInstance))) { taskInstances.stream() .filter(task -> BpmTaskStatusEnum.isRejectStatus(FlowableUtils.getTaskStatus(task))) .max(Comparator.comparing(HistoricTaskInstance::getEndTime)) .ifPresent(reject -> rejectTaskActivityIds.add(reject.getTaskDefinitionKey())); finishedTaskActivityIds.removeAll(rejectTaskActivityIds); } // 2.2 拼接基础信息 Set<Long> userIds = SetUtils.asSet(Long.valueOf(processInstance.getStartUserId())); taskInstances.forEach(task -> { CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getAssignee()))); CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getOwner()))); }); Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap( convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); return INSTANCE.buildProcessInstanceBpmnModelView(processInstance, taskInstances, bpmnModel, simpleModel, unfinishedTaskActivityIds, finishedTaskActivityIds, finishedSequenceFlowActivityIds, rejectTaskActivityIds, userMap, deptMap); } private List<HistoricActivityInstance> getActivityListByProcessInstanceId(String id) { return historyService.createHistoricActivityInstanceQuery().processInstanceId(id) .orderByHistoricActivityInstanceStartTime().asc().list(); } // ========== 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); } BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(definition.getId()); if (processDefinitionInfo == null) { throw exception(PROCESS_DEFINITION_NOT_EXISTS); } // 1.2 校验是否能够发起 if (!processDefinitionService.canUserStartProcessDefinition(processDefinitionInfo, userId)) { throw exception(PROCESS_INSTANCE_START_USER_CAN_START); } // 1.3 校验发起人自选审批人 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(INSTANCE.buildProcessInstanceApproveMessage(instance)); } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) { messageService.sendMessageWhenProcessInstanceReject( INSTANCE.buildProcessInstanceRejectMessage(instance, reason)); } // 3. 发送流程实例的状态事件 processInstanceEventPublisher.sendProcessInstanceResultEvent( 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.collection.ListUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; 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.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 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.BpmApprovalDetailRespVO.ActivityNodeTask; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; 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.ErrorCodeConstants; 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.enums.task.BpmTaskStatusEnum; 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.BpmTaskCandidateStrategyEnum; import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants; 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.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; 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.constants.BpmnXMLConstants; import org.flowable.bpmn.model.*; 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.framework.common.util.collection.CollectionUtils.*; import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ActivityNode; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.START_USER_NODE_ID; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.flowable.bpmn.constants.BpmnXMLConstants.*; /** * 流程实例 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 BpmTaskCandidateInvoker bpmTaskCandidateInvoker; @Resource private AdminUserApi adminUserApi; @Resource private DeptApi deptApi; @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.getProcessDefinitionKey())) { processInstanceQuery.processDefinitionKey(pageReqVO.getProcessDefinitionKey()); } 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); } private Map<String, String> getFormFieldsPermission(BpmnModel bpmnModel, String activityId, String taskId) { // 1. 获取流程活动编号。流程活动 Id 为空事，从流程任务中获取流程活动 Id if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(taskId)) { activityId = Optional.ofNullable(taskService.getHistoricTask(taskId)) .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null); } if (StrUtil.isEmpty(activityId)) { return null; } // 2. 从 BpmnModel 中解析表单字段权限 return BpmnModelUtils.parseFormFieldsPermission(bpmnModel, activityId); } @Override public BpmApprovalDetailRespVO getApprovalDetail(Long loginUserId, BpmApprovalDetailReqVO reqVO) { // 1.1 从 reqVO 中，读取公共变量 Long startUserId = loginUserId; // 流程发起人 HistoricProcessInstance historicProcessInstance = null; // 流程实例 ProcessInstance processInstance = null; // 流程 Integer processInstanceStatus = BpmProcessInstanceStatusEnum.NOT_START.getStatus(); // 流程状态 Map<String, Object> processVariables = reqVO.getProcessVariables(); // 流程变量 // 1.2 如果是流程已发起的场景，则使用流程实例的数据 if (reqVO.getProcessInstanceId() != null) { historicProcessInstance = getHistoricProcessInstance(reqVO.getProcessInstanceId()); if (historicProcessInstance == null) { throw exception(ErrorCodeConstants.PROCESS_INSTANCE_NOT_EXISTS); } processInstance = getProcessInstance(historicProcessInstance.getId()); startUserId = Long.valueOf(historicProcessInstance.getStartUserId()); processInstanceStatus = FlowableUtils.getProcessInstanceStatus(historicProcessInstance); processVariables = historicProcessInstance.getProcessVariables(); } // 1.3 读取其它相关数据 ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition( historicProcessInstance != null ? historicProcessInstance.getProcessDefinitionId() : reqVO.getProcessDefinitionId()); BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinition.getId()); BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId()); // 2.1 已结束 + 进行中的活动节点 List<ActivityNode> endActivityNodes = null; // 已结束的审批信息 List<ActivityNode> runActivityNodes = null; // 进行中的审批信息 List<HistoricActivityInstance> activities = null; // 流程实例列表 if (reqVO.getProcessInstanceId() != null) { activities = taskService.getActivityListByProcessInstanceId(reqVO.getProcessInstanceId()); List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(reqVO.getProcessInstanceId(), true); endActivityNodes = getEndActivityNodeList(startUserId, processDefinitionInfo, historicProcessInstance, processInstanceStatus, activities, tasks); runActivityNodes = getRunApproveNodeList(startUserId, bpmnModel, processInstance, activities, tasks); } // 2.2 流程已经结束，直接 return，无需预测 if (BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)) { return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance, processInstanceStatus, endActivityNodes, runActivityNodes, null, null); } // 3.1 计算当前登录用户的待办任务 // TODO @jason：有一个极端情况，如果一个用户有 2 个 task A 和 B，A 已经通过，B 需要审核。这个时，通过 A 进来，todo 拿到 B，会不会表单权限不一致哈。 BpmTaskRespVO todoTask = taskService.getFirstTodoTask(loginUserId, reqVO.getProcessInstanceId()); // 3.2 预测未运行节点的审批信息 List<ActivityNode> simulateActivityNodes = getSimulateApproveNodeList(startUserId, bpmnModel, processDefinitionInfo, processInstance, processVariables, activities); // 4. 拼接最终数据 return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance, processInstanceStatus, endActivityNodes, runActivityNodes, simulateActivityNodes, todoTask); } /** * 拼接审批详情的最终数据 * * 主要是，拼接审批人的用户信息、部门信息 */ private BpmApprovalDetailRespVO buildApprovalDetail(BpmApprovalDetailReqVO reqVO, BpmnModel bpmnModel, ProcessDefinition processDefinition, BpmProcessDefinitionInfoDO processDefinitionInfo, HistoricProcessInstance processInstance, Integer processInstanceStatus, List<ActivityNode> endApprovalNodeInfos, List<ActivityNode> runningApprovalNodeInfos, List<ActivityNode> simulateApprovalNodeInfos, BpmTaskRespVO todoTask) { // 1. 获取所有需要读取用户信息的 userIds List<ActivityNode> approveNodes = newArrayList(asList(endApprovalNodeInfos, runningApprovalNodeInfos, simulateApprovalNodeInfos)); Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds(processInstance, approveNodes); Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); // 2. 表单权限 Map<String, String> formFieldsPermission = getFormFieldsPermission(bpmnModel, reqVO.getActivityId(), reqVO.getTaskId()); // 3. 拼接数据 return BpmProcessInstanceConvert.INSTANCE.buildApprovalDetail(bpmnModel, processDefinition, processDefinitionInfo, processInstance, processInstanceStatus, approveNodes, todoTask, formFieldsPermission, userMap, deptMap); } /** * 获得【已结束】的活动节点们 */ private List<ActivityNode> getEndActivityNodeList(Long startUserId, BpmProcessDefinitionInfoDO processDefinitionInfo, HistoricProcessInstance historicProcessInstance, Integer processInstanceStatus, List<HistoricActivityInstance> activities, List<HistoricTaskInstance> tasks) { // 遍历 tasks 列表，只处理已结束的 UserTask // 为什么不通过 activities 呢？因为，加签场景下，它只存在于 tasks，没有 activities，导致如果遍历 activities 的话，它无法成为一个节点 List<HistoricTaskInstance> endTasks = filterList(tasks, task -> task.getEndTime() != null); List<ActivityNode> approvalNodes = convertList(endTasks, task -> { ActivityNode activityNode = new ActivityNode().setId(task.getTaskDefinitionKey()).setName(task.getName()) .setNodeType(START_USER_NODE_ID.equals(task.getTaskDefinitionKey()) ? BpmSimpleModelNodeType.START_USER_NODE.getType() : BpmSimpleModelNodeType.APPROVE_NODE.getType()) .setStatus(FlowableUtils.getTaskStatus(task)) .setStartTime(DateUtils.of(task.getCreateTime())).setEndTime(DateUtils.of(task.getEndTime())) .setTasks(singletonList(BpmProcessInstanceConvert.INSTANCE.buildApprovalTaskInfo(task))); // 如果是取消状态，则跳过 if (BpmTaskStatusEnum.isCancelStatus(activityNode.getStatus())) { return null; } return activityNode; }); // 遍历 activities，只处理已结束的 StartEvent、EndEvent List<HistoricActivityInstance> endActivities = filterList(activities, activity -> activity.getEndTime() != null && (StrUtil.equalsAny(activity.getActivityType(), ELEMENT_EVENT_START, ELEMENT_EVENT_END))); endActivities.forEach(activity -> { // StartEvent：只处理 BPMN 的场景。因为，SIMPLE 情况下，已经有 START_USER_NODE 节点 if (ELEMENT_EVENT_START.equals(activity.getActivityType()) && BpmModelTypeEnum.BPMN.getType().equals(processDefinitionInfo.getModelType())) { ActivityNodeTask startTask = new ActivityNodeTask().setId(BpmnModelConstants.START_USER_NODE_ID) .setAssignee(startUserId).setStatus(BpmTaskStatusEnum.APPROVE.getStatus()); ActivityNode startNode = new ActivityNode().setId(startTask.getId()) .setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.START_USER_NODE.getType()) .setStatus(startTask.getStatus()).setTasks(ListUtil.of(startTask)) .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime())); approvalNodes.add(0, startNode); return; } // EndEvent if (ELEMENT_EVENT_END.equals(activity.getActivityType())) { if (BpmProcessInstanceStatusEnum.isRejectStatus(processInstanceStatus)) { // 拒绝情况下，不需要展示 EndEvent 结束节点。原因是：前端已经展示 x 效果，无需重复展示 return; } ActivityNode endNode = new ActivityNode().setId(activity.getId()) .setName(BpmSimpleModelNodeType.END_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.END_NODE.getType()).setStatus(processInstanceStatus) .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime())); String reason = FlowableUtils.getProcessInstanceReason(historicProcessInstance); if (StrUtil.isNotEmpty(reason)) { endNode.setTasks(singletonList(new ActivityNodeTask().setId(endNode.getId()) .setStatus(endNode.getStatus()).setReason(reason))); } approvalNodes.add(endNode); } }); return approvalNodes; } /** * 获得【进行中】的活动节点们 */ private List<ActivityNode> getRunApproveNodeList(Long startUserId, BpmnModel bpmnModel, ProcessInstance processInstance, List<HistoricActivityInstance> activities, List<HistoricTaskInstance> tasks) { // 构建运行中的任务，基于 activityId 分组 List<HistoricActivityInstance> runActivities = filterList(activities, activity -> activity.getEndTime() == null && (StrUtil.equalsAny(activity.getActivityType(), ELEMENT_TASK_USER))); Map<String, List<HistoricActivityInstance>> runningTaskMap = convertMultiMap(runActivities, HistoricActivityInstance::getActivityId); // 按照 activityId 分组，构建 ApprovalNodeInfo 节点 Map<String, HistoricTaskInstance> taskMap = convertMap(tasks, HistoricTaskInstance::getId); return convertList(runningTaskMap.entrySet(), entry -> { String activityId = entry.getKey(); List<HistoricActivityInstance> taskActivities = entry.getValue(); // 构建活动节点 HistoricActivityInstance firstActivity = CollUtil.getFirst(taskActivities); // 取第一个任务，会签/或签的任务，开始时间相同 ActivityNode activityNode = new ActivityNode().setId(firstActivity.getActivityId()).setName(firstActivity.getActivityName()) .setNodeType(BpmSimpleModelNodeType.APPROVE_NODE.getType()).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()) .setTasks(new ArrayList<>()); // 处理每个任务的 tasks 属性 for (HistoricActivityInstance activity : taskActivities) { HistoricTaskInstance task = taskMap.get(activity.getTaskId()); activityNode.getTasks().add(BpmProcessInstanceConvert.INSTANCE.buildApprovalTaskInfo(task)); // 加签子任务 List<HistoricTaskInstance> childrenTasks = taskService.getAllChildrenTaskListByParentTaskId(activity.getTaskId(), tasks); if (CollUtil.isNotEmpty(childrenTasks)) { activityNode.getTasks().addAll(convertList(childrenTasks, BpmProcessInstanceConvert.INSTANCE::buildApprovalTaskInfo)); } } // 处理每个任务的 candidateUsers 属性：如果是依次审批，需要预测它的后续审批人。因为 Task 是审批完一个，创建一个新的 Task FlowElement flowNode = BpmnModelUtils.getFlowElementById(bpmnModel, activityId); if (BpmnModelUtils.isSequentialUserTask(flowNode)) { List<Long> candidateUserIds = getTaskCandidateUserList(startUserId, processInstance, flowNode.getId(), BpmnModelUtils.parseCandidateStrategy(flowNode), BpmnModelUtils.parseCandidateParam(flowNode)); // 截取当前审批人位置后面的候选人，不包含当前审批人 ActivityNodeTask approvalTaskInfo = CollUtil.getFirst(activityNode.getTasks()); Assert.notNull(approvalTaskInfo, "任务不能为空"); int index = CollUtil.indexOf(candidateUserIds, userId -> userId.equals(approvalTaskInfo.getAssignee())); activityNode.setCandidateUserIds(CollUtil.sub(candidateUserIds, index + 1, candidateUserIds.size())); } return activityNode; }); } /** * 获得【预测（未来）】的活动节点们 */ private List<ActivityNode> getSimulateApproveNodeList(Long startUserId, BpmnModel bpmnModel, BpmProcessDefinitionInfoDO processDefinitionInfo, ProcessInstance processInstance, Map<String, Object> processVariable, List<HistoricActivityInstance> activities) { // TODO @芋艿：【可优化】在驳回场景下，未来的预测准确性不高。原因是，驳回后，HistoricActivityInstance 包括了历史的操作，不是只有 startEvent 到当前节点的记录 Set<String> runActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId); // 情况一：BPMN 设计器 if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) { List<FlowElement> flowElements = BpmnModelUtils.simulateProcess(bpmnModel, processVariable); return convertList(flowElements, flowElement -> buildNotRunApproveNodeForBpmn(startUserId, processInstance, flowElement, runActivityIds)); } // 情况二：SIMPLE 设计器 if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) { BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); List<BpmSimpleModelNodeVO> simpleNodes = SimpleModelUtils.simulateProcess(simpleModel, processVariable); return convertList(simpleNodes, simpleNode -> buildNotRunApproveNodeForSimple(startUserId, processInstance, simpleNode, runActivityIds)); } throw new IllegalArgumentException("未知设计器类型：" + processDefinitionInfo.getModelType()); } private ActivityNode buildNotRunApproveNodeForSimple(Long startUserId, ProcessInstance processInstance, BpmSimpleModelNodeVO node, Set<String> runActivityIds) { // TODO @芋艿：【可优化】在驳回场景下，未来的预测准确性不高。原因是，驳回后，HistoricActivityInstance 包括了历史的操作，不是只有 startEvent 到当前节点的记录 if (runActivityIds.contains(node.getId())) { return null; } ActivityNode activityNode = new ActivityNode().setId(node.getId()).setName(node.getName()) .setNodeType(node.getType()).setStatus(BpmTaskStatusEnum.NOT_START.getStatus()); // 1. 开始节点/审批节点 if (ObjectUtils.equalsAny(node.getType(), BpmSimpleModelNodeType.START_USER_NODE.getType(), BpmSimpleModelNodeType.APPROVE_NODE.getType())) { Integer candidateStrategy = BpmSimpleModelNodeType.START_USER_NODE.getType().equals(node.getType()) ? BpmTaskCandidateStrategyEnum.START_USER.getStrategy() : node.getCandidateStrategy(); if (candidateStrategy != null) { activityNode.setCandidateUserIds(getTaskCandidateUserList(startUserId, processInstance, node.getId(), candidateStrategy, node.getCandidateParam())); } return activityNode; } // 2. 结束节点 if (BpmSimpleModelNodeType.END_NODE.getType().equals(node.getType())) { return activityNode; } // 3. 抄送节点 TODO @jason：抄送节点 return null; } private ActivityNode buildNotRunApproveNodeForBpmn(Long startUserId, ProcessInstance processInstance, FlowElement node, Set<String> runActivityIds) { if (runActivityIds.contains(node.getId())) { return null; } ActivityNode activityNode = new ActivityNode().setId(node.getId()).setStatus(BpmTaskStatusEnum.NOT_START.getStatus()); // 1. 开始节点 if (node instanceof StartEvent) { return activityNode.setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.START_USER_NODE.getType()); } // 2. 审批节点 if (node instanceof UserTask) { return activityNode.setName(node.getName()).setNodeType(BpmSimpleModelNodeType.APPROVE_NODE.getType()) .setCandidateUserIds(getTaskCandidateUserList(startUserId, processInstance, node.getId(), BpmnModelUtils.parseCandidateStrategy(node), BpmnModelUtils.parseCandidateParam(node))); } // 3. 结束节点 if (node instanceof EndEvent) { return activityNode.setName(BpmSimpleModelNodeType.END_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.END_NODE.getType()); } return null; } private List<Long> getTaskCandidateUserList(Long startUserId, ProcessInstance processInstance, String activityId, Integer candidateStrategy, String candidateParam) { BpmTaskCandidateStrategy taskCandidateStrategy = bpmTaskCandidateInvoker.getCandidateStrategy(candidateStrategy); return new ArrayList<>(taskCandidateStrategy.calculateUsers(startUserId, processInstance, activityId, candidateParam)); } @Override public BpmProcessInstanceBpmnModelViewRespVO getProcessInstanceBpmnModelView(String id) { // 1.1 获得流程实例 HistoricProcessInstance processInstance = getHistoricProcessInstance(id); if (processInstance == null) { return null; } // 1.2 获得流程定义 BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()); if (bpmnModel == null) { return null; } BpmSimpleModelNodeVO simpleModel = null; BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processInstance.getProcessDefinitionId()); if (processDefinitionInfo != null) { simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); } // 1.3 获得流程实例对应的活动实例列表 + 任务列表 List<HistoricActivityInstance> activities = taskService.getActivityListByProcessInstanceId(id); List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(id, true); // 2.1 拼接进度信息 Set<String> unfinishedTaskActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() == null); Set<String> finishedTaskActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() != null && ObjectUtil.notEqual(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); Set<String> finishedSequenceFlowActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() != null && ObjectUtil.equals(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); // 特殊：会签情况下，会有部分已完成（审批）、部分未完成（待审批），此时需要 finishedTaskActivityIds 移除掉 unfinishedTaskActivityIds.removeAll(finishedTaskActivityIds); // 特殊：如果流程实例被拒绝，则需要计算是哪个活动节点。 // 注意，只取最后一个。因为会存在多次拒绝的情况，拒绝驳回到指定节点 Set<String> rejectTaskActivityIds = CollUtil.newHashSet(); if (BpmProcessInstanceStatusEnum.isRejectStatus(FlowableUtils.getProcessInstanceStatus(processInstance))) { tasks.stream() .filter(task -> BpmTaskStatusEnum.isRejectStatus(FlowableUtils.getTaskStatus(task))) .max(Comparator.comparing(HistoricTaskInstance::getEndTime)) .ifPresent(reject -> rejectTaskActivityIds.add(reject.getTaskDefinitionKey())); finishedTaskActivityIds.removeAll(rejectTaskActivityIds); } // 2.2 拼接基础信息 Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds02(processInstance, tasks); Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); return BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceBpmnModelView(processInstance, tasks, bpmnModel, unfinishedTaskActivityIds, finishedTaskActivityIds, finishedSequenceFlowActivityIds, rejectTaskActivityIds, userMap, deptMap); } // ========== 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); } BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(definition.getId()); if (processDefinitionInfo == null) { throw exception(PROCESS_DEFINITION_NOT_EXISTS); } // 1.2 校验是否能够发起 if (!processDefinitionService.canUserStartProcessDefinition(processDefinitionInfo, userId)) { throw exception(PROCESS_INSTANCE_START_USER_CAN_START); } // 1.3 校验发起人自选审批人 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
| ... | ... | @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*; |
| 6 | 6 | import cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskTimeoutHandlerTypeEnum; |
| 7 | 7 | import jakarta.validation.Valid; |
| 8 | 8 | import org.flowable.bpmn.model.UserTask; |
| 9 | +import org.flowable.engine.history.HistoricActivityInstance; | |
| 9 | 10 | import org.flowable.task.api.Task; |
| 10 | 11 | import org.flowable.task.api.history.HistoricTaskInstance; |
| 11 | 12 | |
| ... | ... | @@ -131,6 +132,15 @@ public interface BpmTaskService { |
| 131 | 132 | List<UserTask> getUserTaskListByReturn(String id); |
| 132 | 133 | |
| 133 | 134 | /** |
| 135 | + * 获取指定任务的子任务列表（多层） | |
| 136 | + * | |
| 137 | + * @param parentTaskId 父任务 ID | |
| 138 | + * @param tasks 任务列表 | |
| 139 | + * @return 子任务列表 | |
| 140 | + */ | |
| 141 | + List<HistoricTaskInstance> getAllChildrenTaskListByParentTaskId(String parentTaskId, List<HistoricTaskInstance> tasks); | |
| 142 | + | |
| 143 | + /** | |
| 134 | 144 | * 获取指定任务的子任务列表 |
| 135 | 145 | * |
| 136 | 146 | * @param parentTaskId 父任务ID |
| ... | ... | @@ -139,12 +149,20 @@ public interface BpmTaskService { |
| 139 | 149 | List<Task> getTaskListByParentTaskId(String parentTaskId); |
| 140 | 150 | |
| 141 | 151 | /** |
| 142 | - * 通过任务 ID，查询任务名 Map | |
| 152 | + * 获得指定流程实例的活动实例列表 | |
| 153 | + * | |
| 154 | + * @param processInstanceId 流程实例的编号 | |
| 155 | + * @return 活动实例列表 | |
| 156 | + */ | |
| 157 | + List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId); | |
| 158 | + | |
| 159 | + /** | |
| 160 | + * 获得执行编号对应的活动实例 | |
| 143 | 161 | * |
| 144 | - * @param taskIds 任务 ID | |
| 145 | - * @return 任务 ID 与名字的 Map | |
| 162 | + * @param executionId 执行编号 | |
| 163 | + * @return 活动实例 | |
| 146 | 164 | */ |
| 147 | - Map<String, String> getTaskNameByTaskIds(Collection<String> taskIds); | |
| 165 | + List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId); | |
| 148 | 166 | |
| 149 | 167 | // ========== Update 写入相关方法 ========== |
| 150 | 168 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
| ... | ... | @@ -39,6 +39,7 @@ import org.flowable.engine.HistoryService; |
| 39 | 39 | import org.flowable.engine.ManagementService; |
| 40 | 40 | import org.flowable.engine.RuntimeService; |
| 41 | 41 | import org.flowable.engine.TaskService; |
| 42 | +import org.flowable.engine.history.HistoricActivityInstance; | |
| 42 | 43 | import org.flowable.engine.history.HistoricProcessInstance; |
| 43 | 44 | import org.flowable.engine.runtime.ProcessInstance; |
| 44 | 45 | import org.flowable.task.api.DelegationState; |
| ... | ... | @@ -305,6 +306,38 @@ public class BpmTaskServiceImpl implements BpmTaskService { |
| 305 | 306 | return previousUserList; |
| 306 | 307 | } |
| 307 | 308 | |
| 309 | + @Override | |
| 310 | + public List<HistoricTaskInstance> getAllChildrenTaskListByParentTaskId(String parentTaskId, List<HistoricTaskInstance> tasks) { | |
| 311 | + if (CollUtil.isEmpty(tasks)) { | |
| 312 | + return Collections.emptyList(); | |
| 313 | + } | |
| 314 | + Map<String, List<HistoricTaskInstance>> parentTaskMap = convertMultiMap( | |
| 315 | + filterList(tasks, task -> StrUtil.isNotEmpty(task.getParentTaskId())), HistoricTaskInstance::getParentTaskId); | |
| 316 | + if (CollUtil.isEmpty(parentTaskMap)) { | |
| 317 | + return Collections.emptyList(); | |
| 318 | + } | |
| 319 | + | |
| 320 | + List<HistoricTaskInstance> result = new ArrayList<>(); | |
| 321 | + // 1. 递归获取子级 | |
| 322 | + Stack<String> stack = new Stack<>(); | |
| 323 | + stack.push(parentTaskId); | |
| 324 | + // 2. 递归遍历 | |
| 325 | + for (int i = 0; i < Short.MAX_VALUE; i++) { | |
| 326 | + if (stack.isEmpty()) { | |
| 327 | + break; | |
| 328 | + } | |
| 329 | + // 2.1 获取子任务们 | |
| 330 | + String taskId = stack.pop(); | |
| 331 | + List<HistoricTaskInstance> childTaskList = filterList(tasks, task -> StrUtil.equals(task.getParentTaskId(), taskId)); | |
| 332 | + // 2.2 如果非空，则添加到 stack 进一步递归 | |
| 333 | + if (CollUtil.isNotEmpty(childTaskList)) { | |
| 334 | + stack.addAll(convertList(childTaskList, HistoricTaskInstance::getId)); | |
| 335 | + result.addAll(childTaskList); | |
| 336 | + } | |
| 337 | + } | |
| 338 | + return result; | |
| 339 | + } | |
| 340 | + | |
| 308 | 341 | /** |
| 309 | 342 | * 获得所有子任务列表 |
| 310 | 343 | * |
| ... | ... | @@ -377,12 +410,14 @@ public class BpmTaskServiceImpl implements BpmTaskService { |
| 377 | 410 | } |
| 378 | 411 | |
| 379 | 412 | @Override |
| 380 | - public Map<String, String> getTaskNameByTaskIds(Collection<String> taskIds) { | |
| 381 | - if (CollUtil.isEmpty(taskIds)) { | |
| 382 | - return Collections.emptyMap(); | |
| 383 | - } | |
| 384 | - List<Task> tasks = taskService.createTaskQuery().taskIds(taskIds).list(); | |
| 385 | - return convertMap(tasks, Task::getId, Task::getName); | |
| 413 | + public List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId) { | |
| 414 | + return historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId) | |
| 415 | + .orderByHistoricActivityInstanceStartTime().asc().list(); | |
| 416 | + } | |
| 417 | + | |
| 418 | + @Override | |
| 419 | + public List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId) { | |
| 420 | + return historyService.createHistoricActivityInstanceQuery().executionId(executionId).list(); | |
| 386 | 421 | } |
| 387 | 422 | |
| 388 | 423 | // ========== Update 写入相关方法 ========== | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/bo/AlreadyRunApproveNodeRespBO.java deleted
| 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.Map; | |
| 7 | -import java.util.Set; | |
| 8 | - | |
| 9 | -import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ApprovalNodeInfo; | |
| 10 | - | |
| 11 | -/** | |
| 12 | - * 已经进行中的审批节点 Response BO | |
| 13 | - * | |
| 14 | - * @author jason | |
| 15 | - */ | |
| 16 | -@Data | |
| 17 | -public class AlreadyRunApproveNodeRespBO { | |
| 18 | - | |
| 19 | - /** | |
| 20 | - * 审批节点信息数组 | |
| 21 | - */ | |
| 22 | - private List<ApprovalNodeInfo> approveNodes; | |
| 23 | - | |
| 24 | - /** | |
| 25 | - * 已运行的节点 ID 数组 (对应 Bpmn XML 节点 id) | |
| 26 | - */ | |
| 27 | - private Set<String> runNodeIds; | |
| 28 | - | |
| 29 | - /** | |
| 30 | - * 正在运行的节点的审批信息（key: activityId, value: 审批信息） | |
| 31 | - * <p> | |
| 32 | - * 用于依次审批，需要加上候选人信息 | |
| 33 | - */ | |
| 34 | - private Map<String, ApprovalNodeInfo> runningApprovalNodes; | |
| 35 | - | |
| 36 | -} |