|
@@ -13,6 +13,7 @@ import com.qmth.boot.core.exception.ParameterException;
|
|
|
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.AsyncProgressVo;
|
|
|
import cn.com.qmth.scancentral.vo.asynctask.AsyncTaskVo;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -28,7 +29,7 @@ public class AsyncTaskController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "异步任务进度查询")
|
|
|
@PostMapping("progress")
|
|
|
- public AsyncTaskVo progress(@RequestParam String taskId) {
|
|
|
+ public AsyncProgressVo progress(@RequestParam String taskId) {
|
|
|
AsyncTaskVo vo = asyncTaskService.getTask(taskId);
|
|
|
if (vo == null) {
|
|
|
throw new ParameterException("未找到导出任务");
|
|
@@ -37,7 +38,11 @@ public class AsyncTaskController extends BaseController {
|
|
|
if (vo.getProgress() == 100 && vo.getProgressCount() != vo.getTotalCount()) {
|
|
|
vo.setProgress(99.99);
|
|
|
}
|
|
|
- return vo;
|
|
|
+ AsyncProgressVo ret = new AsyncProgressVo();
|
|
|
+ ret.setErrMsg(vo.getErrMsg());
|
|
|
+ ret.setProgress(vo.getProgress());
|
|
|
+ ret.setSuccess(vo.getSuccess());
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
}
|