github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

Update ExecutionJob.java (#416) 

不是子任务时，uuid是空的，需要加个判断。
pull/455/head
lj-zhu 2020-06-21 13:27:09 +08:00 committed by GitHub
parent ed715490d7
commit 157373eb8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
View File

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