xiatian 9 месяцев назад
Родитель
Сommit
ade767af2c

+ 1 - 0
.gitignore

@@ -43,6 +43,7 @@ yarn.lock
 !**/src/test/**/target/
 target/
 logs/
+temp/
 
 .flattened-pom.xml
 .DS_Store

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

@@ -47,8 +47,8 @@ public class ExamController extends BaseController {
 
     @ApiOperation(value = "扫描点代码设置")
     @PostMapping(value = "scan-site/save")
-    public UpdateTimeVo scanSiteSave(@RequestParam Long examId, @RequestParam String scanStie) {
-        examService.scanSiteSave(examId, scanStie);
+    public UpdateTimeVo scanSiteSave(@RequestParam Long examId, @RequestParam String scanSite) {
+        examService.scanSiteSave(examId, scanSite);
         return UpdateTimeVo.create();
     }
 

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

@@ -1,5 +1,7 @@
 package cn.com.qmth.scancentral.controller.admin;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.util.List;
 
 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.constant.ApiConstant;
 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.service.DataExportTaskService;
@@ -37,9 +38,6 @@ public class SubjectController extends BaseController {
     @Autowired
     private SubjectService subjectService;
 
-    @Autowired
-    private FileStore fileStore;
-
     @Autowired
     private DataExportTaskService dataExportTaskService;
 
@@ -100,6 +98,6 @@ public class SubjectController extends BaseController {
         if (vo.getTotalCount() != (vo.getProgressCount())) {
             throw new ParameterException("导出任务未结束");
         }
-        exportFile(vo.getFileName(), fileStore.read(vo.getFilePath()));
+        exportFile(vo.getFileName(), new FileInputStream(new File(vo.getFilePath())));
     }
 }