Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm

# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
This commit is contained in:
YunaiV
2024-04-08 22:47:53 +08:00
2 changed files with 26 additions and 6 deletions

View File

@ -30,6 +30,8 @@ public enum BpmSimpleModelNodeType implements IntArrayValuable {
EXCLUSIVE_GATEWAY_NODE(4, "排他网关"), // TODO @jason是不是改成叫 条件分支?
PARALLEL_GATEWAY_FORK_NODE(5, "并行网关分叉节点"), // TODO @jason是不是一个 并行分支 ?就可以啦?
PARALLEL_GATEWAY_JOIN_NODE(6, "并行网关聚合节点"),
INCLUSIVE_GATEWAY_FORK_NODE(7, "包容网关分叉节点"),
INCLUSIVE_GATEWAY_JOIN_NODE(8, "包容网关聚合节点"),
;
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModelNodeType::getType).toArray();
@ -38,9 +40,8 @@ public enum BpmSimpleModelNodeType implements IntArrayValuable {
private final String name;
public static boolean isGatewayNode(Integer type) {
// TODO 后续增加并行网关的支持
return Objects.equals(EXCLUSIVE_GATEWAY_NODE.getType(), type)
|| Objects.equals(PARALLEL_GATEWAY_FORK_NODE.getType(), type);
return Objects.equals(EXCLUSIVE_GATEWAY_NODE.getType(), type) || Objects.equals(PARALLEL_GATEWAY_FORK_NODE.getType(), type)
|| Objects.equals(INCLUSIVE_GATEWAY_FORK_NODE.getType(), type) ;
}
public static BpmSimpleModelNodeType valueOf(Integer type) {