From 58803ebadce4edb97a6d2ace6688fc2158944fa3 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sun, 4 Sep 2022 21:07:35 +0800 Subject: [PATCH] =?UTF-8?q?job=E8=A1=A8=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/quartz/DefaultJobSource.java | 2 +- .../asgc/neutrino/core/quartz/IJobSource.java | 2 +- .../neutrino/core/quartz/JobExecutor.java | 2 +- ...bQrtzTriggerInfoDO.java => JobInfoDO.java} | 12 ++--- .../{JobQrtzTriggerLog.java => JobLog.java} | 8 ++-- .../src/main/resources/sql/init-structure.sql | 44 +++++++++---------- 6 files changed, 35 insertions(+), 35 deletions(-) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/{JobQrtzTriggerInfoDO.java => JobInfoDO.java} (90%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/{JobQrtzTriggerLog.java => JobLog.java} (92%) diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/DefaultJobSource.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/DefaultJobSource.java index cb2906a8..afbe005c 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/DefaultJobSource.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/DefaultJobSource.java @@ -37,7 +37,7 @@ import java.util.List; public class DefaultJobSource implements IJobSource { @Override - public List list() { + public List sourceList() { List jobHandlerList = BeanManager.getBeanListBySuperClass(IJobHandler.class); if (CollectionUtil.isEmpty(jobHandlerList)) { return Lists.newArrayList(); diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/IJobSource.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/IJobSource.java index 6fcd28b5..e399fb44 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/IJobSource.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/IJobSource.java @@ -34,5 +34,5 @@ public interface IJobSource { * 获取所有job列表 * @return */ - List list(); + List sourceList(); } diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java index 26802a01..08a35f4b 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java @@ -98,7 +98,7 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor { @Override public void init() throws JobException { - List jobInfoList = jobSource.list(); + List jobInfoList = jobSource.sourceList(); if (CollectionUtil.isEmpty(jobInfoList)) { return; } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobQrtzTriggerInfoDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java similarity index 90% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobQrtzTriggerInfoDO.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java index ca5a8b76..cb1c3577 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobQrtzTriggerInfoDO.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java @@ -37,16 +37,16 @@ import java.util.Date; @ToString @Accessors(chain = true) @Data -@Table("job_qrtz_trigger_info") -public class JobQrtzTriggerInfoDO { +@Table("job_info") +public class JobInfoDO { @Id private Integer id; - private String jobCron; - private String jobDesc; + private String cron; + private String desc; private String alarmEmail; private String alarmDing; - private String executorHandler; - private String executorParam; + private String handler; + private String param; /** * 启用状态 * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobQrtzTriggerLog.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobQrtzTriggerLog.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java index e9a536c3..6880bf14 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobQrtzTriggerLog.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java @@ -37,13 +37,13 @@ import java.util.Date; @ToString @Accessors(chain = true) @Data -@Table("job_qrtz_trigger_log") -public class JobQrtzTriggerLog { +@Table("job_log") +public class JobLog { @Autowired private Integer id; private Integer jobId; - private String executorHandler; - private String executorParam; + private String handler; + private String param; private Integer code; private String msg; private Integer alarmStatus; diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql index 69ff4ede..e83e5f96 100644 --- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql +++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql @@ -74,8 +74,8 @@ CREATE TABLE IF NOT EXISTS `client_connect_record` ( `ip` VARCHAR(50) NOT NULL, `license_id` INTEGER(20) NOT NULL, `license_key` VARCHAR(100) NOT NULL, - `write_bytes` INTEGER(20), - `read_bytes` INTEGER(20), + `write_bytes` INTEGER(20) DEFAULT NULL, + `read_bytes` INTEGER(20) DEFAULT NULL, `type` INTEGER(2) NOT NULL, `create_time` INTEGER(20) NOT NULL ); @@ -90,38 +90,38 @@ CREATE TABLE IF NOT EXISTS `user_connect_record` ( `user_id` INTEGER NOT NULL, `license_id` INTEGER(20) NOT NULL, `license_key` VARCHAR(100) NOT NULL, - `write_bytes` INTEGER(20), - `read_bytes` INTEGER(20), + `write_bytes` INTEGER(20) DEFAULT NULL, + `read_bytes` INTEGER(20) DEFAULT NULL, `type` INTEGER(2) NOT NULL, `create_time` INTEGER(20) NOT NULL ); #############################调度管理相关表############################# #触发器信息表 -CREATE TABLE IF NOT EXISTS `job_qrtz_trigger_info` ( +CREATE TABLE IF NOT EXISTS `job_info` ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - `job_cron` VARCHAR(128) NOT NULL , - `job_desc` VARCHAR(255) NOT NULL, + `desc` VARCHAR(255) NOT NULL, + `handler` VARCHAR(255) DEFAULT NULL, + `cron` VARCHAR(128) NOT NULL , + `param` VARCHAR(512) DEFAULT NULL, + `alarm_email` VARCHAR(255) DEFAULT NULL, + `alarm_ding` VARCHAR(255) DEFAULT NULL, + `enable` INTEGER(2) NOT NULL, `create_time` INTEGER(20) NOT NULL, - `update_time` INTEGER(20) NOT NULL, - `alarm_email` VARCHAR(255), - `alarm_ding` VARCHAR(255), - `executor_handler` VARCHAR(255) DEFAULT NULL, - `executor_param` VARCHAR(512) DEFAULT NULL, - `enable` INTEGER(2) NOT NULL + `update_time` INTEGER(20) NOT NULL ); -CREATE UNIQUE INDEX IF NOT EXISTS I_executor_handler ON `job_qrtz_trigger_info` (`executor_handler` ASC); +CREATE UNIQUE INDEX IF NOT EXISTS I_handler ON `job_info` (`handler` ASC); #触发器日志表 -CREATE TABLE IF NOT EXISTS `job_qrtz_trigger_log` ( +CREATE TABLE IF NOT EXISTS `job_log` ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, `job_id` INTEGER(20) NOT NULL, - `executor_handler` VARCHAR(255) NOT NULL, - `executor_param` VARCHAR(512) DEFAULT NULL, - `create_time` INTEGER(20) NOT NULL, + `handler` VARCHAR(255) NOT NULL, + `param` VARCHAR(512) DEFAULT NULL, `code` INTEGER(20) NOT NULL, - `msg` TEXT, - `alarm_status` INTEGER(2) NOT NULL DEFAULT '0' + `msg` TEXT DEFAULT NULL, + `alarm_status` INTEGER(2) NOT NULL DEFAULT '0', + `create_time` INTEGER(20) NOT NULL ); -CREATE INDEX IF NOT EXISTS I_create_time ON job_qrtz_trigger_log(create_time); -CREATE INDEX IF NOT EXISTS I_code ON job_qrtz_trigger_log(code); +CREATE INDEX IF NOT EXISTS I_create_time ON job_log(create_time); +CREATE INDEX IF NOT EXISTS I_code ON job_log(code);