| 
					
				 | 
			
			
				@@ -43,7 +43,7 @@ public class TaskController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiOperation("任务列表分页查询") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@GetMapping("/list") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	public HttpResponseResult list(TaskQueryInfo queryInfo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	public HttpResponseResult<PageInfo<Task>> list(TaskQueryInfo queryInfo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		PageInfo<Task> pageInfo = new PageInfo<Task>(queryInfo.getPage(), queryInfo.getRows()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		Map<String, Object> params = new HashMap<String, Object>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		MapUtil.populateMap(params, queryInfo); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -65,7 +65,7 @@ public class TaskController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiOperation("执行当前任务") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@PostMapping("/execute/{taskId}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	public HttpResponseResult execute(@PathVariable("taskId") int taskId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	public HttpResponseResult<Object> execute(@PathVariable("taskId") int taskId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		boolean result = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			result = taskService.execute(taskId, scheduler); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -79,7 +79,7 @@ public class TaskController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiOperation("暂停当前任务") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@PostMapping("/pause/{taskId}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	public HttpResponseResult pause(@PathVariable("taskId") int taskId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	public HttpResponseResult<Object> pause(@PathVariable("taskId") int taskId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		boolean result = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			result = taskService.pause(taskId, scheduler); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -93,7 +93,7 @@ public class TaskController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiOperation("暂停当前任务") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@PostMapping("/resume/{taskId}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	public HttpResponseResult resume(@PathVariable("taskId") int taskId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	public HttpResponseResult<Object> resume(@PathVariable("taskId") int taskId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		boolean result = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			result = taskService.resume(taskId, scheduler); 
			 |