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

fix: 重命名RouterCondition->RouterSetting

This commit is contained in:
Lesan 2025-01-20 08:39:37 +08:00
parent d36fc98f01
commit e55be75357
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

@ -110,7 +110,7 @@ public class BpmSimpleModelNodeVO {
private ConditionSetting conditionSetting; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE private ConditionSetting conditionSetting; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE
@Schema(description = "路由分支组", example = "[]") @Schema(description = "路由分支组", example = "[]")
private List<RouterCondition> routerGroups; private List<RouterSetting> routerGroups;
@Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true @Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true
private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
@ -301,7 +301,7 @@ public class BpmSimpleModelNodeVO {
@Schema(description = "路由分支") @Schema(description = "路由分支")
@Data @Data
@Valid @Valid
public static class RouterCondition { public static class RouterSetting {
@Schema(description = "节点 Id", example = "Activity_xxx") // 跳转到该节点 @Schema(description = "节点 Id", example = "Activity_xxx") // 跳转到该节点
@NotEmpty(message = "节点 Id 不能为空") @NotEmpty(message = "节点 Id 不能为空")

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

@ -200,7 +200,7 @@ public class SimpleModelUtils {
// 3. 遍历分支节点 // 3. 遍历分支节点
if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) { if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) {
// 路由分支遍历 // 路由分支遍历
for (BpmSimpleModelNodeVO.RouterCondition router : node.getRouterGroups()) { for (BpmSimpleModelNodeVO.RouterSetting router : node.getRouterGroups()) {
SequenceFlow sequenceFlow = RouteBranchNodeConvert.buildSequenceFlow(node.getId(), router); SequenceFlow sequenceFlow = RouteBranchNodeConvert.buildSequenceFlow(node.getId(), router);
process.addFlowElement(sequenceFlow); process.addFlowElement(sequenceFlow);
} }
@ -637,7 +637,7 @@ public class SimpleModelUtils {
node.getConditionSetting().getConditionGroups()); node.getConditionSetting().getConditionGroups());
} }
public static String buildConditionExpression(BpmSimpleModelNodeVO.RouterCondition router) { public static String buildConditionExpression(BpmSimpleModelNodeVO.RouterSetting router) {
return buildConditionExpression(router.getConditionType(), router.getConditionExpression(), return buildConditionExpression(router.getConditionType(), router.getConditionExpression(),
router.getConditionGroups()); router.getConditionGroups());
} }
@ -729,7 +729,7 @@ public class SimpleModelUtils {
return BpmSimpleModelNodeType.ROUTER_BRANCH_NODE; return BpmSimpleModelNodeType.ROUTER_BRANCH_NODE;
} }
public static SequenceFlow buildSequenceFlow(String nodeId, BpmSimpleModelNodeVO.RouterCondition router) { public static SequenceFlow buildSequenceFlow(String nodeId, BpmSimpleModelNodeVO.RouterSetting router) {
String conditionExpression = ConditionNodeConvert.buildConditionExpression(router); String conditionExpression = ConditionNodeConvert.buildConditionExpression(router);
return buildBpmnSequenceFlow(nodeId, router.getNodeId(), null, null, conditionExpression); return buildBpmnSequenceFlow(nodeId, router.getNodeId(), null, null, conditionExpression);
} }