xiatian 8 ماه پیش
والد
کامیت
920748b478

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/controller/admin/AsyncTaskController.java

@@ -14,7 +14,6 @@ import cn.com.qmth.scancentral.controller.BaseController;
 import cn.com.qmth.scancentral.service.AsyncTaskService;
 import cn.com.qmth.scancentral.util.Calculator;
 import cn.com.qmth.scancentral.vo.asynctask.AsyncTaskVo;
-import cn.com.qmth.scancentral.vo.subject.DataExportTaskVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -30,7 +29,7 @@ public class AsyncTaskController extends BaseController {
     @ApiOperation(value = "异步任务进度查询")
     @PostMapping("progress")
     public AsyncTaskVo progress(@RequestParam String taskId) {
-        DataExportTaskVo vo = asyncTaskService.getDataExportTask(taskId);
+        AsyncTaskVo vo = asyncTaskService.getTask(taskId);
         if (vo == null) {
             throw new ParameterException("未找到导出任务");
         }

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/controller/admin/SubjectController.java

@@ -71,7 +71,7 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "扫描答案DBF、打包DBF下载")
     @PostMapping("data/down")
     public void dataDown(HttpServletResponse response, @RequestParam String taskId) throws Exception {
-        DataExportTaskVo vo = asyncTaskService.getDataExportTask(taskId);
+        DataExportTaskVo vo = (DataExportTaskVo) asyncTaskService.getTask(taskId);
         if (vo == null) {
             throw new ParameterException("未找到导出任务");
         }

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/service/AsyncTaskService.java

@@ -1,13 +1,12 @@
 package cn.com.qmth.scancentral.service;
 
 import cn.com.qmth.scancentral.vo.asynctask.AsyncTaskVo;
-import cn.com.qmth.scancentral.vo.subject.DataExportTaskVo;
 
 public interface AsyncTaskService {
 
     void clearTimeOut();
 
-    DataExportTaskVo getDataExportTask(String taskId);
+    AsyncTaskVo getTask(String taskId);
 
     void addTask(AsyncTaskVo vo);
 

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/service/impl/AsyncTaskServiceImpl.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import cn.com.qmth.scancentral.service.AsyncTaskService;
 import cn.com.qmth.scancentral.util.FileUtil;
 import cn.com.qmth.scancentral.vo.asynctask.AsyncTaskVo;
-import cn.com.qmth.scancentral.vo.subject.DataExportTaskVo;
 
 @Service
 public class AsyncTaskServiceImpl implements AsyncTaskService {
@@ -48,9 +47,9 @@ public class AsyncTaskServiceImpl implements AsyncTaskService {
     }
 
     @Override
-    public DataExportTaskVo getDataExportTask(String taskId) {
+    public AsyncTaskVo getTask(String taskId) {
         updateTaskActive(taskId);
-        return (DataExportTaskVo) tasks.get(taskId);
+        return tasks.get(taskId);
     }
 
 }