feat(sj_1.1.0-beta2): 透传配置的工作流上下文至批次中
This commit is contained in:
parent
2e240fe89a
commit
daf563a163
@ -53,4 +53,9 @@ public class WorkflowPartitionTaskDTO extends PartitionTask {
|
|||||||
*/
|
*/
|
||||||
private String flowInfo;
|
private String flowInfo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 工作流上下文
|
||||||
|
*/
|
||||||
|
private String wfContext;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -73,4 +73,9 @@ public class WorkflowTaskPrepareDTO {
|
|||||||
* 仅做超时检测
|
* 仅做超时检测
|
||||||
*/
|
*/
|
||||||
private boolean onlyTimeoutCheck;
|
private boolean onlyTimeoutCheck;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 工作流上下文
|
||||||
|
*/
|
||||||
|
private String wfContext;
|
||||||
}
|
}
|
||||||
|
@ -134,7 +134,7 @@ public class ScanWorkflowTaskActor extends AbstractActor {
|
|||||||
new LambdaQueryWrapper<Workflow>()
|
new LambdaQueryWrapper<Workflow>()
|
||||||
.select(Workflow::getId, Workflow::getGroupName, Workflow::getNextTriggerAt, Workflow::getTriggerType,
|
.select(Workflow::getId, Workflow::getGroupName, Workflow::getNextTriggerAt, Workflow::getTriggerType,
|
||||||
Workflow::getTriggerInterval, Workflow::getExecutorTimeout, Workflow::getNamespaceId,
|
Workflow::getTriggerInterval, Workflow::getExecutorTimeout, Workflow::getNamespaceId,
|
||||||
Workflow::getFlowInfo, Workflow::getBlockStrategy)
|
Workflow::getFlowInfo, Workflow::getBlockStrategy, Workflow::getWfContext)
|
||||||
.eq(Workflow::getWorkflowStatus, StatusEnum.YES.getStatus())
|
.eq(Workflow::getWorkflowStatus, StatusEnum.YES.getStatus())
|
||||||
.eq(Workflow::getDeleted, StatusEnum.NO.getStatus())
|
.eq(Workflow::getDeleted, StatusEnum.NO.getStatus())
|
||||||
.in(Workflow::getBucketIndex, scanTask.getBuckets())
|
.in(Workflow::getBucketIndex, scanTask.getBuckets())
|
||||||
|
@ -55,6 +55,7 @@ public class WorkflowTaskPrepareActor extends AbstractActor {
|
|||||||
// 终态任务
|
// 终态任务
|
||||||
if (workflowPrePareHandler.matches(null)) {
|
if (workflowPrePareHandler.matches(null)) {
|
||||||
workflowPrePareHandler.handler(workflowTaskPrepareDTO);
|
workflowPrePareHandler.handler(workflowTaskPrepareDTO);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -34,6 +34,7 @@ public class WorkflowBatchGenerator {
|
|||||||
WorkflowTaskBatch workflowTaskBatch = WorkflowTaskConverter.INSTANCE.toWorkflowTaskBatch(context);
|
WorkflowTaskBatch workflowTaskBatch = WorkflowTaskConverter.INSTANCE.toWorkflowTaskBatch(context);
|
||||||
workflowTaskBatch.setTaskBatchStatus(Optional.ofNullable(context.getTaskBatchStatus()).orElse(JobTaskBatchStatusEnum.WAITING.getStatus()));
|
workflowTaskBatch.setTaskBatchStatus(Optional.ofNullable(context.getTaskBatchStatus()).orElse(JobTaskBatchStatusEnum.WAITING.getStatus()));
|
||||||
workflowTaskBatch.setOperationReason(context.getOperationReason());
|
workflowTaskBatch.setOperationReason(context.getOperationReason());
|
||||||
|
workflowTaskBatch.setWfContext(context.getWfContext());
|
||||||
|
|
||||||
Assert.isTrue(1 == workflowTaskBatchMapper.insert(workflowTaskBatch), () -> new SnailJobServerException("新增调度任务失败. [{}]", context.getWorkflowId()));
|
Assert.isTrue(1 == workflowTaskBatchMapper.insert(workflowTaskBatch), () -> new SnailJobServerException("新增调度任务失败. [{}]", context.getWorkflowId()));
|
||||||
|
|
||||||
|
@ -47,5 +47,10 @@ public class WorkflowTaskBatchGeneratorContext {
|
|||||||
*/
|
*/
|
||||||
private String flowInfo;
|
private String flowInfo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 工作流上下文
|
||||||
|
*/
|
||||||
|
private String wfContext;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user