试卷切割

smarking/src/main/java/com/xhkjedu/smarking/controller/scan/MsScanbatchPaperController.java

@@ -70,7 +70,7 @@ public class MsScanbatchPaperController {
     public ResultVo saveScanPaper(@RequestBody MsScanbatchPaper msScanbatchPaper) {
         N_Utils.validation(new Object[]{msScanbatchPaper.getBatchid(), "扫描批次id", 1,msScanbatchPaper.getMpid(), "试卷id", 1});
         try{
-            msScanbatchPaperService.savePaperIdentify(msScanbatchPaper);
+            msScanbatchPaperService.savePaperIdentify(msScanbatchPaper,1);
             return new ResultVo(0, "保存成功");
         }catch (Exception e){
             String message = e.getMessage();

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsPaperMapper.java

@@ -63,7 +63,7 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
     //获取试卷类型
     Integer getPaperTypeByMpsid(@Param("mpsid") Integer mpsid);
     //修改试卷切割状态
-    int updatePaperCutState(@Param("mpid") Integer mpid, @Param("cutstate") Integer cutstate);
+    int updatePaperCutState(@Param("mpid") Integer mpid, @Param("yjstate") Integer yjstate);
     //获取试卷切割状态
     Integer getPaperCutStateByMpid(@Param("mpid") Integer mpid);
     //根据试卷ID获取科目名称和考试名称

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperService.java

@@ -116,7 +116,7 @@ public class MsPaperService {
         // 保存试题切割信息
         msPaperQtypeQuestionMapper.updateBatchQuestionCoor(params.getQuestions());
         // 保存试卷切割状态
-        msPaperMapper.updatePaperCutState(params.getMpid(), 1);
+        msPaperMapper.updatePaperCutState(params.getMpid(), 2);
     }
 
     /*

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchPaperService.java

@@ -113,12 +113,12 @@ public class MsScanbatchPaperService {
 
     /**
      * @Description 新增
-     * @Param [msScanbatchPaper]
+     * @Param [msScanbatchPaper, stype:1代表是客户端调用接口保存，2代表服务端自己识别调用]
      * @Author auto
      * @Date 2024-10-15
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void savePaperIdentify(MsScanbatchPaper msScanbatchPaper){
+    public void savePaperIdentify(MsScanbatchPaper msScanbatchPaper,Integer stype){
 
         Integer examstate  = msScanbatchMapper.getExamStateByBatchid(msScanbatchPaper.getBatchid());
         if(examstate == 3){
@@ -127,13 +127,18 @@ public class MsScanbatchPaperService {
 
         //更改扫描、识别次数
         if(N_Utils.isTrueInteger(msScanbatchPaper.getIdentified()) && msScanbatchPaper.getIdentified() == 1){
-            msScanbatchMapper.updateScannumAndIdentifynum(msScanbatchPaper.getBatchid());
+            if(stype == 1){
+                msScanbatchMapper.updateScannumAndIdentifynum(msScanbatchPaper.getBatchid());
+            }else{
+                msScanbatchMapper.updateIdentifynum(msScanbatchPaper.getBatchid());
+            }
+
         }else{
             //保存一次，扫描次数加1
             msScanbatchMapper.updateScannum(msScanbatchPaper.getBatchid());
             //识别出错
             msScanbatchPaper.setErrortype(1);
-            savePaperBlockQuestions(msScanbatchPaper);
+            savePaperBlockQuestions(msScanbatchPaper, stype);
             return;
         }
 
@@ -145,7 +150,7 @@ public class MsScanbatchPaperService {
         //考号不存在，异常信息2考号有误（异常类型1扫描出错 2考号有误 3考号重复 4缺考异常）
         if(N_Utils.isEmpty(examno)){
             msScanbatchPaper.setErrortype(2);
-            savePaperBlockQuestions(msScanbatchPaper);
+            savePaperBlockQuestions(msScanbatchPaper, stype);
             return;
         }
 
@@ -153,7 +158,7 @@ public class MsScanbatchPaperService {
         Integer errorNum = msScanbatchPaperMapper.getErrorNumByMpidAndExamno(msScanbatchPaper.getMpid(),examno);
         if(errorNum > 0){
             msScanbatchPaper.setErrortype(3);
-            savePaperBlockQuestions(msScanbatchPaper);
+            savePaperBlockQuestions(msScanbatchPaper, stype);
             return;
         }
 
@@ -162,7 +167,7 @@ public class MsScanbatchPaperService {
         //用户不存在，异常信息2考号有误
         if(!N_Utils.isTrueInteger(userid)){
             msScanbatchPaper.setErrortype(2);
-            savePaperBlockQuestions(msScanbatchPaper);
+            savePaperBlockQuestions(msScanbatchPaper, stype);
             return;
         }
         //用户存在，获取用户试卷信息
@@ -170,13 +175,13 @@ public class MsScanbatchPaperService {
         //试卷不存在，异常信息1扫描出错
         if(msPaperStudent == null){
             msScanbatchPaper.setErrortype(1);
-            savePaperBlockQuestions(msScanbatchPaper);
+            savePaperBlockQuestions(msScanbatchPaper, stype);
             return;
         }
         //试卷存在，判断学生是否已绑定扫描试卷信息，已有保存扫描信息本次异常，异常信息3考号重复
         if(N_Utils.isTrueInteger(msPaperStudent.getMspid())){
             msScanbatchPaper.setErrortype(3);
-            savePaperBlockQuestions(msScanbatchPaper);
+            savePaperBlockQuestions(msScanbatchPaper, stype);
             //处理上一次对应扫描试卷为3考号重复，并清空学生试卷试题信息
             msScanbatchPaperMapper.updatePaperErrortype(msPaperStudent.getMspid(),3);
             updatePaperStudentQuestion(msPaperStudent);
@@ -184,7 +189,7 @@ public class MsScanbatchPaperService {
         }
 
         //保存扫描信息
-        savePaperBlockQuestions(msScanbatchPaper);
+        savePaperBlockQuestions(msScanbatchPaper, stype);
         //学生试卷信息
         int answernum = saveStudentBlockQuestions(msScanbatchPaper,msPaperStudent.getMpsid());
         if (!N_Utils.isEmptyInteger(msScanbatchPaper.getMissexam()) && msScanbatchPaper.getMissexam() == 1 && answernum>0) {//缺考
@@ -196,8 +201,7 @@ public class MsScanbatchPaperService {
     }
 
     //保存扫描试卷-保存扫描题块试题信息
-    private void savePaperBlockQuestions(MsScanbatchPaper msScanbatchPaper){
-
+    private void savePaperBlockQuestions(MsScanbatchPaper msScanbatchPaper,Integer stype){
         if(msScanbatchPaper.getErrortype() == null){
             msScanbatchPaper.setErrortype(0);
             msScanbatchPaper.setMspstate(0);
@@ -205,11 +209,17 @@ public class MsScanbatchPaperService {
             msScanbatchPaper.setMspstate(1);
         }
 
-        msScanbatchPaperMapper.insertUseGeneratedKeys(msScanbatchPaper);
+        Integer mspid = msScanbatchPaper.getMspid();
+        if(stype == 1 || msScanbatchPaper.getMspid() == null){
+            msScanbatchPaperMapper.insertUseGeneratedKeys(msScanbatchPaper);
+            mspid = msScanbatchPaper.getId();
+        }else{
+            msScanbatchPaperMapper.updateScanPaperForReidentified(msScanbatchPaper);
+        }
+
         //如果识别出错则不再进行后续保存
         if(msScanbatchPaper.getErrortype() == 1) return;
 
-        Integer mspid = msScanbatchPaper.getId();
         msScanbatchPaper.setMspid(mspid);
 
         //保存试题
@@ -707,6 +717,14 @@ public class MsScanbatchPaperService {
         }
         if(templates.isEmpty()) throw new ServiceException("该考试未设置试卷模板");
 
+        //处理之前扫描识别结果，把需要重新识别的试卷按批次进行分组
+        // Map<Integer,List<MsScanbatchPaper>> batchMap = scanbatchPapers.stream().collect(Collectors.groupingBy(MsScanbatchPaper::getBatchid));
+        // for(Integer batchid : batchMap.keySet()){
+        //     List<MsScanbatchPaper> papers = batchMap.get(batchid);
+        //     //把识别数量、违规数量、缺考数量 减去
+        //
+        // }
+
         //清空学生题块试题信息和学生试卷扫描识别信息
         // msPaperStudentMapper.updateStudentBlockQuestionForReIdentify(param);
         //清空符合条件的需要从新识别的试卷的识别信息
@@ -718,20 +736,10 @@ public class MsScanbatchPaperService {
         System.out.println("saveFloder:" + saveFloder);
         for(MsScanbatchPaper paper : scanbatchPapers){
             chandleIdentifyPaper(paper,stps,saveFloder);
+            System.out.println("识别完成!");
 
-            //修改扫描试卷信息
-            // msScanbatchPaperMapper.updateScanPaperForReidentified(paper);
-            List<MsScanbatchPaperBlock> blocks = paper.getSpblocks();
-            // msScanbatchPaperBlockMapper.insertList(blocks);
-            List<MsScanbatchPaperBlockQuestion> allQuestions = new ArrayList<>();
-            for(MsScanbatchPaperBlock block : blocks){
-                int mspbid = block.getId();
-                for(MsScanbatchPaperBlockQuestion question : block.getSpbquestions()){
-                    question.setMspbid(mspbid);
-                    allQuestions.add(question);
-                }
-            }
-            // if(!allQuestions.isEmpty()) msScanbatchPaperBlockQuestionMapper.insertList(allQuestions);
+            //保存扫描试卷信息，和客户端扫描保存调用同一个接口
+            // savePaperIdentify(paper, 2);
         }
     }
 

smarking/src/main/java/com/xhkjedu/smarking/utils/opencv/CvCommonUtils.java

@@ -645,7 +645,7 @@ public class CvCommonUtils {
     }
 
     /**
-     * 保存图片
+     * 读取网络图片
      *
      * @param imageUrl 图片地址
      * @return 读取的图像矩阵

smarking/src/main/resources/mapper/paper/MsPaperMapper.xml

@@ -112,11 +112,11 @@
 
     <!--修改试卷切割状态-->
     <update id="updatePaperCutState">
-        update ms_paper set cutstate=#{cutstate} where mpid=#{mpid}
+        update ms_paper set yjstate=#{yjstate} where mpid=#{mpid}
     </update>
     <!--获取试卷切割状态-->
     <select id="getPaperCutStateByMpid" resultType="java.lang.Integer">
-        select cutstate from ms_paper where mpid=#{mpid}
+        select yjstate from ms_paper where mpid=#{mpid}
     </select>
     <!--根据试卷ID获取科目名称和考试名称-->
     <select id="getSubjectAndExamByMpid" resultType="java.util.Map">