工作流修复

This commit is contained in:
dengqichen 2025-10-30 18:19:35 +08:00
parent b4f2a9d400
commit 97e6b30e65
8 changed files with 55 additions and 45 deletions

View File

@ -2,6 +2,8 @@ package com.qqchen.deploy.backend.workflow.delegate;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.qqchen.deploy.backend.workflow.dto.outputs.BaseNodeOutputs;
import com.qqchen.deploy.backend.workflow.enums.NodeExecutionStatusEnum;
import com.qqchen.deploy.backend.workflow.model.NodeContext; import com.qqchen.deploy.backend.workflow.model.NodeContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.DelegateExecution;
@ -21,7 +23,7 @@ import static com.qqchen.deploy.backend.workflow.constants.WorkFlowConstants.WOR
/** /**
* 任务委派者基类 * 任务委派者基类
* <p>
* 负责处理节点配置输入映射和输出结果的统一处理 * 负责处理节点配置输入映射和输出结果的统一处理
* *
* @param <I> 输入映射类型 (InputMapping) * @param <I> 输入映射类型 (InputMapping)
@ -54,6 +56,7 @@ public abstract class BaseNodeDelegate<I, O> implements JavaDelegate {
public void execute(DelegateExecution execution) { public void execute(DelegateExecution execution) {
String currentNodeId = null; String currentNodeId = null;
NodeContext<I, O> nodeContext = new NodeContext<>();
try { try {
// 1. 获取节点ID // 1. 获取节点ID
currentNodeId = getFieldValue(nodeId, execution); currentNodeId = getFieldValue(nodeId, execution);
@ -73,7 +76,7 @@ public abstract class BaseNodeDelegate<I, O> implements JavaDelegate {
O outputsObj = executeInternal(execution, configsMap, inputMappingObj); O outputsObj = executeInternal(execution, configsMap, inputMappingObj);
// 6. 使用 NodeContext 保存节点数据 // 6. 使用 NodeContext 保存节点数据
NodeContext<I, O> nodeContext = new NodeContext<>();
nodeContext.setConfigs(configsMap); nodeContext.setConfigs(configsMap);
nodeContext.setInputMapping(inputMappingObj); nodeContext.setInputMapping(inputMappingObj);
nodeContext.setOutputs(outputsObj); nodeContext.setOutputs(outputsObj);
@ -85,15 +88,17 @@ public abstract class BaseNodeDelegate<I, O> implements JavaDelegate {
setExecutionStatus(execution, WORKFLOW_NODE_EXECUTION_STATE_SUCCESS); setExecutionStatus(execution, WORKFLOW_NODE_EXECUTION_STATE_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
BaseNodeOutputs failureNodeOutputs = new BaseNodeOutputs();
failureNodeOutputs.setStatus(NodeExecutionStatusEnum.FAILURE);
nodeContext.setOutputs((O) failureNodeOutputs);
execution.setVariable(currentNodeId, nodeContext.toMap(objectMapper));
// 设置失败状态
setExecutionStatus(execution, WORKFLOW_NODE_EXECUTION_STATE_FAILURE); setExecutionStatus(execution, WORKFLOW_NODE_EXECUTION_STATE_FAILURE);
log.error("Task execution failed", e);
log.error("Node execution failed: {}", currentNodeId, e);
throw new RuntimeException("Node execution failed: " + currentNodeId, e);
} }
} }
/** /**
* 执行具体的业务逻辑子类实现 * 执行具体的业务逻辑子类实现
* *
* @param execution Flowable执行上下文 * @param execution Flowable执行上下文

View File

@ -4,6 +4,7 @@ import com.qqchen.deploy.backend.deploy.entity.ExternalSystem;
import com.qqchen.deploy.backend.deploy.entity.JenkinsJob; import com.qqchen.deploy.backend.deploy.entity.JenkinsJob;
import com.qqchen.deploy.backend.deploy.enums.JenkinsBuildStatus; import com.qqchen.deploy.backend.deploy.enums.JenkinsBuildStatus;
import com.qqchen.deploy.backend.deploy.integration.IJenkinsServiceIntegration; import com.qqchen.deploy.backend.deploy.integration.IJenkinsServiceIntegration;
import com.qqchen.deploy.backend.deploy.integration.response.JenkinsBuildResponse;
import com.qqchen.deploy.backend.deploy.integration.response.JenkinsQueueBuildInfoResponse; import com.qqchen.deploy.backend.deploy.integration.response.JenkinsQueueBuildInfoResponse;
import com.qqchen.deploy.backend.deploy.repository.IExternalSystemRepository; import com.qqchen.deploy.backend.deploy.repository.IExternalSystemRepository;
import com.qqchen.deploy.backend.deploy.repository.IJenkinsJobRepository; import com.qqchen.deploy.backend.deploy.repository.IJenkinsJobRepository;
@ -76,8 +77,7 @@ public class JenkinsBuildDelegate extends BaseNodeDelegate<JenkinsBuildInputMapp
JenkinsBuildStatus buildStatus = pollBuildStatus(externalSystem, jobName, buildInfo.getBuildNumber()); JenkinsBuildStatus buildStatus = pollBuildStatus(externalSystem, jobName, buildInfo.getBuildNumber());
// 5. 获取构建详细信息包括 duration, changeSets, artifacts // 5. 获取构建详细信息包括 duration, changeSets, artifacts
com.qqchen.deploy.backend.deploy.integration.response.JenkinsBuildResponse buildDetails = JenkinsBuildResponse buildDetails = jenkinsServiceIntegration.getBuildDetails(externalSystem, jobName, buildInfo.getBuildNumber());
jenkinsServiceIntegration.getBuildDetails(externalSystem, jobName, buildInfo.getBuildNumber());
// 打印调试信息 // 打印调试信息
log.info("Build details - changeSets: {}, artifacts: {}", log.info("Build details - changeSets: {}, artifacts: {}",

View File

@ -1,6 +1,7 @@
package com.qqchen.deploy.backend.workflow.dto.outputs; package com.qqchen.deploy.backend.workflow.dto.outputs;
import com.qqchen.deploy.backend.workflow.enums.ApprovalResultEnum; import com.qqchen.deploy.backend.workflow.enums.ApprovalResultEnum;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

View File

@ -1,6 +1,7 @@
package com.qqchen.deploy.backend.workflow.dto.outputs; package com.qqchen.deploy.backend.workflow.dto.outputs;
import com.qqchen.deploy.backend.workflow.enums.NodeExecutionStatusEnum; import com.qqchen.deploy.backend.workflow.enums.NodeExecutionStatusEnum;
import lombok.Builder;
import lombok.Data; import lombok.Data;
/** /**

View File

@ -1,5 +1,6 @@
package com.qqchen.deploy.backend.workflow.dto.outputs; package com.qqchen.deploy.backend.workflow.dto.outputs;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

View File

@ -1,5 +1,6 @@
package com.qqchen.deploy.backend.workflow.dto.outputs; package com.qqchen.deploy.backend.workflow.dto.outputs;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

View File

@ -1,5 +1,6 @@
package com.qqchen.deploy.backend.workflow.dto.outputs; package com.qqchen.deploy.backend.workflow.dto.outputs;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;