|
@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.tool.controller;
|
|
|
|
|
|
import cn.com.qmth.examcloud.tool.config.SysProperty;
|
|
import cn.com.qmth.examcloud.tool.config.SysProperty;
|
|
import cn.com.qmth.examcloud.tool.entity.TaskEntity;
|
|
import cn.com.qmth.examcloud.tool.entity.TaskEntity;
|
|
-import cn.com.qmth.examcloud.tool.service.TaskService;
|
|
|
|
|
|
+import cn.com.qmth.examcloud.tool.service.TaskManager;
|
|
import cn.com.qmth.examcloud.tool.utils.StatusException;
|
|
import cn.com.qmth.examcloud.tool.utils.StatusException;
|
|
import cn.com.qmth.examcloud.tool.vo.task.TaskAdd;
|
|
import cn.com.qmth.examcloud.tool.vo.task.TaskAdd;
|
|
import cn.com.qmth.examcloud.tool.vo.task.TaskQuery;
|
|
import cn.com.qmth.examcloud.tool.vo.task.TaskQuery;
|
|
@@ -20,7 +20,7 @@ import java.io.File;
|
|
public class TaskController extends BaseController {
|
|
public class TaskController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private TaskService taskService;
|
|
|
|
|
|
+ private TaskManager taskManager;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private SysProperty sysProperty;
|
|
private SysProperty sysProperty;
|
|
@@ -28,7 +28,7 @@ public class TaskController extends BaseController {
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@PostMapping(value = "/api/task/list")
|
|
@PostMapping(value = "/api/task/list")
|
|
public Page<TaskEntity> taskList(@RequestBody TaskQuery req) {
|
|
public Page<TaskEntity> taskList(@RequestBody TaskQuery req) {
|
|
- return taskService.getTaskList(req);
|
|
|
|
|
|
+ return taskManager.getTaskList(req);
|
|
}
|
|
}
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@@ -38,12 +38,12 @@ public class TaskController extends BaseController {
|
|
req.setOperatorId(user.getUserId());
|
|
req.setOperatorId(user.getUserId());
|
|
req.setOperatorName(user.getDisplayName());
|
|
req.setOperatorName(user.getDisplayName());
|
|
req.setUserToken(user.getToken());
|
|
req.setUserToken(user.getToken());
|
|
- taskService.addTask(req);
|
|
|
|
|
|
+ taskManager.addTask(req);
|
|
}
|
|
}
|
|
|
|
|
|
@GetMapping(value = "/api/task/download/{taskId}")
|
|
@GetMapping(value = "/api/task/download/{taskId}")
|
|
public void taskDownload(@PathVariable Long taskId, HttpServletResponse response) {
|
|
public void taskDownload(@PathVariable Long taskId, HttpServletResponse response) {
|
|
- TaskEntity task = taskService.getTaskById(taskId);
|
|
|
|
|
|
+ TaskEntity task = taskManager.getTaskById(taskId);
|
|
if (task == null || StringUtils.isEmpty(task.getFilePath())) {
|
|
if (task == null || StringUtils.isEmpty(task.getFilePath())) {
|
|
throw new StatusException("任务或文件不存在!");
|
|
throw new StatusException("任务或文件不存在!");
|
|
}
|
|
}
|