diff --git a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java index d652866..f01cf90 100644 --- a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java +++ b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java @@ -118,6 +118,7 @@ public class JobPlaybookExecResultChecker extends QuartzJobBean { if (!RunnerConstant.JobStatus.RUNNING.getValue().equals(status)) { job.setStatus(RunnerConstant.JobStatus.FAILED.getValue()); job.setUpdateTimestamp(System.currentTimeMillis()); + job.setEndTimestamp(System.currentTimeMillis()); jobService.updateById(job); Constants.PLAYBOOK_EXECUTOR_RESULT.remove(tid); } diff --git a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java index dd96d35..58ee133 100644 --- a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java +++ b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java @@ -67,14 +67,14 @@ public class JobPlaybookExecutor extends QuartzJobBean { @Transactional(rollbackFor = Exception.class) public void playbookExecutor() { - List list = jobService.list(new LambdaQueryWrapper().eq(JobEntity::getStatus, "create")); + List list = jobService.list(new LambdaQueryWrapper().eq(JobEntity::getStatus, RunnerConstant.JobStatus.CREATED.getValue())); Map> jobByEnvList = list.stream().collect(Collectors.groupingBy(JobEntity::getEnvId)); for (Map.Entry> jobByEnv : jobByEnvList.entrySet()) { String envId = jobByEnv.getKey(); List jobList = jobByEnv.getValue(); Thread.ofVirtual().start(() -> { for (JobEntity job : jobList) { - List JobRunList = jobService.list(new LambdaQueryWrapper().eq(JobEntity::getStatus, "running").eq(JobEntity::getEnvId, envId)); + List JobRunList = jobService.list(new LambdaQueryWrapper().eq(JobEntity::getStatus, RunnerConstant.JobStatus.RUNNING.getValue()).eq(JobEntity::getEnvId, envId)); if (T.CollUtil.isNotEmpty(JobRunList)) { continue; }