update

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

@@ -85,12 +85,6 @@ public class CheckController extends BaseController {
     @Autowired
     private SubjectService subjectService;
 
-    @ApiOperation(value = "所有可用的识别对照条件")
-    @PostMapping("omr/conditions")
-    public List<OmrConditionsVo> omrConditions() {
-        return Arrays.stream(ConditionType.values()).map(OmrConditionsVo::new).collect(Collectors.toList());
-    }
-
     @ApiOperation(value = "缺考数据汇总")
     @PostMapping("absent/info")
     public AbsentInfoVo absentInfo(@RequestParam Long examId, @RequestParam(required = false) GroupType groupType,

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

@@ -1,39 +1,37 @@
 package cn.com.qmth.scancentral.controller.admin;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.task.AsyncTaskExecutor;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-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.concurrent.model.Semaphore;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.exception.ReentrantException;
-
 import cn.com.qmth.scancentral.controller.BaseController;
 import cn.com.qmth.scancentral.entity.OmrGroupEntity;
+import cn.com.qmth.scancentral.enums.ConditionType;
 import cn.com.qmth.scancentral.enums.LockType;
 import cn.com.qmth.scancentral.enums.Stage;
 import cn.com.qmth.scancentral.service.OmrGroupService;
 import cn.com.qmth.scancentral.task.thread.OmrGroupBuildThread;
 import cn.com.qmth.scancentral.task.thread.OmrGroupDeleteThread;
 import cn.com.qmth.scancentral.task.thread.OmrGroupResetThread;
+import cn.com.qmth.scancentral.vo.OmrConditionsVo;
 import cn.com.qmth.scancentral.vo.OmrGroupUpdateVo;
 import cn.com.qmth.scancentral.vo.OmrGroupVo;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.boot.core.concurrent.model.Semaphore;
+import com.qmth.boot.core.concurrent.service.ConcurrentService;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.exception.ReentrantException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = "识别对照任务组接口")
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/check/omr/group")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/check/omr")
 @Aac(strict = false, auth = true)
 public class OmrGroupController extends BaseController {
 
@@ -46,14 +44,20 @@ public class OmrGroupController extends BaseController {
     @Autowired
     private AsyncTaskExecutor taskExecutor;
 
+    @ApiOperation(value = "所有可用的识别对照条件")
+    @PostMapping("/conditions")
+    public List<OmrConditionsVo> omrConditions() {
+        return Arrays.stream(ConditionType.values()).map(OmrConditionsVo::new).collect(Collectors.toList());
+    }
+
     @ApiOperation(value = "查询识别对照任务列表")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/group/list", method = RequestMethod.POST)
     public List<OmrGroupVo> list(@RequestParam Long examId) {
         return groupService.listByExamId(examId);
     }
 
     @ApiOperation(value = "创建修改识别对照任务组")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/group/save", method = RequestMethod.POST)
     public JSONObject save(@RequestBody OmrGroupUpdateVo omrGroupUpdateVo) {
         OmrGroupEntity group = groupService.save(omrGroupUpdateVo.getId(), omrGroupUpdateVo.getExamId(),
                 omrGroupUpdateVo.getConditionList(), getAccessUser().getId());
@@ -64,7 +68,7 @@ public class OmrGroupController extends BaseController {
     }
 
     @ApiOperation(value = "修改识别对照任务组阶段")
-    @RequestMapping(value = "/toggle", method = RequestMethod.POST)
+    @RequestMapping(value = "/group/toggle", method = RequestMethod.POST)
     public JSONObject toggle(@RequestParam Long id) {
         groupService.updateStage(id, getAccessUser().getId());
         JSONObject result = new JSONObject();
@@ -74,7 +78,7 @@ public class OmrGroupController extends BaseController {
     }
 
     @ApiOperation(value = "识别对照任务组生成任务")
-    @RequestMapping(value = "/build", method = RequestMethod.POST)
+    @RequestMapping(value = "/group/build", method = RequestMethod.POST)
     public JSONObject build(@RequestParam Long id) {
         OmrGroupEntity group = groupService.getById(id);
         if (group == null) {
@@ -97,7 +101,7 @@ public class OmrGroupController extends BaseController {
     }
 
     @ApiOperation(value = "重置识别对照任务组")
-    @RequestMapping(value = "/reset", method = RequestMethod.POST)
+    @RequestMapping(value = "/group/reset", method = RequestMethod.POST)
     public JSONObject reset(@RequestParam Long id) {
         OmrGroupEntity group = groupService.getById(id);
         if (group == null) {
@@ -117,7 +121,7 @@ public class OmrGroupController extends BaseController {
     }
 
     @ApiOperation(value = "删除识别对照任务组")
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    @RequestMapping(value = "/group/delete", method = RequestMethod.POST)
     public JSONObject delete(@RequestParam Long id) {
         OmrGroupEntity group = groupService.getById(id);
         if (group == null) {
@@ -138,4 +142,5 @@ public class OmrGroupController extends BaseController {
         result.accumulate("updateTime", System.currentTimeMillis());
         return result;
     }
+
 }

src/main/java/cn/com/qmth/scancentral/controller/scan/OmrTaskController.java

@@ -1,18 +1,5 @@
 package cn.com.qmth.scancentral.controller.scan;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.qmth.boot.api.annotation.Aac;
-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.OmrTaskService;
@@ -20,8 +7,15 @@ import cn.com.qmth.scancentral.vo.task.TaskResultVo;
 import cn.com.qmth.scancentral.vo.task.TaskSaveVo;
 import cn.com.qmth.scancentral.vo.task.TaskStatusVo;
 import cn.com.qmth.scancentral.vo.task.TaskVo;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.constant.ApiConstant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @Api(tags = "识别对照任务接口")
@@ -66,8 +60,9 @@ public class OmrTaskController extends BaseController {
     @ApiOperation(value = "识别对照任务历史")
     @RequestMapping(value = "/history", method = RequestMethod.POST)
     public TaskVo history(@RequestParam Long examId, @RequestParam(required = false) Long id,
-            @RequestParam(required = false) Boolean next) {
+                          @RequestParam(required = false) Boolean next) {
         User user = getAccessUser();
         return omrTaskService.history(examId, id, user.getAccount(), next);
     }
+
 }

src/main/java/cn/com/qmth/scancentral/service/impl/OmrGroupServiceImpl.java

@@ -294,4 +294,5 @@ public class OmrGroupServiceImpl extends ServiceImpl<OmrGroupDao, OmrGroupEntity
             this.updateTotalCount(omrGroupEntity.getId());
         }
     }
+
 }