refactor(task): 优化任务步骤执行逻辑
This commit is contained in:
@@ -178,16 +178,14 @@ public class TaskJobBean extends QuartzJobBean {
|
|||||||
* @param taskTemplateNodes 需要执行的任务节点列表
|
* @param taskTemplateNodes 需要执行的任务节点列表
|
||||||
* @param codeIdMap 节点编码与明细ID映射
|
* @param codeIdMap 节点编码与明细ID映射
|
||||||
*/
|
*/
|
||||||
private void executeTaskSteps(TaskInstanceInfoService taskInstanceInfoService,
|
private void executeTaskSteps(TaskInstanceInfoService taskInstanceInfoService, TaskInstanceDetailService taskInstanceDetailService, Long id, JobDataMap dataMap, List<TaskTemplateNodeVo> taskTemplateNodes, Map<String, Long> codeIdMap) {
|
||||||
TaskInstanceDetailService taskInstanceDetailService, Long id, JobDataMap dataMap,
|
|
||||||
List<TaskTemplateNodeVo> taskTemplateNodes, Map<String, Long> codeIdMap) {
|
|
||||||
try {
|
try {
|
||||||
boolean isTerminate = false;
|
boolean isTerminate = false;
|
||||||
for (TaskTemplateNodeVo taskTemplateNodeVo : taskTemplateNodes) {
|
for (TaskTemplateNodeVo taskTemplateNodeVo : taskTemplateNodes) {
|
||||||
String code = taskTemplateNodeVo.getCode();
|
String code = taskTemplateNodeVo.getCode();
|
||||||
while (true) {
|
while (true) {
|
||||||
TaskInstanceDetailTb currentTaskInstanceNode =
|
ThreadUtil.safeSleep(5000);
|
||||||
taskInstanceDetailService.getOneByInstanceIdAndCode(id, code);
|
TaskInstanceDetailTb currentTaskInstanceNode = taskInstanceDetailService.getOneByInstanceIdAndCode(id, code);
|
||||||
if (TaskStatusEnum.Fail.getCode().equals(currentTaskInstanceNode.getExecuteStatus())) {
|
if (TaskStatusEnum.Fail.getCode().equals(currentTaskInstanceNode.getExecuteStatus())) {
|
||||||
log.info("任务节点执行失败, instanceId={}, bizCode={}", id, code);
|
log.info("任务节点执行失败, instanceId={}, bizCode={}", id, code);
|
||||||
isTerminate = true;
|
isTerminate = true;
|
||||||
@@ -197,6 +195,7 @@ public class TaskJobBean extends QuartzJobBean {
|
|||||||
break;
|
break;
|
||||||
} else if (TaskStatusEnum.Pending.getCode().equals(currentTaskInstanceNode.getExecuteStatus())) {
|
} else if (TaskStatusEnum.Pending.getCode().equals(currentTaskInstanceNode.getExecuteStatus())) {
|
||||||
log.info("任务节点由待执行变更为执行中, instanceId={}, bizCode={}", id, code);
|
log.info("任务节点由待执行变更为执行中, instanceId={}, bizCode={}", id, code);
|
||||||
|
ThreadUtil.execAsync(() -> {
|
||||||
try {
|
try {
|
||||||
TaskStepExecutor executor = KitSpringBeanHolder.getBean("taskStep" + getBeanAlias(code));
|
TaskStepExecutor executor = KitSpringBeanHolder.getBean("taskStep" + getBeanAlias(code));
|
||||||
taskInstanceDetailService.fastStart(id, code, dataMap);
|
taskInstanceDetailService.fastStart(id, code, dataMap);
|
||||||
@@ -205,22 +204,21 @@ public class TaskJobBean extends QuartzJobBean {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("任务节点执行失败", e);
|
log.error("任务节点执行失败", e);
|
||||||
taskInstanceDetailService.fastFailWithInfo(id, code, e.getMessage());
|
taskInstanceDetailService.fastFailWithInfo(id, code, e.getMessage());
|
||||||
throw new ServerException(e);
|
|
||||||
}
|
}
|
||||||
break;
|
});
|
||||||
} else if (TaskStatusEnum.Running.getCode().equals(currentTaskInstanceNode.getExecuteStatus())) {
|
} else if (TaskStatusEnum.Running.getCode().equals(currentTaskInstanceNode.getExecuteStatus())) {
|
||||||
ThreadUtil.safeSleep(5000);
|
log.info("任务节点执行中, instanceId={}, bizCode={}", id, code);
|
||||||
} else {
|
} else {
|
||||||
// 处理未知状态
|
// 处理未知状态
|
||||||
log.warn("任务节点处于未知状态, instanceId={}, bizCode={}, status={}", id, code,
|
log.warn("任务节点处于未知状态, instanceId={}, bizCode={}, status={}", id, code, currentTaskInstanceNode.getExecuteStatus());
|
||||||
currentTaskInstanceNode.getExecuteStatus());
|
|
||||||
ThreadUtil.safeSleep(5000);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isTerminate) {
|
if (isTerminate) {
|
||||||
|
// 跳出任务线
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 主动终止 或者 被动退出的
|
||||||
if (isTerminate) {
|
if (isTerminate) {
|
||||||
taskInstanceInfoService.fastFailWithMessageData(id, "任务执行失败", dataMap);
|
taskInstanceInfoService.fastFailWithMessageData(id, "任务执行失败", dataMap);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user