From ca8056883790f8a216ef52a9ec88406108e4795c Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 21 Mar 2026 22:20:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=A4=BA&?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/job/domain/SysJobLog.java | 17 +- .../com/ruoyi/job/util/AbstractQuartzJob.java | 6 +- .../resources/mapper/job/SysJobLogMapper.xml | 8 +- .../resources/mapper/job/SysJobMapper.xml | 2 +- ruoyi-ui/src/views/monitor/job/detail.vue | 197 ++++++++++++++++++ ruoyi-ui/src/views/monitor/job/index.vue | 190 +++++++---------- ruoyi-ui/src/views/monitor/job/log.vue | 108 ++++------ sql/{ry_20250523.sql => ry_20260321.sql} | 2 + 8 files changed, 333 insertions(+), 197 deletions(-) create mode 100644 ruoyi-ui/src/views/monitor/job/detail.vue rename sql/{ry_20250523.sql => ry_20260321.sql} (99%) diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java index ec863c9ae..03445d661 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java @@ -3,6 +3,7 @@ package com.ruoyi.job.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.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; @@ -44,10 +45,12 @@ public class SysJobLog extends BaseEntity private String exceptionInfo; /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; - /** 停止时间 */ - private Date stopTime; + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; public Long getJobLogId() { @@ -129,14 +132,14 @@ public class SysJobLog extends BaseEntity this.startTime = startTime; } - public Date getStopTime() + public Date getEndTime() { - return stopTime; + return endTime; } - public void setStopTime(Date stopTime) + public void setEndTime(Date endTime) { - this.stopTime = stopTime; + this.endTime = endTime; } @Override @@ -149,7 +152,7 @@ public class SysJobLog extends BaseEntity .append("status", getStatus()) .append("exceptionInfo", getExceptionInfo()) .append("startTime", getStartTime()) - .append("stopTime", getStopTime()) + .append("stopTime", getEndTime()) .toString(); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java index 7ac500152..7bfee2430 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java @@ -64,7 +64,7 @@ public abstract class AbstractQuartzJob implements Job * 执行后 * * @param context 工作执行上下文对象 - * @param sysJob 系统计划任务 + * @param sysScheduleJob 系统计划任务 */ protected void after(JobExecutionContext context, SysJob sysJob, Exception e) { @@ -76,8 +76,8 @@ public abstract class AbstractQuartzJob implements Job sysJobLog.setJobGroup(sysJob.getJobGroup()); sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); sysJobLog.setStartTime(startTime); - sysJobLog.setStopTime(new Date()); - long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); + sysJobLog.setEndTime(new Date()); + long runMs = sysJobLog.getEndTime().getTime() - sysJobLog.getStartTime().getTime(); sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒"); if (e != null) { diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml index ca6e885b4..f00112665 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -12,11 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, start_time, end_time, create_time from sys_job_log @@ -78,6 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" job_message, status, exception_info, + start_time, + end_time, create_time )values( #{jobLogId}, @@ -87,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jobMessage}, #{status}, #{exceptionInfo}, + #{startTime}, + #{endTime}, sysdate() ) diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml index 0323cf11f..d2509b0a0 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark + select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time, remark from sys_job diff --git a/ruoyi-ui/src/views/monitor/job/detail.vue b/ruoyi-ui/src/views/monitor/job/detail.vue new file mode 100644 index 000000000..6ddca242c --- /dev/null +++ b/ruoyi-ui/src/views/monitor/job/detail.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 2ba7f65e1..163053279 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -94,7 +94,11 @@ - + + + diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index f62fb3602..56dc96ff9 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -143,48 +143,18 @@ @pagination="getList" /> - - - - - - {{ form.jobLogId }} - {{ form.jobName }} - - - {{ form.jobGroup }} - {{ form.createTime }} - - - {{ form.invokeTarget }} - - - {{ form.jobMessage }} - - - -
正常
-
失败
- - - - {{ form.exceptionInfo }} - - - -
- 关 闭 -
- + \ No newline at end of file +} + diff --git a/sql/ry_20250523.sql b/sql/ry_20260321.sql similarity index 99% rename from sql/ry_20250523.sql rename to sql/ry_20260321.sql index ae47ac165..d8e952cbf 100644 --- a/sql/ry_20250523.sql +++ b/sql/ry_20260321.sql @@ -609,6 +609,8 @@ create table sys_job_log ( job_message varchar(500) comment '日志信息', status char(1) default '0' comment '执行状态（0正常 1失败）', exception_info varchar(2000) default '' comment '异常信息', + start_time datetime comment '执行开始时间', + end_time datetime comment '执行结束时间', create_time datetime comment '创建时间', primary key (job_log_id) ) engine=innodb comment = '定时任务调度日志表';