重新规划审核员uri

src/main/java/cn/com/qmth/scancentral/controller/admin/AuditorController.java

@@ -11,7 +11,6 @@ import com.qmth.boot.api.constant.ApiConstant;
 
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.controller.BaseController;
-import cn.com.qmth.scancentral.service.BatchService;
 import cn.com.qmth.scancentral.service.ExamService;
 import cn.com.qmth.scancentral.vo.auditor.AuditorOverview;
 import io.swagger.annotations.Api;
@@ -19,16 +18,13 @@ import io.swagger.annotations.ApiOperation;
 
 @RestController
 @Api(tags = "审核员管理接口")
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/auditor")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/auditor/admin")
 @Aac(strict = false, auth = true)
 public class AuditorController extends BaseController {
 
     @Autowired
     private ExamService examService;
 
-    @Autowired
-    private BatchService batchService;
-
     @ApiOperation(value = "考试概览数据")
     @RequestMapping(value = "/overview", method = RequestMethod.POST)
     public AuditorOverview overview(@RequestParam Long examId) {

src/main/java/cn/com/qmth/scancentral/controller/admin/CheckImageController.java → src/main/java/cn/com/qmth/scancentral/controller/admin/BatchInspectController.java

@@ -18,10 +18,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 @RestController
-@Api(tags = "图片审核接口")
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/auditor/check/image")
+@Api(tags = "批次图片抽查接口")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/auditor/batch/inspect")
 @Aac(strict = false, auth = true)
-public class CheckImageController extends BaseController {
+public class BatchInspectController extends BaseController {
 
     @Autowired
     private ExamService examService;
@@ -29,41 +29,41 @@ public class CheckImageController extends BaseController {
     @Autowired
     private BatchService batchService;
 
-    @ApiOperation(value = "修改答题卡扫描图片抽查比例")
+    @ApiOperation(value = "修改批次图片抽查比例")
     @PostMapping("ratio")
     public RatioVo ratio(@RequestParam Long examId, @RequestParam Double ratio) {
         return examService.updateRatio(examId, ratio);
     }
 
-    @ApiOperation(value = "答题卡扫描图片检查任务状态")
+    @ApiOperation(value = "批次图片抽查任务状态")
     @PostMapping("status")
     public TaskStatusVo status(@RequestParam Long examId) {
         User user = getAccessUser();
         return batchService.getCheckImageStatus(examId, user);
     }
 
-    @ApiOperation(value = "获取答题卡扫描图片检查任务")
+    @ApiOperation(value = "获取批次图片抽查任务")
     @RequestMapping(value = "get", method = RequestMethod.POST)
     public VerifyTaskVo get(@RequestParam Long examId) {
         User user = getAccessUser();
         return batchService.getCheckImageTask(examId, user);
     }
 
-    @ApiOperation(value = "历史答题卡扫描图片检查任务")
+    @ApiOperation(value = "历史批次图片抽查")
     @RequestMapping(value = "history", method = RequestMethod.POST)
     public VerifyTaskVo history(@RequestParam Long examId, @RequestParam(required = false) Long batchId) {
         User user = getAccessUser();
         return batchService.getHistoryCheckImageTask(examId, batchId, user);
     }
 
-    @ApiOperation(value = "答题卡扫描图片检查任务提交")
+    @ApiOperation(value = "批次图片抽查任务提交")
     @RequestMapping(value = "submit", method = RequestMethod.POST)
     public CheckImageSubmitVo submit(@RequestParam Long examId, @RequestParam Long batchId) {
         User user = getAccessUser();
         return batchService.submitCheckImageTask(examId, batchId, user);
     }
 
-    @ApiOperation(value = "答题卡扫描图片检查任务释放")
+    @ApiOperation(value = "批次图片抽查任务释放")
     @PostMapping("release")
     public Object release(@RequestParam Long examId) {
         User user = getAccessUser();

src/main/java/cn/com/qmth/scancentral/controller/admin/VerifyController.java → src/main/java/cn/com/qmth/scancentral/controller/admin/BatchVerifyController.java

@@ -19,22 +19,22 @@ import io.swagger.annotations.ApiOperation;
 
 @RestController
 @Api(tags = "答题卡扫描实时审核接口")
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/verify/scan")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/auditor/batch/verify")
 @Aac(strict = false, auth = true)
-public class VerifyController extends BaseController {
+public class BatchVerifyController extends BaseController {
 
     @Autowired
     private BatchService batchService;
 
     @ApiOperation(value = "获取答题卡扫描实时审核任务")
-    @RequestMapping(value = "/answer/get", method = RequestMethod.POST)
+    @RequestMapping(value = "/get", method = RequestMethod.POST)
     public VerifyTaskVo answerGet(@RequestParam Long examId) {
         User user = getAccessUser();
         return batchService.getVerifyTask(examId, user);
     }
 
     @ApiOperation(value = "答题卡扫描实时审核任务处理")
-    @RequestMapping(value = "/answer/submit", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit", method = RequestMethod.POST)
     public UpdateTimeVo answerSubmit(@RequestParam Long batchId, @RequestParam Boolean confirm) {
         User user = getAccessUser();
         batchService.verify(batchId, confirm, user);
@@ -42,7 +42,7 @@ public class VerifyController extends BaseController {
     }
 
     @ApiOperation(value = "答题卡扫描实时审核任务释放")
-    @RequestMapping(value = "/answer/release", method = RequestMethod.POST)
+    @RequestMapping(value = "/release", method = RequestMethod.POST)
     public Object answerRelease(@RequestParam Long examId) {
         User user = getAccessUser();
         batchService.releaseCheckImageTask(examId, user);