From 32024245ee6dffd5d2b147ce4f8f0eda5dc3f398 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 13 Mar 2019 20:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=B9=B6=E5=8F=91=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/ExceptionUtil.java | 1 - .../java/com/ruoyi/quartz/controller/SysJobController.java | 2 +- .../src/main/java/com/ruoyi/quartz/domain/SysJob.java | 1 + .../src/main/java/com/ruoyi/quartz/domain/SysJobLog.java | 3 --- .../src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java | 5 ----- sql/ry_20190313.sql | 4 ++-- 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java index 5ca4cb85..4ca52838 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java @@ -11,7 +11,6 @@ import org.apache.commons.lang3.exception.ExceptionUtils; */ public class ExceptionUtil { - /** * 获取exception的详细错误信息。 */ diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java index 3318f72a..1fb40595 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -123,7 +123,7 @@ public class SysJobController extends BaseController @RequiresPermissions("monitor:job:add") @PostMapping("/add") @ResponseBody - public AjaxResult addSave(SysJob job) throws Exception + public AjaxResult addSave(SysJob job) throws SchedulerException, TaskException { return toAjax(jobService.insertJobCron(job)); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java index be66d2e3..de10afd8 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java @@ -48,6 +48,7 @@ public class SysJob extends BaseEntity implements Serializable private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; /** 是否并发执行（0允许 1禁止） */ + @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止") private String concurrent; /** 任务状态（0正常 1暂停） */ diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java index 290b3493..9356629c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java @@ -3,7 +3,6 @@ package com.ruoyi.quartz.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; @@ -49,11 +48,9 @@ public class SysJobLog extends BaseEntity private String exceptionInfo; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; public Long getJobLogId() diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java index 3a867404..c126951d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java @@ -33,11 +33,6 @@ public class JobInvokeUtil * @param bean 目标对象 * @param methodName 方法名称 * @param methodParams 方法参数 - * @throws InvocationTargetException - * @throws SecurityException - * @throws NoSuchMethodException - * @throws IllegalArgumentException - * @throws IllegalAccessException */ private static void invokeSpringBean(Object bean, String methodName, String methodParams) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, diff --git a/sql/ry_20190313.sql b/sql/ry_20190313.sql index e6ee374a..13750c57 100644 --- a/sql/ry_20190313.sql +++ b/sql/ry_20190313.sql @@ -406,7 +406,7 @@ create table sys_oper_log ( oper_url varchar(255) default '' comment '请求URL', oper_ip varchar(50) default '' comment '主机地址', oper_location varchar(255) default '' comment '操作地点', - oper_param varchar(255) default '' comment '请求参数', + oper_param varchar(2000) default '' comment '请求参数', status int(1) default 0 comment '操作状态（0正常 1异常）', error_msg varchar(2000) default '' comment '错误消息', oper_time datetime comment '操作时间', @@ -568,7 +568,7 @@ create table sys_job ( method_params varchar(50) default null comment '方法参数', cron_expression varchar(255) default '' comment 'cron执行表达式', misfire_policy varchar(20) default '3' comment '计划执行错误策略（1立即执行 2执行一次 3放弃执行）', - concurrent char default '1' comment '是否并发执行（0允许 1禁止）', + concurrent char(1) default '1' comment '是否并发执行（0允许 1禁止）', status char(1) default '0' comment '状态（0正常 1暂停）', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间',