v3.0.0

src/main/java/io/renren/modules/job/controller/ScheduleJobController.java

@@ -34,7 +34,7 @@ public class ScheduleJobController {
 	/**
 	 * 定时任务列表
 	 */
-	@GetMapping("/list")
+	@RequestMapping("/list")
 	@RequiresPermissions("sys:schedule:list")
 	public R list(@RequestParam Map<String, Object> params){
 		PageUtils page = scheduleJobService.queryPage(params);
@@ -45,7 +45,7 @@ public class ScheduleJobController {
 	/**
 	 * 定时任务信息
 	 */
-	@GetMapping("/info/{jobId}")
+	@RequestMapping("/info/{jobId}")
 	@RequiresPermissions("sys:schedule:info")
 	public R info(@PathVariable("jobId") Long jobId){
 		ScheduleJobEntity schedule = scheduleJobService.getById(jobId);
@@ -57,12 +57,12 @@ public class ScheduleJobController {
 	 * 保存定时任务
 	 */
 	@SysLog("保存定时任务")
-	@PostMapping("/save")
+	@RequestMapping("/save")
 	@RequiresPermissions("sys:schedule:save")
 	public R save(@RequestBody ScheduleJobEntity scheduleJob){
 		ValidatorUtils.validateEntity(scheduleJob);
 		
-		scheduleJobService.saveJob(scheduleJob);
+		scheduleJobService.save(scheduleJob);
 		
 		return R.ok();
 	}
@@ -71,7 +71,7 @@ public class ScheduleJobController {
 	 * 修改定时任务
 	 */
 	@SysLog("修改定时任务")
-	@PostMapping("/update")
+	@RequestMapping("/update")
 	@RequiresPermissions("sys:schedule:update")
 	public R update(@RequestBody ScheduleJobEntity scheduleJob){
 		ValidatorUtils.validateEntity(scheduleJob);
@@ -85,7 +85,7 @@ public class ScheduleJobController {
 	 * 删除定时任务
 	 */
 	@SysLog("删除定时任务")
-	@PostMapping("/delete")
+	@RequestMapping("/delete")
 	@RequiresPermissions("sys:schedule:delete")
 	public R delete(@RequestBody Long[] jobIds){
 		scheduleJobService.deleteBatch(jobIds);
@@ -97,7 +97,7 @@ public class ScheduleJobController {
 	 * 立即执行任务
 	 */
 	@SysLog("立即执行任务")
-	@PostMapping("/run")
+	@RequestMapping("/run")
 	@RequiresPermissions("sys:schedule:run")
 	public R run(@RequestBody Long[] jobIds){
 		scheduleJobService.run(jobIds);
@@ -109,7 +109,7 @@ public class ScheduleJobController {
 	 * 暂停定时任务
 	 */
 	@SysLog("暂停定时任务")
-	@PostMapping("/pause")
+	@RequestMapping("/pause")
 	@RequiresPermissions("sys:schedule:pause")
 	public R pause(@RequestBody Long[] jobIds){
 		scheduleJobService.pause(jobIds);
@@ -121,7 +121,7 @@ public class ScheduleJobController {
 	 * 恢复定时任务
 	 */
 	@SysLog("恢复定时任务")
-	@PostMapping("/resume")
+	@RequestMapping("/resume")
 	@RequiresPermissions("sys:schedule:resume")
 	public R resume(@RequestBody Long[] jobIds){
 		scheduleJobService.resume(jobIds);

src/main/java/io/renren/modules/job/controller/ScheduleJobLogController.java

@@ -14,7 +14,10 @@ import io.renren.modules.job.entity.ScheduleJobLogEntity;
 import io.renren.modules.job.service.ScheduleJobLogService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
@@ -32,7 +35,7 @@ public class ScheduleJobLogController {
 	/**
 	 * 定时任务日志列表
 	 */
-	@GetMapping("/list")
+	@RequestMapping("/list")
 	@RequiresPermissions("sys:schedule:log")
 	public R list(@RequestParam Map<String, Object> params){
 		PageUtils page = scheduleJobLogService.queryPage(params);
@@ -43,7 +46,7 @@ public class ScheduleJobLogController {
 	/**
 	 * 定时任务日志信息
 	 */
-	@GetMapping("/info/{logId}")
+	@RequestMapping("/info/{logId}")
 	public R info(@PathVariable("logId") Long logId){
 		ScheduleJobLogEntity log = scheduleJobLogService.getById(logId);
 		

src/main/java/io/renren/modules/job/entity/ScheduleJobEntity.java

@@ -10,6 +10,7 @@ package io.renren.modules.job.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -44,12 +45,6 @@ public class ScheduleJobEntity implements Serializable {
 	private String beanName;
 	
 	/**
-	 * 方法名
-	 */
-	@NotBlank(message="方法名称不能为空")
-	private String methodName;
-	
-	/**
 	 * 参数
 	 */
 	private String params;
@@ -73,7 +68,7 @@ public class ScheduleJobEntity implements Serializable {
 	/**
 	 * 创建时间
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date createTime;
 
-
 }

src/main/java/io/renren/modules/job/entity/ScheduleJobLogEntity.java

@@ -10,6 +10,7 @@ package io.renren.modules.job.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -42,11 +43,6 @@ public class ScheduleJobLogEntity implements Serializable {
 	private String beanName;
 	
 	/**
-	 * 方法名
-	 */
-	private String methodName;
-	
-	/**
 	 * 参数
 	 */
 	private String params;
@@ -69,7 +65,7 @@ public class ScheduleJobLogEntity implements Serializable {
 	/**
 	 * 创建时间
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date createTime;
-
 	
 }

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

@@ -56,7 +56,7 @@ public class ScheduleJobServiceImpl extends ServiceImpl<ScheduleJobDao, Schedule
 
 		IPage<ScheduleJobEntity> page = this.page(
 			new Query<ScheduleJobEntity>().getPage(params),
-			new QueryWrapper<ScheduleJobEntity>().like(StringUtils.isNotBlank(beanName),"bean_name", beanName)
+			new QueryWrapper <ScheduleJobEntity>().like(StringUtils.isNotBlank(beanName),"bean_name", beanName)
 		);
 
 		return new PageUtils(page);
@@ -94,7 +94,7 @@ public class ScheduleJobServiceImpl extends ServiceImpl<ScheduleJobDao, Schedule
 
 	@Override
     public int updateBatch(Long[] jobIds, int status){
-    	Map<String, Object> map = new HashMap<>();
+    	Map<String, Object> map = new HashMap<>(2);
     	map.put("list", jobIds);
     	map.put("status", status);
     	return baseMapper.updateBatch(map);