fix: 调整 job 定时任务

2 files changed, 3 insertions, 2 deletions

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<JobEntity> list = jobService.list(new LambdaQueryWrapper<JobEntity>().eq(JobEntity::getStatus, "create"));
+        List<JobEntity> list = jobService.list(new LambdaQueryWrapper<JobEntity>().eq(JobEntity::getStatus, RunnerConstant.JobStatus.CREATED.getValue()));
         Map<String, List<JobEntity>> jobByEnvList = list.stream().collect(Collectors.groupingBy(JobEntity::getEnvId));
         for (Map.Entry<String, List<JobEntity>> jobByEnv : jobByEnvList.entrySet()) {
             String envId = jobByEnv.getKey();
             List<JobEntity> jobList = jobByEnv.getValue();
             Thread.ofVirtual().start(() -> {
                 for (JobEntity job : jobList) {
-                    List<JobEntity> JobRunList = jobService.list(new LambdaQueryWrapper<JobEntity>().eq(JobEntity::getStatus, "running").eq(JobEntity::getEnvId, envId));
+                    List<JobEntity> JobRunList = jobService.list(new LambdaQueryWrapper<JobEntity>().eq(JobEntity::getStatus, RunnerConstant.JobStatus.RUNNING.getValue()).eq(JobEntity::getEnvId, envId));
                     if (T.CollUtil.isNotEmpty(JobRunList)) {
                         continue;
                     }