From ae3c63eb29977d069dd986a16842411b977eb0a9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 7 Jan 2025 22:27:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E3=80=91BPM=EF=BC=9ASimple=20=E8=AE=BE=E8=AE=A1=E5=99=A8=20-?= =?UTF-8?q?=20=E8=B7=AF=E7=94=B1=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/model/simple/BpmSimpleModelNodeVO.java | 10 ++++++++-- .../flowable/core/util/SimpleModelUtils.java | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java index 382cd7c318..57ce1e9b58 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java @@ -39,6 +39,7 @@ public class BpmSimpleModelNodeVO { @Schema(description = "条件节点") private List conditionNodes; // 补充说明：有且仅有条件、并行、包容等分支会使用 + // TODO @jason：conditionType、conditionExpression、defaultFlow、conditionGroups 搞成一个 condition 属性，会好点么？ @Schema(description = "条件类型", example = "1") @InEnum(BpmSimpleModeConditionType.class) private Integer conditionType; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE @@ -251,6 +252,7 @@ public class BpmSimpleModelNodeVO { @Schema(description = "运算符右边的值", example = "1") @NotEmpty(message = "运算符右边的值不能为空") private String rightSide; + } @Schema(description = "延迟器设置", example = "{}") @@ -269,8 +271,10 @@ public class BpmSimpleModelNodeVO { @Schema(description = "延迟时间表达式", example = "PT1H,2025-01-01T00:00:00") @NotEmpty(message = "延迟时间表达式不能为空") private String delayTime; + } + // TODO @lesan：routeGroups @Schema(description = "路由分支组", example = "[]") private List routeGroup; @@ -282,10 +286,11 @@ public class BpmSimpleModelNodeVO { @Valid public static class RouteCondition { - @Schema(description = "节点Id", example = "Activity_xxx") - @NotEmpty(message = "节点Id不能为空") + @Schema(description = "节点 Id", example = "Activity_xxx") + @NotEmpty(message = "节点 Id 不能为空") private String nodeId; + // TODO @lesan：type、expression、groups；（可以晚点改，在和 conditionType、conditionExpression、defaultFlow、conditionGroups 讨论！） @Schema(description = "条件类型", example = "1") @InEnum(BpmSimpleModeConditionType.class) @NotNull(message = "条件类型不能为空") @@ -296,6 +301,7 @@ public class BpmSimpleModelNodeVO { @Schema(description = "条件组", example = "{}") private ConditionGroups conditionGroups; + } } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java index 6922b0a453..57d32c441e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java @@ -42,8 +42,7 @@ public class SimpleModelUtils { List converts = asList(new StartNodeConvert(), new EndNodeConvert(), new StartUserNodeConvert(), new ApproveNodeConvert(), new CopyNodeConvert(), new DelayTimerNodeConvert(), - new ConditionBranchNodeConvert(), new ParallelBranchNodeConvert(), new InclusiveBranchNodeConvert(), - new RouteBranchNodeConvert()); + new ConditionBranchNodeConvert(), new ParallelBranchNodeConvert(), new InclusiveBranchNodeConvert(), new RouteBranchNodeConvert()); converts.forEach(convert -> NODE_CONVERTS.put(convert.getType(), convert)); } @@ -185,7 +184,7 @@ public class SimpleModelUtils { BpmSimpleModelNodeType nodeType = BpmSimpleModelNodeType.valueOf(node.getType()); BpmSimpleModelNodeVO childNode = node.getChildNode(); List conditionNodes = node.getConditionNodes(); - // TODO @芋艿 路由分支没有conditionNodes 这里注释会影响吗？ + // TODO @芋艿 路由分支没有conditionNodes 这里注释会影响吗？@jason：一起帮忙瞅瞅！ // Assert.notEmpty(conditionNodes, "分支节点的条件节点不能为空"); // 分支终点节点 ID String branchEndNodeId = null; @@ -204,8 +203,8 @@ public class SimpleModelUtils { if (nodeType == BpmSimpleModelNodeType.ROUTE_BRANCH_NODE) { // 路由分支遍历 for (BpmSimpleModelNodeVO.RouteCondition route : node.getRouteGroup()) { - SequenceFlow sFlow = RouteBranchNodeConvert.buildSequenceFlow(node.getId(), route); - process.addFlowElement(sFlow); + SequenceFlow sequenceFlow = RouteBranchNodeConvert.buildSequenceFlow(node.getId(), route); + process.addFlowElement(sequenceFlow); } } else { // 下面的注释，以如下情况举例子。分支 1：A->B->C->D->E，分支 2：A->D->E。其中，A 为分支节点, D 为 A 孩子节点 @@ -228,15 +227,14 @@ public class SimpleModelUtils { } } - // 4. 各分支节点所需特殊处理 + // 4.1 如果是并行分支、包容分支，由于是程序创建的聚合网关，需要手工创建聚合网关和下一个节点的连线 if (nodeType == BpmSimpleModelNodeType.PARALLEL_BRANCH_NODE - || nodeType == BpmSimpleModelNodeType.INCLUSIVE_BRANCH_NODE ) { - // 如果是并行分支、包容分支，由于是程序创建的聚合网关，需要手工创建聚合网关和下一个节点的连线 + || nodeType == BpmSimpleModelNodeType.INCLUSIVE_BRANCH_NODE) { String nextNodeId = isValidNode(childNode) ? childNode.getId() : targetNodeId; SequenceFlow sequenceFlow = buildBpmnSequenceFlow(branchEndNodeId, nextNodeId); process.addFlowElement(sequenceFlow); + // 4.2 如果是路由分支，需要连接后续节点为默认路由 } else if (nodeType == BpmSimpleModelNodeType.ROUTE_BRANCH_NODE) { - // 如果是路由分支，需要连接后续节点为默认路由 SequenceFlow sequenceFlow = buildBpmnSequenceFlow(node.getId(), branchEndNodeId, node.getDefaultFlowId(), null, null); process.addFlowElement(sequenceFlow); @@ -617,10 +615,12 @@ public class SimpleModelUtils { return buildConditionExpression(node.getConditionType(), node.getConditionExpression(), node.getConditionGroups()); } + public static String buildConditionExpression(BpmSimpleModelNodeVO.RouteCondition route) { return buildConditionExpression(route.getConditionType(), route.getConditionExpression(), route.getConditionGroups()); } + public static String buildConditionExpression(Integer conditionType, String conditionExpression, ConditionGroups conditionGroups) { BpmSimpleModeConditionType conditionTypeEnum = BpmSimpleModeConditionType.valueOf(conditionType); @@ -711,6 +711,7 @@ public class SimpleModelUtils { String conditionExpression = ConditionNodeConvert.buildConditionExpression(route); return buildBpmnSequenceFlow(nodeId, route.getNodeId(), null, null, conditionExpression); } + } private static String buildGatewayJoinId(String id) {