szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【功能评审】Bpm：将 routerDefaultFlowId 重命名，更好理解

This commit is contained in:
YunaiV 2025-01-20 09:18:59 +08:00
parent 5c5448b959
commit c4fcd0564c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
View File

@ -112,8 +112,8 @@ public class BpmSimpleModelNodeVO {
@Schema(description = "路由分支组", example = "[]")
private List<RouterSetting> routerGroups;
@Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true
private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
@Schema(description = "路由分支默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true
private String routerDefaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
@Schema(description = "任务监听器")
@Valid

6
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
View File

@ -233,7 +233,7 @@ public class SimpleModelUtils {
process.addFlowElement(sequenceFlow);
// 4.2 如果是路由分支，需要连接后续节点为默认路由
} else if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) {
SequenceFlow sequenceFlow = buildBpmnSequenceFlow(node.getId(), branchEndNodeId, node.getDefaultFlowId(),
SequenceFlow sequenceFlow = buildBpmnSequenceFlow(node.getId(), branchEndNodeId, node.getRouterDefaultFlowId(),
null, null);
process.addFlowElement(sequenceFlow);
}
@ -719,8 +719,8 @@ public class SimpleModelUtils {
exclusiveGateway.setId(node.getId());
// 设置默认的序列流（条件）
node.setDefaultFlowId("Flow_" + IdUtil.fastUUID());
exclusiveGateway.setDefaultFlow(node.getDefaultFlowId());
node.setRouterDefaultFlowId("Flow_" + IdUtil.fastUUID());
exclusiveGateway.setDefaultFlow(node.getRouterDefaultFlowId());
return exclusiveGateway;
}