update

src/main/java/cn/com/qmth/scancentral/controller/admin/ArbitrateController.java → src/main/java/cn/com/qmth/scancentral/controller/admin/OmrArbitrateController.java

@@ -1,17 +1,5 @@
 package cn.com.qmth.scancentral.controller.admin;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-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;
@@ -19,25 +7,31 @@ 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.web.bind.annotation.*;
 
 @RestController
-@Api(tags = "识别对照接口")
+@Api(tags = "识别对照仲裁任务接口")
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/admin/check/omr/arbitrate")
 @Aac(strict = false, auth = true)
-public class ArbitrateController extends BaseController {
+public class OmrArbitrateController extends BaseController {
 
-    protected static final Logger log = LoggerFactory.getLogger(ArbitrateController.class);
+    protected static final Logger log = LoggerFactory.getLogger(OmrArbitrateController.class);
 
     @Autowired
     private OmrTaskService omrTaskService;
 
     @ApiOperation(value = "识别对照仲裁任务获取")
     @RequestMapping(value = "/get", method = RequestMethod.POST)
-    public TaskVo get(@RequestParam Long examId) {
+    public TaskVo get(@RequestParam Long groupId) {
         User user = getAccessUser();
-        return omrTaskService.getArbitrateTask(examId, user.getAccount());
+        return omrTaskService.getArbitrateTask(groupId, user.getAccount());
     }
 
     @ApiOperation(value = "识别对照仲裁结果提交")
@@ -65,8 +59,9 @@ public class ArbitrateController 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.getArbitrateHistory(examId, id, user.getAccount(), next);
     }
+
 }

src/main/java/cn/com/qmth/scancentral/dao/OmrTaskDao.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface OmrTaskDao extends BaseMapper<OmrTaskEntity> {
 
-    List<OmrTaskEntity> findUnMarked(@Param(value = "examId") Long examId,
+    List<OmrTaskEntity> findUnMarked(@Param(value = "groupId") Long groupId,
                                      @Param(value = "startNumber") int startNumber, @Param(value = "pageSize") int pageSize,
                                      @Param(value = "status") TaskStatus status);
 

src/main/java/cn/com/qmth/scancentral/service/OmrTaskService.java

@@ -33,7 +33,7 @@ public interface OmrTaskService extends IService<OmrTaskEntity> {
 
     TaskSaveVo submitTask(TaskResultVo result, User user);
 
-    TaskVo getArbitrateTask(Long examId, String user);
+    TaskVo getArbitrateTask(Long groupId, String user);
 
     TaskStatusVo getStatus(Long examId, Boolean isArbitrate, String account);
 

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

@@ -453,11 +453,11 @@ public class OmrTaskServiceImpl extends ServiceImpl<OmrTaskDao, OmrTaskEntity> i
         return findWaitingTask(examId, account, false);
     }
 
-    private TaskVo findWaitingTask(Long examId, String account, boolean isArbitrate) {
+    private TaskVo findWaitingTask(Long groupId, String account, boolean isArbitrate) {
         int retry = 0;
         TaskVo task = null;
         while (task == null) {
-            List<OmrTaskEntity> list = this.findUnMarked(examId, retry * 20, 20,
+            List<OmrTaskEntity> list = this.findUnMarked(groupId, retry * 20, 20,
                     isArbitrate ? TaskStatus.WAIT_ARBITRATE : TaskStatus.WAITING);
             if (list.isEmpty()) {
                 break;
@@ -738,8 +738,8 @@ public class OmrTaskServiceImpl extends ServiceImpl<OmrTaskDao, OmrTaskEntity> i
     }
 
     @Override
-    public TaskVo getArbitrateTask(Long examId, String account) {
-        return findWaitingTask(examId, account, true);
+    public TaskVo getArbitrateTask(Long groupId, String account) {
+        return findWaitingTask(groupId, account, true);
     }
 
     @Override

src/main/resources/mapper/OmrTaskMapper.xml

@@ -11,7 +11,7 @@
     <select id="findUnMarked" resultMap="custMap">
         select *
         from sc_omr_task t
-        where t.exam_id = #{examId}
+        where t.group_id = #{groupId}
           and t.status = #{status}
         order by t.id
         limit #{startNumber},#{pageSize}