GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(1.3.0-beta1.1): 修复工作流构建错误问题

Browse Source
This commit is contained in:
opensnail 2025-01-01 12:27:30 +08:00
parent 3a24d28bf3
commit c6c8c5bb80
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java
View File

@ -129,17 +129,21 @@ public class WorkflowHandler {
* @param graph 图 * @param graph 图
* @param version 版本号 * @param version 版本号
*/ */
public void buildGraph(List<Long> parentIds, LinkedBlockingDeque<Long> deque, public void buildGraph(List<Long> parentIds, LinkedBlockingDeque<Long> deque, String groupName, Long workflowId,
String groupName, Long workflowId,
WorkflowRequestVO.NodeConfig nodeConfig, MutableGraph<Long> graph, Integer version) { WorkflowRequestVO.NodeConfig nodeConfig, MutableGraph<Long> graph, Integer version) {
if (Objects.isNull(nodeConfig)) { if (Objects.isNull(nodeConfig)) {
return; return;
} }
LinkedBlockingDeque<Long> tempDeque = null;
// 获取节点信息 // 获取节点信息
List<WorkflowRequestVO.NodeInfo> conditionNodes = nodeConfig.getConditionNodes(); List<WorkflowRequestVO.NodeInfo> conditionNodes = nodeConfig.getConditionNodes();
if (CollUtil.isNotEmpty(conditionNodes)) { if (CollUtil.isNotEmpty(conditionNodes)) {
// 一定存在汇合的子节点
if (Objects.nonNull(nodeConfig.getChildNode())) {
tempDeque = new LinkedBlockingDeque<>();
}
conditionNodes = conditionNodes.stream() conditionNodes = conditionNodes.stream()
.sorted(Comparator.comparing(WorkflowRequestVO.NodeInfo::getPriorityLevel)) .sorted(Comparator.comparing(WorkflowRequestVO.NodeInfo::getPriorityLevel))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -186,24 +190,35 @@ public class WorkflowHandler {
} }
WorkflowRequestVO.NodeConfig childNode = nodeInfo.getChildNode(); WorkflowRequestVO.NodeConfig childNode = nodeInfo.getChildNode();
if (Objects.nonNull(childNode) && CollUtil.isNotEmpty(childNode.getConditionNodes())) { if (Objects.nonNull(childNode) && CollUtil.isNotEmpty(childNode.getConditionNodes())) {
buildGraph(Lists.newArrayList(workflowNode.getId()), deque, groupName, workflowId, childNode, buildGraph(Lists.newArrayList(workflowNode.getId()),
graph, version); tempDeque,
groupName, workflowId, childNode, graph, version);
} else { } else {
if (WorkflowNodeTypeEnum.DECISION.getType() == nodeConfig.getNodeType()) { if (WorkflowNodeTypeEnum.DECISION.getType() == nodeConfig.getNodeType()) {
throw new SnailJobServerException("决策节点或者决策节点的后继节点不能作为叶子节点"); throw new SnailJobServerException("决策节点或者决策节点的后继节点不能作为叶子节点");
} }
// 叶子节点记录一下 // 若当前节点无子任何子节点记录一下, 后续存在公共子节点时需要用到
if (Objects.nonNull(tempDeque)) {
tempDeque.add(workflowNode.getId());
} else {
// 当前节点无汇合的子节点放到公共的队列
deque.add(workflowNode.getId()); deque.add(workflowNode.getId());
} }
}
} }
} }
WorkflowRequestVO.NodeConfig childNode = nodeConfig.getChildNode(); WorkflowRequestVO.NodeConfig childNode = nodeConfig.getChildNode();
// 如果存在公共子节点则在这里处理
if (Objects.nonNull(childNode) && CollUtil.isNotEmpty(childNode.getConditionNodes())) { if (Objects.nonNull(childNode) && CollUtil.isNotEmpty(childNode.getConditionNodes())) {
// 应该是conditionNodes里面叶子节点的选择 // 是conditionNodes里面叶子节点的
List<Long> list = Lists.newArrayList(); List<Long> list = Lists.newArrayList();
deque.drainTo(list); if (Objects.nonNull(tempDeque)) {
tempDeque.drainTo(list);
}
buildGraph(list, deque, groupName, workflowId, childNode, graph, version); buildGraph(list, deque, groupName, workflowId, childNode, graph, version);
} }
} }