From 9b92bacd86778c88cb8cba09ebf45d96d0d8f05a Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Wed, 23 Oct 2024 14:59:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20job=20=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asw/module/runner/job/JobPlaybookExecResultChecker.java   | 1 +
 .../net/geedge/asw/module/runner/job/JobPlaybookExecutor.java | 4 ++--
 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;
                     }