From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java
index bfa06db..b186708 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/GenerateWeekDaysJob.java
@@ -3,15 +3,18 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.mdc.service.IMdcVacationManagementService;
+import org.jeecg.modules.mdc.util.ThrowableUtil;
import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecg.modules.quartz.entity.SysQuartzLog;
import org.jeecg.modules.quartz.service.IQuartzJobService;
import org.jeecg.modules.quartz.service.ISysQuartzLogService;
+import org.jeecg.modules.system.service.ISysAnnouncementService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -32,9 +35,13 @@
@Resource
private IQuartzJobService quartzJobService;
+ @Resource
+ private ISysAnnouncementService sysAnnouncementService;
+
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
SysQuartzLog quartzLog = new SysQuartzLog();
+ quartzLog.setCreateTime(new Date());
List<QuartzJob> byJobClassName = this.quartzJobService.findByJobClassName(this.getClass().getName());
if (byJobClassName != null && !byJobClassName.isEmpty()) {
quartzLog.setJobId(byJobClassName.get(0).getId());
@@ -46,7 +53,9 @@
quartzLog.setIsSuccess(0);
} catch (Exception e) {
quartzLog.setIsSuccess(-1);
- quartzLog.setExceptionDetail(e.toString());
+ quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
+ // 鍙戦�佹秷鎭�氱煡
+ sysAnnouncementService.jobSendMessage("瀹氭椂鐢熸垚鍙屼紤鏃ヤ换鍔�", quartzLog.getExceptionDetail());
}
long endTime = System.currentTimeMillis();
quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
--
Gitblit v1.9.3