From 9734e12a8689f22c949ada3535bc2391de033c14 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 16 Sep 2022 19:19:41 +0800
Subject: [PATCH] =?UTF-8?q?job=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/dal/JobLogMapper.java        |  5 +++++
 .../dal/entity/{JobLog.java => JobLogDO.java} |  2 +-
 .../proxy/server/service/JobLogService.java   | 22 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/{JobLog.java => JobLogDO.java} (98%)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java
index c5f9db0c..2d9e6d5c 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java
@@ -23,7 +23,10 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Insert;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO;
 
 /**
  *
@@ -34,4 +37,6 @@ import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 @Component
 public interface JobLogMapper extends SqlMapper {
 
+    @Insert("insert into job_log(`job_id`,`handler`,`param`,`code`,`msg`,`alarm_status`,`create_time`) values(:jobId,:handler,:param,:code,:msg,:alarmStatus,:createTime)")
+    void add(JobLogDO jobLog);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java
similarity index 98%
rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java
rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java
index 6880bf14..f54172ab 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java
@@ -38,7 +38,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @Data
 @Table("job_log")
-public class JobLog {
+public class JobLogDO {
 	@Autowired
 	private Integer id;
 	private Integer jobId;
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
index 555387f0..250300ac 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
@@ -21,11 +21,17 @@
  */
 package fun.asgc.neutrino.proxy.server.service;
 
+import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.quartz.IJobCallback;
 import fun.asgc.neutrino.core.quartz.JobInfo;
+import fun.asgc.neutrino.proxy.server.dal.JobLogMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+import java.util.Date;
 
 /**
  *
@@ -36,14 +42,30 @@ import lombok.extern.slf4j.Slf4j;
 @NonIntercept
 @Component
 public class JobLogService implements IJobCallback {
+	@Autowired
+	private JobLogMapper jobLogMapper;
 
 	@Override
 	public void executeLog(JobInfo jobInfo, Throwable throwable) {
+		Integer code = 0;
+		String msg = "";
 		if (null == throwable) {
+			msg = "执行成功";
 			log.info("job[id={},name={}]执行完毕", jobInfo.getId(), jobInfo.getName());
 		} else {
 			log.error("job[id={},name={}]执行异常", jobInfo.getId(), jobInfo.getName(), throwable);
+			msg = "执行异常:\r\n" + ExceptionUtils.getStackTrace(throwable);
+			code = -1;
 		}
+		jobLogMapper.add(new JobLogDO()
+				.setJobId(Integer.valueOf(jobInfo.getId()))
+				.setHandler(jobInfo.getName())
+				.setParam(jobInfo.getParam())
+				.setCode(code)
+				.setMsg(msg)
+				.setAlarmStatus(0)
+				.setCreateTime(new Date())
+		);
 	}
 
 }