Trang chủ Khám phá Trợ giúp
Đăng ký Đăng nhập
root
/
gs_bg
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

任务日志新增详细

RuoYi 6 năm trước cách đây
mục cha
1292dcf579
commit
650f89ac13
5 tập tin đã thay đổi với 80 bổ sung và 18 xóa
Split View Hiển thị tình trạng sai khác
  1. 11 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java
  2. 49 0
      ruoyi-admin/src/main/resources/templates/monitor/job/detail.html
  3. 3 2
      ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html
  4. 2 1
      ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleJob.java
  5. 15 14
      sql/ry_20181124.sql

+ 11 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java
Xem Tập Tin 

@@ -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")

+ 49 - 0
ruoyi-admin/src/main/resources/templates/monitor/job/detail.html
Xem Tập Tin 

@@ -0,0 +1,49 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
 
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
+<meta charset="utf-8">
 
+<head th:include="include :: header"></head>
 
+<body class="white-bg">
 
+	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
+	<form class="form-horizontal m-t" id="signupForm">
 
+	    <div class="form-group">
 
+			<label class="col-sm-2 control-label">日志序号：</label>
 
+			<div class="form-control-static" th:text="${jobLog.jobLogId}">
 
+			</div>
 
+		</div>
 
+		<div class="form-group">
 
+			<label class="col-sm-2 control-label">任务名称：</label>
 
+			<div class="form-control-static" th:text="${jobLog.jobName}">
 
+			</div>
 
+		</div>
 
+		<div class="form-group">
 
+			<label class="col-sm-2 control-label">任务组名：</label>
 
+			<div class="form-control-static" th:text="${jobLog.jobGroup}">
 
+			</div>
 
+		</div>
 
+		<div class="form-group">
 
+			<label class="col-sm-2 control-label">任务方法：</label>
 
+			<div class="form-control-static" th:text="${jobLog.methodName} + '(' + ${jobLog.methodParams} + ')'">
 
+			</div>
 
+		</div>
 
+		<div class="form-group">
 
+			<label class="col-sm-2 control-label">日志信息：</label>
 
+			<div class="form-control-static" th:text="${jobLog.jobMessage}">
 
+			</div>
 
+		</div>
 
+		<div class="form-group">
 
+			<label class="col-sm-2 control-label">执行状态：</label>
 
+			<div class="form-control-static" th:class="${jobLog.status == '0' ? 'label label-primary' : 'label label-danger'}" th:text="${jobLog.status == '0' ? '正常' : '失败'}">
 
+			</div>
 
+		</div>
 
+		<div class="form-group" th:style="'display:' + ${jobLog.status == '0' ? 'none' : 'block'}">
 
+			<label class="col-sm-2 control-label">异常信息：</label>
 
+			<div class="form-control-static" th:text="${jobLog.exceptionInfo}">
 
+			</div>
 
+		</div>
 
+	</form>
 
+    </div>
 
+    <div th:include="include :: footer"></div>
 
+    </script>
 
+</body>
 
+</html>

+ 3 - 2
ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html
Xem Tập Tin 

@@ -57,7 +57,7 @@
 
 	</div>

 	<div th:include="include :: footer"></div>

 	<script th:inline="javascript">

-		var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];

+		var detailFlag = [[${@permission.hasPermi('monitor:job:detail')}]];

 		var datas = [[${@dict.getType('sys_common_status')}]];

 		var prefix = ctx + "monitor/jobLog";

 

@@ -65,6 +65,7 @@
 
 		    var options = {

 		        url: prefix + "/list",

 		        cleanUrl: prefix + "/clean",

+		        detailUrl: prefix + "/detail/{id}",

 		        removeUrl: prefix + "/remove",

 		        exportUrl: prefix + "/export",

 		        sortName: "createTime",

@@ -119,7 +120,7 @@
 
 		            align: 'center',

 		            formatter: function(value, row, index) {

 		                var actions = [];

-		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.jobLogId + '\')"><i class="fa fa-remove"></i>删除</a>');

+		                actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="#" onclick="$.operate.detail(\'' + row.jobLogId + '\')"><i class="fa fa-search"></i>详细</a>');

 		                return actions.join('');

 		            }

 		        }]

+ 2 - 1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleJob.java
Xem Tập Tin 

@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
 
 import org.springframework.scheduling.quartz.QuartzJobBean;

 import com.ruoyi.common.constant.Constants;

 import com.ruoyi.common.constant.ScheduleConstants;

+import com.ruoyi.common.utils.StringUtils;

 import com.ruoyi.common.utils.bean.BeanUtils;

 import com.ruoyi.quartz.domain.SysJob;

 import com.ruoyi.quartz.domain.SysJobLog;

@@ -67,7 +68,7 @@ public class ScheduleJob extends QuartzJobBean
 
             jobLog.setJobMessage(job.getJobName() + " 总共耗时：" + times + "毫秒");

             // 任务状态 0：成功 1：失败

             jobLog.setStatus(Constants.FAIL);

-            jobLog.setExceptionInfo(e.toString());

+            jobLog.setExceptionInfo(StringUtils.substring(e.getMessage(), 0, 2000));

         }

         finally

         {

+ 15 - 14
sql/ry_20181008.sql → sql/ry_20181124.sql
Xem Tập Tin 

@@ -52,7 +52,7 @@ create table sys_user (
 
   salt 				varchar(20) 	default '' 				   comment '盐加密',
 
   status 			char(1) 		default '0' 			   comment '帐号状态（0正常 1停用）',
 
   del_flag			char(1) 		default '0' 			   comment '删除标志（0代表存在 2代表删除）',
 
-  login_ip          varchar(20)     default ''                 comment '最后登陆IP',
 
+  login_ip          varchar(50)     default ''                 comment '最后登陆IP',
 
   login_date        datetime                                   comment '最后登陆时间',
 
   create_by         varchar(64)     default ''                 comment '创建者',
 
   create_time 	    datetime                                   comment '创建时间',
 
@@ -178,13 +178,13 @@ insert into sys_menu values('1001', '用户新增', '100', '2',  '#',  'F', '0',
 
 insert into sys_menu values('1002', '用户修改', '100', '3',  '#',  'F', '0', 'system:user:edit',        '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1003', '用户删除', '100', '4',  '#',  'F', '0', 'system:user:remove',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1004', '用户导出', '100', '5',  '#',  'F', '0', 'system:user:export',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1005', '重置密码', '100', '5',  '#',  'F', '0', 'system:user:resetPwd',    '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1005', '重置密码', '100', '6',  '#',  'F', '0', 'system:user:resetPwd',    '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 角色管理按钮
 
 insert into sys_menu values('1006', '角色查询', '101', '1',  '#',  'F', '0', 'system:role:list',        '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1007', '角色新增', '101', '2',  '#',  'F', '0', 'system:role:add',         '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1008', '角色修改', '101', '3',  '#',  'F', '0', 'system:role:edit',        '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1009', '角色删除', '101', '4',  '#',  'F', '0', 'system:role:remove',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1010', '角色导出', '101', '4',  '#',  'F', '0', 'system:role:export',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1010', '角色导出', '101', '5',  '#',  'F', '0', 'system:role:export',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 菜单管理按钮
 
 insert into sys_menu values('1011', '菜单查询', '102', '1',  '#',  'F', '0', 'system:menu:list',        '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1012', '菜单新增', '102', '2',  '#',  'F', '0', 'system:menu:add',         '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
@@ -200,19 +200,19 @@ insert into sys_menu values('1019', '岗位查询', '104', '1',  '#',  'F', '0',
 
 insert into sys_menu values('1020', '岗位新增', '104', '2',  '#',  'F', '0', 'system:post:add',         '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1021', '岗位修改', '104', '3',  '#',  'F', '0', 'system:post:edit',        '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1022', '岗位删除', '104', '4',  '#',  'F', '0', 'system:post:remove',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1023', '岗位导出', '104', '4',  '#',  'F', '0', 'system:post:export',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1023', '岗位导出', '104', '5',  '#',  'F', '0', 'system:post:export',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 字典管理按钮
 
 insert into sys_menu values('1024', '字典查询', '105', '1', '#',  'F', '0', 'system:dict:list',         '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1025', '字典新增', '105', '2', '#',  'F', '0', 'system:dict:add',          '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1026', '字典修改', '105', '3', '#',  'F', '0', 'system:dict:edit',         '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1027', '字典删除', '105', '4', '#',  'F', '0', 'system:dict:remove',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1028', '字典导出', '105', '4', '#',  'F', '0', 'system:dict:export',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1028', '字典导出', '105', '5', '#',  'F', '0', 'system:dict:export',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 参数设置按钮
 
 insert into sys_menu values('1029', '参数查询', '106', '1', '#',  'F', '0', 'system:config:list',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1030', '参数新增', '106', '2', '#',  'F', '0', 'system:config:add',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1031', '参数修改', '106', '3', '#',  'F', '0', 'system:config:edit',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1032', '参数删除', '106', '4', '#',  'F', '0', 'system:config:remove',    '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1033', '参数导出', '106', '4', '#',  'F', '0', 'system:config:export',    '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1033', '参数导出', '106', '5', '#',  'F', '0', 'system:config:export',    '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 通知公告按钮
 
 insert into sys_menu values('1034', '公告查询', '107', '1', '#',  'F', '0', 'system:notice:list',      '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1035', '公告新增', '107', '2', '#',  'F', '0', 'system:notice:add',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
@@ -222,11 +222,11 @@ insert into sys_menu values('1037', '公告删除', '107', '4', '#',  'F', '0',
 
 insert into sys_menu values('1038', '操作查询', '500', '1', '#',  'F', '0', 'monitor:operlog:list',    '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1039', '操作删除', '500', '2', '#',  'F', '0', 'monitor:operlog:remove',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1040', '详细信息', '500', '3', '#',  'F', '0', 'monitor:operlog:detail',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1041', '日志导出', '500', '3', '#',  'F', '0', 'monitor:operlog:export',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1041', '日志导出', '500', '4', '#',  'F', '0', 'monitor:operlog:export',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 登录日志按钮
 
 insert into sys_menu values('1042', '登录查询', '501', '1', '#',  'F', '0', 'monitor:logininfor:list',         '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1043', '登录删除', '501', '2', '#',  'F', '0', 'monitor:logininfor:remove',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1044', '日志导出', '501', '2', '#',  'F', '0', 'monitor:logininfor:export',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1044', '日志导出', '501', '3', '#',  'F', '0', 'monitor:logininfor:export',       '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 在线用户按钮
 
 insert into sys_menu values('1045', '在线查询', '109', '1', '#',  'F', '0', 'monitor:online:list',             '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1046', '批量强退', '109', '2', '#',  'F', '0', 'monitor:online:batchForceLogout', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
@@ -237,10 +237,11 @@ insert into sys_menu values('1049', '任务新增', '110', '2', '#',  'F', '0',
 
 insert into sys_menu values('1050', '任务修改', '110', '3', '#',  'F', '0', 'monitor:job:edit',                '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1051', '任务删除', '110', '4', '#',  'F', '0', 'monitor:job:remove',              '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 insert into sys_menu values('1052', '状态修改', '110', '5', '#',  'F', '0', 'monitor:job:changeStatus',        '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1053', '任务导出', '110', '5', '#',  'F', '0', 'monitor:job:export',              '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1053', '任务详细', '110', '6', '#',  'F', '0', 'monitor:job:detail',              '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1054', '任务导出', '110', '7', '#',  'F', '0', 'monitor:job:export',              '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 -- 代码生成按钮
 
-insert into sys_menu values('1054', '生成查询', '113', '1', '#',  'F', '0', 'tool:gen:list',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
-insert into sys_menu values('1055', '生成代码', '113', '2', '#',  'F', '0', 'tool:gen:code',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1055', '生成查询', '113', '1', '#',  'F', '0', 'tool:gen:list',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
+insert into sys_menu values('1056', '生成代码', '113', '2', '#',  'F', '0', 'tool:gen:code',  '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
 
 
 
 -- ----------------------------
 
@@ -349,7 +350,7 @@ insert into sys_role_menu values ('2', '1052');
 
 insert into sys_role_menu values ('2', '1053');
 
 insert into sys_role_menu values ('2', '1054');
 
 insert into sys_role_menu values ('2', '1055');
 
-
 
+insert into sys_role_menu values ('2', '1056');
 
 
 -- ----------------------------
 
 -- 8、角色和部门关联表  角色1-N部门
 
@@ -399,7 +400,7 @@ create table sys_oper_log (
 
   oper_name 	    varchar(50)     default '' 		 	 	   comment '操作人员',
 
   dept_name 		varchar(50)     default '' 		 	 	   comment '部门名称',
 
   oper_url 		    varchar(255) 	default '' 				   comment '请求URL',
 
-  oper_ip 			varchar(30) 	default '' 				   comment '主机地址',
 
+  oper_ip 			varchar(50) 	default '' 				   comment '主机地址',
 
   oper_location     varchar(255)    default ''                 comment '操作地点',
 
   oper_param 		varchar(255) 	default '' 				   comment '请求参数',
 
   status 			int(1) 		    default 0				   comment '操作状态（0正常 1异常）',
 
@@ -588,7 +589,7 @@ create table sys_job_log (
 
   method_params       varchar(200)  default ''                 comment '方法参数',
 
   job_message         varchar(500)                             comment '日志信息',
 
   status              char(1)       default '0'                comment '执行状态（0正常 1失败）',
 
-  exception_info      text                                     comment '异常信息',
 
+  exception_info      varchar(2000) default ''                 comment '异常信息',
 
   create_time         datetime                                 comment '创建时间',
 
   primary key (job_log_id)
 
 ) engine=innodb default charset=utf8 comment = '定时任务调度日志表';