From 497ccee885d8b34446a8864487f37cfe2860bd58 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 24 Nov 2018 16:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AF=A6=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/SysJobLogController.java | 12 ++++- .../templates/monitor/job/detail.html | 49 +++++++++++++++++++ .../templates/monitor/job/jobLog.html | 5 +- .../com/ruoyi/quartz/util/ScheduleJob.java | 3 +- sql/{ry_20181008.sql => ry_20181124.sql} | 29 +++++------ 5 files changed, 80 insertions(+), 18 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/monitor/job/detail.html rename sql/{ry_20181008.sql => ry_20181124.sql} (97%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java index a8669985..1e98551c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java @@ -4,7 +4,9 @@ import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -12,10 +14,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ExcelUtil; +import com.ruoyi.framework.web.base.BaseController; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.service.ISysJobLogService; -import com.ruoyi.framework.web.base.BaseController; /** * 调度日志操作处理 @@ -68,6 +70,14 @@ public class SysJobLogController extends BaseController return toAjax(jobLogService.deleteJobLogByIds(ids)); } + @RequiresPermissions("monitor:job:detail") + @GetMapping("/detail/{jobLogId}") + public String detail(@PathVariable("jobLogId") Long jobLogId, ModelMap mmap) + { + mmap.put("jobLog", jobLogService.selectJobLogById(jobLogId)); + return prefix + "/detail"; + } + @Log(title = "调度日志", businessType = BusinessType.CLEAN) @RequiresPermissions("monitor:job:remove") @PostMapping("/clean") diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html b/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html new file mode 100644 index 00000000..ec9c7124 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/monitor/job/detail.html @@ -0,0 +1,49 @@ + + + + + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html index 1fc415d3..cce505c4 100644 --- a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html +++ b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html @@ -57,7 +57,7 @@