|
@@ -1,5 +1,7 @@
|
|
package cn.com.qmth.scancentral.controller.admin;
|
|
package cn.com.qmth.scancentral.controller.admin;
|
|
|
|
|
|
|
|
+import java.io.File;
|
|
|
|
+import java.io.FileInputStream;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
@@ -13,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|
import com.qmth.boot.api.annotation.Aac;
|
|
import com.qmth.boot.api.annotation.Aac;
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
import com.qmth.boot.core.exception.ParameterException;
|
|
import com.qmth.boot.core.exception.ParameterException;
|
|
-import com.qmth.boot.core.fss.store.FileStore;
|
|
|
|
|
|
|
|
import cn.com.qmth.scancentral.controller.BaseController;
|
|
import cn.com.qmth.scancentral.controller.BaseController;
|
|
import cn.com.qmth.scancentral.service.DataExportTaskService;
|
|
import cn.com.qmth.scancentral.service.DataExportTaskService;
|
|
@@ -37,9 +38,6 @@ public class SubjectController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private SubjectService subjectService;
|
|
private SubjectService subjectService;
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private FileStore fileStore;
|
|
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private DataExportTaskService dataExportTaskService;
|
|
private DataExportTaskService dataExportTaskService;
|
|
|
|
|
|
@@ -100,6 +98,6 @@ public class SubjectController extends BaseController {
|
|
if (vo.getTotalCount() != (vo.getProgressCount())) {
|
|
if (vo.getTotalCount() != (vo.getProgressCount())) {
|
|
throw new ParameterException("导出任务未结束");
|
|
throw new ParameterException("导出任务未结束");
|
|
}
|
|
}
|
|
- exportFile(vo.getFileName(), fileStore.read(vo.getFilePath()));
|
|
|
|
|
|
+ exportFile(vo.getFileName(), new FileInputStream(new File(vo.getFilePath())));
|
|
}
|
|
}
|
|
}
|
|
}
|