deason 9 months ago
parent
commit
46b32bc39e

+ 9 - 6
src/main/java/cn/com/qmth/scancentral/controller/admin/StudentImportController.java

@@ -2,6 +2,7 @@ package cn.com.qmth.scancentral.controller.admin;
 
 
 import cn.com.qmth.scancentral.controller.BaseController;
 import cn.com.qmth.scancentral.controller.BaseController;
 import cn.com.qmth.scancentral.service.ExamService;
 import cn.com.qmth.scancentral.service.ExamService;
+import cn.com.qmth.scancentral.service.StudentImportService;
 import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.util.ResouceUtil;
 import cn.com.qmth.scancentral.util.ResouceUtil;
 import cn.com.qmth.scancentral.vo.ResultVo;
 import cn.com.qmth.scancentral.vo.ResultVo;
@@ -22,30 +23,32 @@ import java.util.Map;
 @RestController
 @RestController
 @Api(tags = "考生导入相关接口")
 @Api(tags = "考生导入相关接口")
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/student")
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/student")
-@Aac(strict = false, auth = false)
+@Aac(strict = false, auth = true)
 public class StudentImportController extends BaseController {
 public class StudentImportController extends BaseController {
 
 
     @Autowired
     @Autowired
     private StudentService studentService;
     private StudentService studentService;
 
 
+    @Autowired
+    private StudentImportService studentImportService;
+
     @Autowired
     @Autowired
     private ExamService examService;
     private ExamService examService;
 
 
     @ApiOperation(value = "考生导入")
     @ApiOperation(value = "考生导入")
     @PostMapping("/import")
     @PostMapping("/import")
     public Map<String, Object> studentImport(@RequestParam Long examId, @RequestParam MultipartFile file) {
     public Map<String, Object> studentImport(@RequestParam Long examId, @RequestParam MultipartFile file) {
+        Long taskId = studentImportService.studentImport(examId, file);
+
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
-        result.put("taskId", 1L);
+        result.put("taskId", taskId);
         return result;
         return result;
     }
     }
 
 
     @ApiOperation(value = "考生导入进度查询")
     @ApiOperation(value = "考生导入进度查询")
     @PostMapping("/import/progress")
     @PostMapping("/import/progress")
     public Map<String, Object> studentImportProgress(@RequestParam Long taskId) {
     public Map<String, Object> studentImportProgress(@RequestParam Long taskId) {
-        Map<String, Object> result = new HashMap<>();
-        result.put("progress", 100);
-        result.put("errFileUrl", "");
-        return result;
+        return studentImportService.studentImportProgress(taskId);
     }
     }
 
 
     @ApiOperation(value = "查询科目考生数")
     @ApiOperation(value = "查询科目考生数")

+ 13 - 0
src/main/java/cn/com/qmth/scancentral/service/StudentImportService.java

@@ -0,0 +1,13 @@
+package cn.com.qmth.scancentral.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface StudentImportService {
+
+    Long studentImport(Long examId, MultipartFile file);
+
+    Map<String, Object> studentImportProgress(Long taskId);
+
+}

+ 30 - 0
src/main/java/cn/com/qmth/scancentral/service/impl/StudentImportServiceImpl.java

@@ -0,0 +1,30 @@
+package cn.com.qmth.scancentral.service.impl;
+
+import cn.com.qmth.scancentral.service.StudentImportService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class StudentImportServiceImpl implements StudentImportService {
+
+    private static final Logger log = LoggerFactory.getLogger(StudentImportServiceImpl.class);
+
+    @Override
+    public Long studentImport(Long examId, MultipartFile file) {
+        return 1L;
+    }
+
+    @Override
+    public Map<String, Object> studentImportProgress(Long taskId) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("progress", 100);
+        result.put("errFileUrl", "");
+        return result;
+    }
+
+}