From 157373eb8bed1cea2d20224997c5a658d547e736 Mon Sep 17 00:00:00 2001
From: lj-zhu <54331324@qq.com>
Date: Sun, 21 Jun 2020 13:27:09 +0800
Subject: [PATCH] Update ExecutionJob.java (#416)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

不是子任务时，uuid是空的，需要加个判断。
---
 .../me/zhengjie/modules/quartz/utils/ExecutionJob.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
index e79193f8..380f5cf9 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
@@ -54,6 +54,8 @@ public class ExecutionJob extends QuartzJobBean {
         QuartzLogRepository quartzLogRepository = SpringContextHolder.getBean(QuartzLogRepository.class);
         QuartzJobService quartzJobService = SpringContextHolder.getBean(QuartzJobService.class);
         RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
+        
+        String uuid = quartzJob.getUuid();
 
         QuartzLog log = new QuartzLog();
         log.setJobName(quartzJob.getJobName());
@@ -72,7 +74,9 @@ public class ExecutionJob extends QuartzJobBean {
             future.get();
             long times = System.currentTimeMillis() - startTime;
             log.setTime(times);
-            redisUtils.set(quartzJob.getUuid(), true);
+            if(StringUtils.isNotBlank(uuid)) {
+                redisUtils.set(uuid, true);
+            }
             // 任务状态
             log.setIsSuccess(true);
             System.out.println("任务执行完毕，任务名称：" + quartzJob.getJobName() + ", 执行时间：" + times + "毫秒");
@@ -84,7 +88,9 @@ public class ExecutionJob extends QuartzJobBean {
                 quartzJobService.executionSubJob(tasks);
             }
         } catch (Exception e) {
-            redisUtils.set(quartzJob.getUuid(), false);
+            if(StringUtils.isNotBlank(uuid)) {
+                redisUtils.set(uuid, false);
+            }
             System.out.println("任务执行失败，任务名称：" + quartzJob.getJobName());
             System.out.println("--------------------------------------------------------------");
             long times = System.currentTimeMillis() - startTime;