Commit c4fcd0564c1308192a39b7df10bed444e64c141e

Authored by YunaiV
1 parent 5c5448b9

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

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
@@ -112,8 +112,8 @@ public class BpmSimpleModelNodeVO { @@ -112,8 +112,8 @@ public class BpmSimpleModelNodeVO {
112 @Schema(description = "路由分支组", example = "[]") 112 @Schema(description = "路由分支组", example = "[]")
113 private List<RouterSetting> routerGroups; 113 private List<RouterSetting> routerGroups;
114 114
115 - @Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成,所以 hidden = true  
116 - private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE 115 + @Schema(description = "路由分支默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成,所以 hidden = true
  116 + private String routerDefaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
117 117
118 @Schema(description = "任务监听器") 118 @Schema(description = "任务监听器")
119 @Valid 119 @Valid
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
@@ -233,7 +233,7 @@ public class SimpleModelUtils { @@ -233,7 +233,7 @@ public class SimpleModelUtils {
233 process.addFlowElement(sequenceFlow); 233 process.addFlowElement(sequenceFlow);
234 // 4.2 如果是路由分支,需要连接后续节点为默认路由 234 // 4.2 如果是路由分支,需要连接后续节点为默认路由
235 } else if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) { 235 } else if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) {
236 - SequenceFlow sequenceFlow = buildBpmnSequenceFlow(node.getId(), branchEndNodeId, node.getDefaultFlowId(), 236 + SequenceFlow sequenceFlow = buildBpmnSequenceFlow(node.getId(), branchEndNodeId, node.getRouterDefaultFlowId(),
237 null, null); 237 null, null);
238 process.addFlowElement(sequenceFlow); 238 process.addFlowElement(sequenceFlow);
239 } 239 }
@@ -719,8 +719,8 @@ public class SimpleModelUtils { @@ -719,8 +719,8 @@ public class SimpleModelUtils {
719 exclusiveGateway.setId(node.getId()); 719 exclusiveGateway.setId(node.getId());
720 720
721 // 设置默认的序列流(条件) 721 // 设置默认的序列流(条件)
722 - node.setDefaultFlowId("Flow_" + IdUtil.fastUUID());  
723 - exclusiveGateway.setDefaultFlow(node.getDefaultFlowId()); 722 + node.setRouterDefaultFlowId("Flow_" + IdUtil.fastUUID());
  723 + exclusiveGateway.setDefaultFlow(node.getRouterDefaultFlowId());
724 return exclusiveGateway; 724 return exclusiveGateway;
725 } 725 }
726 726