Mark 6 years ago
parent
commit
8cc5290189

+ 1 - 4
db/mysql.sql

109
CREATE TABLE `schedule_job` (
109
CREATE TABLE `schedule_job` (
110
  `job_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务id',
110
  `job_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务id',
111
  `bean_name` varchar(200) DEFAULT NULL COMMENT 'spring bean名称',
111
  `bean_name` varchar(200) DEFAULT NULL COMMENT 'spring bean名称',
112
  `method_name` varchar(100) DEFAULT NULL COMMENT '方法名',
113
  `params` varchar(2000) DEFAULT NULL COMMENT '参数',
112
  `params` varchar(2000) DEFAULT NULL COMMENT '参数',
114
  `cron_expression` varchar(100) DEFAULT NULL COMMENT 'cron表达式',
113
  `cron_expression` varchar(100) DEFAULT NULL COMMENT 'cron表达式',
115
  `status` tinyint(4) DEFAULT NULL COMMENT '任务状态  0:正常  1:暂停',
114
  `status` tinyint(4) DEFAULT NULL COMMENT '任务状态  0:正常  1:暂停',
123
  `log_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务日志id',
122
  `log_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务日志id',
124
  `job_id` bigint(20) NOT NULL COMMENT '任务id',
123
  `job_id` bigint(20) NOT NULL COMMENT '任务id',
125
  `bean_name` varchar(200) DEFAULT NULL COMMENT 'spring bean名称',
124
  `bean_name` varchar(200) DEFAULT NULL COMMENT 'spring bean名称',
126
  `method_name` varchar(100) DEFAULT NULL COMMENT '方法名',
127
  `params` varchar(2000) DEFAULT NULL COMMENT '参数',
125
  `params` varchar(2000) DEFAULT NULL COMMENT '参数',
128
  `status` tinyint(4) NOT NULL COMMENT '任务状态    0:成功    1:失败',
126
  `status` tinyint(4) NOT NULL COMMENT '任务状态    0:成功    1:失败',
129
  `error` varchar(2000) DEFAULT NULL COMMENT '失败信息',
127
  `error` varchar(2000) DEFAULT NULL COMMENT '失败信息',
185
INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`) VALUES (30, 1, '文件上传', 'oss/oss', 'sys:oss:all', 1, 'oss', 6);
183
INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`) VALUES (30, 1, '文件上传', 'oss/oss', 'sys:oss:all', 1, 'oss', 6);
186
184
187
INSERT INTO `sys_config` (`param_key`, `param_value`, `status`, `remark`) VALUES ('CLOUD_STORAGE_CONFIG_KEY', '{\"aliyunAccessKeyId\":\"\",\"aliyunAccessKeySecret\":\"\",\"aliyunBucketName\":\"\",\"aliyunDomain\":\"\",\"aliyunEndPoint\":\"\",\"aliyunPrefix\":\"\",\"qcloudBucketName\":\"\",\"qcloudDomain\":\"\",\"qcloudPrefix\":\"\",\"qcloudSecretId\":\"\",\"qcloudSecretKey\":\"\",\"qiniuAccessKey\":\"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ\",\"qiniuBucketName\":\"ios-app\",\"qiniuDomain\":\"http://7xqbwh.dl1.z0.glb.clouddn.com\",\"qiniuPrefix\":\"upload\",\"qiniuSecretKey\":\"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV\",\"type\":1}', '0', '云存储配置信息');
185
INSERT INTO `sys_config` (`param_key`, `param_value`, `status`, `remark`) VALUES ('CLOUD_STORAGE_CONFIG_KEY', '{\"aliyunAccessKeyId\":\"\",\"aliyunAccessKeySecret\":\"\",\"aliyunBucketName\":\"\",\"aliyunDomain\":\"\",\"aliyunEndPoint\":\"\",\"aliyunPrefix\":\"\",\"qcloudBucketName\":\"\",\"qcloudDomain\":\"\",\"qcloudPrefix\":\"\",\"qcloudSecretId\":\"\",\"qcloudSecretKey\":\"\",\"qiniuAccessKey\":\"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ\",\"qiniuBucketName\":\"ios-app\",\"qiniuDomain\":\"http://7xqbwh.dl1.z0.glb.clouddn.com\",\"qiniuPrefix\":\"upload\",\"qiniuSecretKey\":\"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV\",\"type\":1}', '0', '云存储配置信息');
188
INSERT INTO `schedule_job` (`bean_name`, `method_name`, `params`, `cron_expression`, `status`, `remark`, `create_time`) VALUES ('testTask', 'test', 'renren', '0 0/30 * * * ?', '0', '参数测试', '2016-12-01 23:16:46');
189
INSERT INTO `schedule_job` (`bean_name`, `method_name`, `params`, `cron_expression`, `status`, `remark`, `create_time`) VALUES ('testTask', 'test2', NULL, '0 0/30 * * * ?', '1', '无参数测试', '2016-12-03 14:55:56');
186
INSERT INTO `schedule_job` (`bean_name`, `params`, `cron_expression`, `status`, `remark`, `create_time`) VALUES ('testTask', 'renren', '0 0/30 * * * ?', '0', '参数测试', now());
190
187
191
188
192
-- 账号:13612345678  密码:admin
189
-- 账号:13612345678  密码:admin

+ 1 - 4
db/oracle.sql

107
CREATE TABLE schedule_job (
107
CREATE TABLE schedule_job (
108
  job_id NUMBER(20, 0) NOT NULL,
108
  job_id NUMBER(20, 0) NOT NULL,
109
  bean_name varchar2(200),
109
  bean_name varchar2(200),
110
  method_name varchar2(100),
111
  params varchar2(2000),
110
  params varchar2(2000),
112
  cron_expression varchar2(100),
111
  cron_expression varchar2(100),
113
  status NUMBER(2, 0) NOT NULL,
112
  status NUMBER(2, 0) NOT NULL,
121
  log_id NUMBER(20, 0) NOT NULL,
120
  log_id NUMBER(20, 0) NOT NULL,
122
  job_id NUMBER(20, 0) NOT NULL,
121
  job_id NUMBER(20, 0) NOT NULL,
123
  bean_name varchar2(200),
122
  bean_name varchar2(200),
124
  method_name varchar2(100),
125
  params varchar2(2000),
123
  params varchar2(2000),
126
  status NUMBER(2, 0) NOT NULL,
124
  status NUMBER(2, 0) NOT NULL,
127
  error varchar2(2000),
125
  error varchar2(2000),
178
176
179
INSERT INTO sys_config (id, param_key, param_value, status, remark) VALUES (1, 'CLOUD_STORAGE_CONFIG_KEY',  '{"aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","aliyunDomain":"","aliyunEndPoint":"","aliyunPrefix":"","qcloudBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuBucketName":"ios-app","qiniuDomain":"http://7xlij2.com1.z0.glb.clouddn.com","qiniuPrefix":"upload","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","type":1}', '0', '云存储配置信息');
177
INSERT INTO sys_config (id, param_key, param_value, status, remark) VALUES (1, 'CLOUD_STORAGE_CONFIG_KEY',  '{"aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","aliyunDomain":"","aliyunEndPoint":"","aliyunPrefix":"","qcloudBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuBucketName":"ios-app","qiniuDomain":"http://7xlij2.com1.z0.glb.clouddn.com","qiniuPrefix":"upload","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","type":1}', '0', '云存储配置信息');
180
178
181
INSERT INTO schedule_job (job_id, bean_name, method_name, params, cron_expression, status, remark, create_time) VALUES (1, 'testTask', 'test', 'renren', '0 0/30 * * * ?', '0', '参数测试', CURRENT_DATE);
182
INSERT INTO schedule_job (job_id, bean_name, method_name, params, cron_expression, status, remark, create_time) VALUES (2, 'testTask', 'test2', NULL, '0 0/30 * * * ?', '1', '无参数测试', CURRENT_DATE);
179
INSERT INTO schedule_job (job_id, bean_name, params, cron_expression, status, remark, create_time) VALUES (1, 'testTask', 'renren', '0 0/30 * * * ?', '0', '参数测试', CURRENT_DATE);
183
180
184
181
185
-- 账号:13612345678  密码:admin
182
-- 账号:13612345678  密码:admin

+ 1 - 4
db/postgresql.sql

110
CREATE TABLE schedule_job (
110
CREATE TABLE schedule_job (
111
  job_id bigserial,
111
  job_id bigserial,
112
  bean_name varchar(200),
112
  bean_name varchar(200),
113
  method_name varchar(100),
114
  params varchar(2000),
113
  params varchar(2000),
115
  cron_expression varchar(100),
114
  cron_expression varchar(100),
116
  status int,
115
  status int,
124
  log_id bigserial,
123
  log_id bigserial,
125
  job_id int8 NOT NULL,
124
  job_id int8 NOT NULL,
126
  bean_name varchar(200),
125
  bean_name varchar(200),
127
  method_name varchar(100),
128
  params varchar(2000),
126
  params varchar(2000),
129
  status int NOT NULL,
127
  status int NOT NULL,
130
  error varchar(2000),
128
  error varchar(2000),
181
179
182
INSERT INTO sys_config (param_key, param_value, status, remark) VALUES ('CLOUD_STORAGE_CONFIG_KEY',  '{"aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","aliyunDomain":"","aliyunEndPoint":"","aliyunPrefix":"","qcloudBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuBucketName":"ios-app","qiniuDomain":"http://7xlij2.com1.z0.glb.clouddn.com","qiniuPrefix":"upload","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","type":1}', '0', '云存储配置信息');
180
INSERT INTO sys_config (param_key, param_value, status, remark) VALUES ('CLOUD_STORAGE_CONFIG_KEY',  '{"aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","aliyunDomain":"","aliyunEndPoint":"","aliyunPrefix":"","qcloudBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuBucketName":"ios-app","qiniuDomain":"http://7xlij2.com1.z0.glb.clouddn.com","qiniuPrefix":"upload","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","type":1}', '0', '云存储配置信息');
183
181
184
INSERT INTO schedule_job (bean_name, method_name, params, cron_expression, status, remark, create_time) VALUES ('testTask', 'test', 'renren', '0 0/30 * * * ?', '0', '参数测试', '2016-12-01 23:16:46');
185
INSERT INTO schedule_job (bean_name, method_name, params, cron_expression, status, remark, create_time) VALUES ('testTask', 'test2', NULL, '0 0/30 * * * ?', '1', '无参数测试', '2016-12-03 14:55:56');
182
INSERT INTO schedule_job (bean_name, params, cron_expression, status, remark, create_time) VALUES ('testTask',  'renren', '0 0/30 * * * ?', '0', '参数测试', '2016-12-01 23:16:46');
186
183
187
184
188
-- 账号:13612345678  密码:admin
185
-- 账号:13612345678  密码:admin

+ 1 - 4
db/sqlserver.sql

106
CREATE TABLE schedule_job (
106
CREATE TABLE schedule_job (
107
  job_id bigint NOT NULL IDENTITY(1,1),
107
  job_id bigint NOT NULL IDENTITY(1,1),
108
  bean_name varchar(200),
108
  bean_name varchar(200),
109
  method_name varchar(100),
110
  params varchar(2000),
109
  params varchar(2000),
111
  cron_expression varchar(100),
110
  cron_expression varchar(100),
112
  status tinyint,
111
  status tinyint,
120
  log_id bigint NOT NULL IDENTITY(1,1),
119
  log_id bigint NOT NULL IDENTITY(1,1),
121
  job_id bigint NOT NULL,
120
  job_id bigint NOT NULL,
122
  bean_name varchar(200),
121
  bean_name varchar(200),
123
  method_name varchar(100),
124
  params varchar(2000),
122
  params varchar(2000),
125
  status tinyint NOT NULL,
123
  status tinyint NOT NULL,
126
  error varchar(2000),
124
  error varchar(2000),
181
179
182
INSERT INTO sys_config (param_key, param_value, status, remark) VALUES ('CLOUD_STORAGE_CONFIG_KEY',  '{"aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","aliyunDomain":"","aliyunEndPoint":"","aliyunPrefix":"","qcloudBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuBucketName":"ios-app","qiniuDomain":"http://7xlij2.com1.z0.glb.clouddn.com","qiniuPrefix":"upload","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","type":1}', '0', '云存储配置信息');
180
INSERT INTO sys_config (param_key, param_value, status, remark) VALUES ('CLOUD_STORAGE_CONFIG_KEY',  '{"aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","aliyunDomain":"","aliyunEndPoint":"","aliyunPrefix":"","qcloudBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuBucketName":"ios-app","qiniuDomain":"http://7xlij2.com1.z0.glb.clouddn.com","qiniuPrefix":"upload","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","type":1}', '0', '云存储配置信息');
183
181
184
INSERT INTO schedule_job (bean_name, method_name, params, cron_expression, status, remark, create_time) VALUES ('testTask', 'test', 'renren', '0 0/30 * * * ?', '0', '参数测试', '2016-12-01 23:16:46');
185
INSERT INTO schedule_job (bean_name, method_name, params, cron_expression, status, remark, create_time) VALUES ('testTask', 'test2', NULL, '0 0/30 * * * ?', '1', '无参数测试', '2016-12-03 14:55:56');
182
INSERT INTO schedule_job (bean_name, params, cron_expression, status, remark, create_time) VALUES ('testTask', 'renren', '0 0/30 * * * ?', '0', '参数测试', '2016-12-01 23:16:46');
186
183
187
184
188
-- 账号:13612345678  密码:admin
185
-- 账号:13612345678  密码:admin

+ 9 - 9
src/main/java/io/renren/modules/job/controller/ScheduleJobController.java

34
	/**
34
	/**
35
	 * 定时任务列表
35
	 * 定时任务列表
36
	 */
36
	 */
37
	@GetMapping("/list")
37
	@RequestMapping("/list")
38
	@RequiresPermissions("sys:schedule:list")
38
	@RequiresPermissions("sys:schedule:list")
39
	public R list(@RequestParam Map<String, Object> params){
39
	public R list(@RequestParam Map<String, Object> params){
40
		PageUtils page = scheduleJobService.queryPage(params);
40
		PageUtils page = scheduleJobService.queryPage(params);
45
	/**
45
	/**
46
	 * 定时任务信息
46
	 * 定时任务信息
47
	 */
47
	 */
48
	@GetMapping("/info/{jobId}")
48
	@RequestMapping("/info/{jobId}")
49
	@RequiresPermissions("sys:schedule:info")
49
	@RequiresPermissions("sys:schedule:info")
50
	public R info(@PathVariable("jobId") Long jobId){
50
	public R info(@PathVariable("jobId") Long jobId){
51
		ScheduleJobEntity schedule = scheduleJobService.getById(jobId);
51
		ScheduleJobEntity schedule = scheduleJobService.getById(jobId);
57
	 * 保存定时任务
57
	 * 保存定时任务
58
	 */
58
	 */
59
	@SysLog("保存定时任务")
59
	@SysLog("保存定时任务")
60
	@PostMapping("/save")
60
	@RequestMapping("/save")
61
	@RequiresPermissions("sys:schedule:save")
61
	@RequiresPermissions("sys:schedule:save")
62
	public R save(@RequestBody ScheduleJobEntity scheduleJob){
62
	public R save(@RequestBody ScheduleJobEntity scheduleJob){
63
		ValidatorUtils.validateEntity(scheduleJob);
63
		ValidatorUtils.validateEntity(scheduleJob);
64
		
64
		
65
		scheduleJobService.saveJob(scheduleJob);
65
		scheduleJobService.save(scheduleJob);
66
		
66
		
67
		return R.ok();
67
		return R.ok();
68
	}
68
	}
71
	 * 修改定时任务
71
	 * 修改定时任务
72
	 */
72
	 */
73
	@SysLog("修改定时任务")
73
	@SysLog("修改定时任务")
74
	@PostMapping("/update")
74
	@RequestMapping("/update")
75
	@RequiresPermissions("sys:schedule:update")
75
	@RequiresPermissions("sys:schedule:update")
76
	public R update(@RequestBody ScheduleJobEntity scheduleJob){
76
	public R update(@RequestBody ScheduleJobEntity scheduleJob){
77
		ValidatorUtils.validateEntity(scheduleJob);
77
		ValidatorUtils.validateEntity(scheduleJob);
85
	 * 删除定时任务
85
	 * 删除定时任务
86
	 */
86
	 */
87
	@SysLog("删除定时任务")
87
	@SysLog("删除定时任务")
88
	@PostMapping("/delete")
88
	@RequestMapping("/delete")
89
	@RequiresPermissions("sys:schedule:delete")
89
	@RequiresPermissions("sys:schedule:delete")
90
	public R delete(@RequestBody Long[] jobIds){
90
	public R delete(@RequestBody Long[] jobIds){
91
		scheduleJobService.deleteBatch(jobIds);
91
		scheduleJobService.deleteBatch(jobIds);
97
	 * 立即执行任务
97
	 * 立即执行任务
98
	 */
98
	 */
99
	@SysLog("立即执行任务")
99
	@SysLog("立即执行任务")
100
	@PostMapping("/run")
100
	@RequestMapping("/run")
101
	@RequiresPermissions("sys:schedule:run")
101
	@RequiresPermissions("sys:schedule:run")
102
	public R run(@RequestBody Long[] jobIds){
102
	public R run(@RequestBody Long[] jobIds){
103
		scheduleJobService.run(jobIds);
103
		scheduleJobService.run(jobIds);
109
	 * 暂停定时任务
109
	 * 暂停定时任务
110
	 */
110
	 */
111
	@SysLog("暂停定时任务")
111
	@SysLog("暂停定时任务")
112
	@PostMapping("/pause")
112
	@RequestMapping("/pause")
113
	@RequiresPermissions("sys:schedule:pause")
113
	@RequiresPermissions("sys:schedule:pause")
114
	public R pause(@RequestBody Long[] jobIds){
114
	public R pause(@RequestBody Long[] jobIds){
115
		scheduleJobService.pause(jobIds);
115
		scheduleJobService.pause(jobIds);
121
	 * 恢复定时任务
121
	 * 恢复定时任务
122
	 */
122
	 */
123
	@SysLog("恢复定时任务")
123
	@SysLog("恢复定时任务")
124
	@PostMapping("/resume")
124
	@RequestMapping("/resume")
125
	@RequiresPermissions("sys:schedule:resume")
125
	@RequiresPermissions("sys:schedule:resume")
126
	public R resume(@RequestBody Long[] jobIds){
126
	public R resume(@RequestBody Long[] jobIds){
127
		scheduleJobService.resume(jobIds);
127
		scheduleJobService.resume(jobIds);

+ 6 - 3
src/main/java/io/renren/modules/job/controller/ScheduleJobLogController.java

14
import io.renren.modules.job.service.ScheduleJobLogService;
14
import io.renren.modules.job.service.ScheduleJobLogService;
15
import org.apache.shiro.authz.annotation.RequiresPermissions;
15
import org.apache.shiro.authz.annotation.RequiresPermissions;
16
import org.springframework.beans.factory.annotation.Autowired;
16
import org.springframework.beans.factory.annotation.Autowired;
17
import org.springframework.web.bind.annotation.*;
17
import org.springframework.web.bind.annotation.PathVariable;
18
import org.springframework.web.bind.annotation.RequestMapping;
19
import org.springframework.web.bind.annotation.RequestParam;
20
import org.springframework.web.bind.annotation.RestController;
18
21
19
import java.util.Map;
22
import java.util.Map;
20
23
32
	/**
35
	/**
33
	 * 定时任务日志列表
36
	 * 定时任务日志列表
34
	 */
37
	 */
35
	@GetMapping("/list")
38
	@RequestMapping("/list")
36
	@RequiresPermissions("sys:schedule:log")
39
	@RequiresPermissions("sys:schedule:log")
37
	public R list(@RequestParam Map<String, Object> params){
40
	public R list(@RequestParam Map<String, Object> params){
38
		PageUtils page = scheduleJobLogService.queryPage(params);
41
		PageUtils page = scheduleJobLogService.queryPage(params);
43
	/**
46
	/**
44
	 * 定时任务日志信息
47
	 * 定时任务日志信息
45
	 */
48
	 */
46
	@GetMapping("/info/{logId}")
49
	@RequestMapping("/info/{logId}")
47
	public R info(@PathVariable("logId") Long logId){
50
	public R info(@PathVariable("logId") Long logId){
48
		ScheduleJobLogEntity log = scheduleJobLogService.getById(logId);
51
		ScheduleJobLogEntity log = scheduleJobLogService.getById(logId);
49
		
52
		

+ 2 - 7
src/main/java/io/renren/modules/job/entity/ScheduleJobEntity.java

10
10
11
import com.baomidou.mybatisplus.annotation.TableId;
11
import com.baomidou.mybatisplus.annotation.TableId;
12
import com.baomidou.mybatisplus.annotation.TableName;
12
import com.baomidou.mybatisplus.annotation.TableName;
13
import com.fasterxml.jackson.annotation.JsonFormat;
13
import lombok.Data;
14
import lombok.Data;
14
15
15
import javax.validation.constraints.NotBlank;
16
import javax.validation.constraints.NotBlank;
43
	@NotBlank(message="bean名称不能为空")
44
	@NotBlank(message="bean名称不能为空")
44
	private String beanName;
45
	private String beanName;
45
	
46
	
46
	/**
47
	 * 方法名
48
	 */
49
	@NotBlank(message="方法名称不能为空")
50
	private String methodName;
51
	
52
	/**
47
	/**
53
	 * 参数
48
	 * 参数
54
	 */
49
	 */
73
	/**
68
	/**
74
	 * 创建时间
69
	 * 创建时间
75
	 */
70
	 */
71
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
76
	private Date createTime;
72
	private Date createTime;
77
73
78
79
}
74
}

+ 2 - 6
src/main/java/io/renren/modules/job/entity/ScheduleJobLogEntity.java

10
10
11
import com.baomidou.mybatisplus.annotation.TableId;
11
import com.baomidou.mybatisplus.annotation.TableId;
12
import com.baomidou.mybatisplus.annotation.TableName;
12
import com.baomidou.mybatisplus.annotation.TableName;
13
import com.fasterxml.jackson.annotation.JsonFormat;
13
import lombok.Data;
14
import lombok.Data;
14
15
15
import java.io.Serializable;
16
import java.io.Serializable;
41
	 */
42
	 */
42
	private String beanName;
43
	private String beanName;
43
	
44
	
44
	/**
45
	 * 方法名
46
	 */
47
	private String methodName;
48
	
49
	/**
45
	/**
50
	 * 参数
46
	 * 参数
51
	 */
47
	 */
69
	/**
65
	/**
70
	 * 创建时间
66
	 * 创建时间
71
	 */
67
	 */
68
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
72
	private Date createTime;
69
	private Date createTime;
73
74
	
70
	
75
}
71
}

+ 2 - 2
src/main/java/io/renren/modules/job/service/impl/ScheduleJobServiceImpl.java

56
56
57
		IPage<ScheduleJobEntity> page = this.page(
57
		IPage<ScheduleJobEntity> page = this.page(
58
			new Query<ScheduleJobEntity>().getPage(params),
58
			new Query<ScheduleJobEntity>().getPage(params),
59
			new QueryWrapper<ScheduleJobEntity>().like(StringUtils.isNotBlank(beanName),"bean_name", beanName)
59
			new QueryWrapper <ScheduleJobEntity>().like(StringUtils.isNotBlank(beanName),"bean_name", beanName)
60
		);
60
		);
61
61
62
		return new PageUtils(page);
62
		return new PageUtils(page);
94
94
95
	@Override
95
	@Override
96
    public int updateBatch(Long[] jobIds, int status){
96
    public int updateBatch(Long[] jobIds, int status){
97
    	Map<String, Object> map = new HashMap<>();
97
    	Map<String, Object> map = new HashMap<>(2);
98
    	map.put("list", jobIds);
98
    	map.put("list", jobIds);
99
    	map.put("status", status);
99
    	map.put("status", status);
100
    	return baseMapper.updateBatch(map);
100
    	return baseMapper.updateBatch(map);