完善扫描相关

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

@@ -105,7 +105,7 @@ public class MsScanbatchController {
     public ResultVo listRecordClassStudents(@RequestBody ScanParams params) {
         Integer page = params.getPage();
         Integer pageSize = params.getPageSize();
-        N_Utils.validation(new Object[]{params.getMpid(), "试卷id", 1,page, "显示页码", 1, pageSize, "显示条数", 1});
+        N_Utils.validation(new Object[]{params.getMpid(), "试卷id", 1,params.getExamid(), "考试id", 1,page, "显示页码", 1, pageSize, "显示条数", 1});
         PageHelper.startPage(page, pageSize);
         int examid = msPaperService.getExamidByMpid(params.getMpid());
         params.setExamid(examid);

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

@@ -77,7 +77,7 @@ public class MsScanbatchPaperController {
             String message = e.getMessage();
             if(!message.contains("禁止扫描")){
                 message = "保存失败";
-                log.error("保存扫描试卷失败", e.getMessage());
+                log.error("保存扫描试卷失败：" + e.getMessage());
             }
             return new ResultVo(1, message);
         }

smarking/src/main/java/com/xhkjedu/smarking/mapper/scan/MsScanbatchPaperMapper.java

@@ -3,6 +3,7 @@ package com.xhkjedu.smarking.mapper.scan;
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
+import com.xhkjedu.smarking.vo.scan.ScanParams;
 import com.xhkjedu.smarking.vo.stupaper.PaperStudentWebVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -43,4 +44,8 @@ public interface MsScanbatchPaperMapper extends TkMapper<MsScanbatchPaper> {
 
     //扫描异常-缺考异常-异常处理
     int updateBatchScanPaperMspstate(@Param("list") List<PaperStudentWebVo> list);
+    //获取重新识别数据
+    List<MsScanbatchPaper> listScanPapersForReidentify(@Param("param") ScanParams param);
+    //删除需要重新识别试卷识别数据
+    int deleteScanPaperForReidentify(@Param("param") ScanParams param);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentBlockMapper.java

@@ -16,9 +16,6 @@ public interface MsPaperStudentBlockMapper extends TkMapper<MsPaperStudentBlock>
     //根据学生试卷ID清空作答及批阅信息
     int updateStudentBlockQuestionByMpsid(@Param("mpsid")Integer mpsid);
 
-    //清空试卷下所有学生作答及批阅信息
-    int updateStudentBlockQuestionByMpid(@Param("mpid")Integer mpid);
-
     //获取学生题块试题
     List<MsPaperStudentBlock> listPaperStuBlockQuestions(@Param("mpsid")Integer mpsid);
 
@@ -32,4 +29,5 @@ public interface MsPaperStudentBlockMapper extends TkMapper<MsPaperStudentBlock>
     void updateByMpsbidsAndTeacherid(@Param("mpsbids") String mpsbids,@Param("teacherid") Integer teacherid);
     //批量保存学生题块
     void insertBatchStudentBlock(@Param("list") List<MsPaperStudentBlock> list);
+
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentMapper.java

@@ -7,6 +7,7 @@ import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudent;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
 import com.xhkjedu.smarking.vo.exam.CStudentVo;
+import com.xhkjedu.smarking.vo.scan.ScanParams;
 import com.xhkjedu.smarking.vo.stupaper.PaperStuExamVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.scheduling.annotation.Async;
@@ -58,8 +59,6 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
     Integer updateStudentPaper(@Param("ps")MsPaperStudent ps);
     //试卷答案-客观题-批量更新学生试卷分值
     int updateBathStudentPaperScoreByMpsid(@Param("mpid") Integer mpid,@Param("mpsids") List<Integer> mpsids);
-    //修改学生试卷设置题块收试题数量
-    Integer updatePaperMergepnumByMpid(@Param("mpid")Integer mpid,@Param("mergepnum")Integer mergepnum);
 
     //学生考试-获取开始考试学生数量
     Integer getNumByExamIdAndSubjectIdAndStuId(@Param("student") MsClassStudent student);
@@ -93,4 +92,7 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
 
     //试学生成绩列表
     List<MsrStudent> listPaperStudentByExamId(@Param("examid") Integer examid, @Param("mpids") List<Integer> mpids);
+
+    //清空试卷下所有学生识别作答及批阅信息
+    int updateStudentBlockQuestionForReIdentify(@Param("param") ScanParams param);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsTemplate.java

@@ -23,6 +23,10 @@ public class MsTemplate extends BaseBean {
     private Integer mpid;
     //模板尺寸1A4 2A3
     private Integer tsize;
+    //纸张宽度(像素)
+    private Integer twidth;
+    //纸张高度(像素)
+    private Integer theight;
     //正面图片
     private String tfront;
     //反面图片

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatchPaper.java

@@ -27,6 +27,10 @@ public class MsScanbatchPaper extends BaseBean {
     private String paperfront;
     //试卷反面
     private String paperback;
+    //纸张宽度(像素)
+    private Integer twidth;
+    //纸张高度(像素)
+    private Integer theight;
     //是否识别0未识别1已识别
     private Integer identified;
     //考号

smarking/src/main/java/com/xhkjedu/smarking/service/exam/SubjectScoreService.java

@@ -44,8 +44,12 @@ public class SubjectScoreService {
             double avgobj = 0.0;
             double avgsub = 0.0;
             if(queMap!= null){
-                avgobj = (double) queMap.get("avgobj");
-                avgsub = (double) queMap.get("avgsub");
+                if(queMap.get("avgobj")!= null){
+                    avgobj = (double) queMap.get("avgobj");
+                }
+                if(queMap.get("avgsub") != null){
+                    avgsub = (double) queMap.get("avgsub");
+                }
             }
             map.put("avgobj", avgobj);
             map.put("avgsub", avgsub);

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

@@ -23,6 +23,7 @@ import com.xhkjedu.smarking.model.stupaper.MsPaperStudent;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.MarkingUtil;
+import com.xhkjedu.smarking.vo.scan.ScanParams;
 import com.xhkjedu.smarking.vo.stupaper.PaperStudentWebVo;
 import com.xhkjedu.smarking.vo.system.SchoolCloudVo;
 import com.xhkjedu.utils.N_Utils;
@@ -637,19 +638,52 @@ public class MsScanbatchPaperService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void reIdentifyPaper(Integer examid,String subjectid,Integer mpid) {
-        Integer examstate  = msExamMapper.getExamstate(examid);
+    public void reIdentifyPaper(ScanParams param) {
+        Integer examstate  = msExamMapper.getExamstate(param.getExamid());
         if(examstate >= 3){
             throw new ServiceException("考试已统分，禁止重新识别");
         }
 
-        //清空学生题块试题信息和学生试卷扫描信息
-        msPaperStudentBlockMapper.updateStudentBlockQuestionByMpid(mpid);
-        msPaperStudentMapper.updateStuPaperForScanClearByMpid(mpid);
+        Integer mpid = param.getMpid();
+        //获取符合条件的需要重新识别的试卷
+        List<MsScanbatchPaper> scanbatchPapers = msScanbatchPaperMapper.listScanPapersForReidentify(param);
+        if(scanbatchPapers.isEmpty()) return;
 
         //获取考试对应的试卷模板及坐标信息
         List<MsTemplate> templates = msTemplateMapper.listTemplateBlockQueByMpid(mpid);
+        if(templates.isEmpty()) throw new ServiceException("该考试未设置试卷模板");
 
+        //清空学生题块试题信息和学生试卷扫描识别信息
+        msPaperStudentMapper.updateStudentBlockQuestionForReIdentify(param);
+        //清空符合条件的需要从新识别的试卷的识别信息
+        msScanbatchPaperMapper.deleteScanPaperForReidentify(param);
     }
 
+    private void chandleIdentifyPaper(List<MsScanbatchPaper> scanbatchPapers,List<MsTemplate> templates){
+        MsTemplate template = getPaperTemplate(scanbatchPapers,templates);//试卷模板
+        for(MsScanbatchPaper scanbatchPaper : scanbatchPapers){
+
+        }
+    }
+    //重新识别-试卷模板
+    private MsTemplate getPaperTemplate(List<MsScanbatchPaper> scanbatchPapers,List<MsTemplate> templates){
+        MsTemplate template = null;//试卷模板
+        if(templates.size() == 1){
+            template = templates.get(0);
+        }else{
+            MsScanbatchPaper firstPaper = scanbatchPapers.get(0);
+            Integer maxWidth = firstPaper.getTwidth() + 30;
+            Integer minWidth = firstPaper.getTwidth() - 30;
+            for(MsTemplate t : templates){
+                if(t.getTwidth() >= minWidth && t.getTwidth() <= maxWidth){
+                    template = t;
+                    break;
+                }
+            }
+        }
+        return template;
+    }
+
+
+
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/scan/ScanParams.java

@@ -18,7 +18,7 @@ public class ScanParams extends BaseBean {
 
     private Integer batchid;//批次ID
 
-    private Integer hasscan;//是否扫描1已扫2未扫
+    private Integer hasscan;//是否扫描0全部1已扫2未扫
 
-    private Integer hasidentify;//是否识别1已识别2未识别
+    private Integer hasidentify;//是否识别0全部1已识别2未识别
 }

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -117,7 +117,7 @@
         and ms.msstate=0 and concat(ms.sdate,' ',ms.begintime)<=#{strtime}
     </update>
     <!--定时任务-科目结束考试-获取待结束考试-->
-    <select id="listMsidsForEndSubject" resultType="javj.lang.Integer">
+    <select id="listMsidsForEndSubject" resultType="java.lang.Integer">
         select ms.msid from ms_subject ms left join ms_exam e on ms.examid=e.examid
         where e.examstate>=1 and e.deleted=1 and e.exammode=3 and ms.msstate=1
         and adddate(concat(ms.sdate,' ',ms.endtime),interval 5 minute) &lt;#{strtime}

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

@@ -55,6 +55,8 @@
         <result property="mtid" column="mtid"/>
         <result property="mpid" column="mpid"/>
         <result property="tsize" column="tsize"/>
+        <result property="twidth" column="twidth"/>
+        <result property="theight" column="theight"/>
         <result property="blankindex" column="blankindex"/>
         <result property="anglefront" column="anglefront"/>
         <result property="angleback" column="angleback"/>
@@ -85,7 +87,7 @@
         </collection>
     </resultMap>
     <select id="listTemplateBlockQueByMpid" resultMap="paperTemplate">
-        select t.mtid,t.mpid,t.tsize,t.blankindex,t.anglefront,t.angleback,t.coorfront,t.coorback,
+        select t.mtid,t.mpid,t.tsize,t.twidth,t.theight,t.blankindex,t.anglefront,t.angleback,t.coorfront,t.coorback,
         t.dwtfront,t.dwtback,t.misscoor,t.violatecoor,t.examnocoor,t.cardcoor
         ,tb.mtbid,tb.mblockid,tb.mttype,tb.mtborder,tb.localcoor,tb.pagenum,tb.extendcoor,tb.scorecoor
         ,q.mtbqid,q.qn,q.mptqid,q.qlocalcoor,q.mtbqorder

smarking/src/main/resources/mapper/scan/MsScanbatchMapper.xml

@@ -51,10 +51,10 @@
         <if test="params.classid!=null and params.classid!=0">
             and cs.classid=#{params.classid}
         </if>
-        <if test="params.hasscan!=null and params.hasscan!=0 and params.hasscan==1">
+        <if test="params.hasscan!=null and params.hasscan==1">
             and ps.batchid is not null
         </if>
-        <if test="params.hasscan!=null and params.hasscan!=0 and params.hasscan==2">
+        <if test="params.hasscan!=null and params.hasscan==2">
             and ps.batchid is null
         </if>
         order by cs.mcsid
@@ -71,10 +71,10 @@
         <if test="params.batchid!=null and params.batchid!=0">
             and b.batchid=#{params.batchid}
         </if>
-        <if test="params.hasidentify!=null and params.hasidentify!=0 and params.hasidentify==1">
+        <if test="params.hasidentify!=null and params.hasidentify==1">
             and sp.identified=1
         </if>
-        <if test="params.hasidentify!=null and params.hasidentify!=0 and params.hasidentify==2">
+        <if test="params.hasidentify!=null and params.hasidentify==2">
             and sp.identified=0
         </if>
         order by b.batchid,sp.mspid

smarking/src/main/resources/mapper/scan/MsScanbatchPaperMapper.xml

@@ -71,4 +71,21 @@
         </foreach>
     </update>
 
+    <!--获取重新识别数据-->
+    <select id="listScanPapersForReidentify" resultType="com.xhkjedu.smarking.model.scan.MsScanbatchPaper">
+        select * from ms_scanbatch_paper where mpid=#{param.mpid}
+        <if test="param.batchid!=null and param.batchid!=0"> and batchid=#{param.batchid}</if>
+        <if test="param.hasidentify!=null and param.hasidentify==1"> and identified=1</if>
+        <if test="param.hasidentify!=null and param.hasidentify==2"> and identified=0</if>
+        order by mspid
+    </select>
+    <!--删除需要重新识别试卷识别数据-->
+    <delete id="deleteScanPaperForReidentify">
+        delete b from ms_scanbatch_paper_block b left join ms_scanbatch_paper p on b.mspid=p.mspid
+        where p.mpid=#{param.mpid}
+        <if test="param.batchid!=null and param.batchid!=0"> and p.batchid=#{param.batchid}</if>
+        <if test="param.hasidentify!=null and param.hasidentify==1"> and p.identified=1</if>
+        <if test="param.hasidentify!=null and param.hasidentify==2"> and p.identified=0</if>
+    </delete>
+
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentBlockMapper.xml

@@ -15,19 +15,6 @@
             q.hasbad=0,q.hasproblem=0,q.problemtype=0,q.problemcomm=null
         where b.mpsid = #{mpsid}
     </update>
-    <!--清空试卷下所有学生作答及批阅信息-->
-    <update id="updateStudentBlockQuestionByMpid">
-        update ms_paper_student_block b join ms_paper_student_question q
-        on b.mpsid=q.mpsid and b.mblockid=q.mblockid
-            set b.stuanswer=null,b.converted=0,b.checked=0,b.hasgood=0,b.hasbad=0,b.firstcid=null,b.firstcime=null,b.firstccore=0,
-                b.secondcid=null,b.secondctime=null,b.secondcscore=0,b.arbitrateid=null,b.arbitratetime=null,b.arbitratescore=0,
-                b.hasproblem=0,b.problemtype=0,b.problemcomm=null,b.hasfinal=0,b.finalreason=0,
-                q.answered=0,q.answertype=0,q.stuanswer=null,q.converted=0,q.answertime=0,q.stuscore=0,
-                q.checked=0,q.firstcid=null,q.firstcime=null,q.firstccore=0,q.secondcid=null,q.secondctime=null,q.secondcscore=0,
-                q.arbitrateid=null,q.arbitratetime=null,q.arbitratescore=0,q.hasgood=0,
-                q.hasbad=0,q.hasproblem=0,q.problemtype=0,q.problemcomm=null
-        where b.mpid = #{mpid}
-    </update>
 
     <!--获取学生题块试题-->
     <resultMap id="stuBlockQuestions" type="com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock">

smarking/src/main/resources/mapper/stupaper/MsPaperStudentMapper.xml

@@ -288,4 +288,25 @@
         where mpsid=#{mpsid}
     </update>
 
+    <!--清空试卷下所有学生识别作答及批阅信息-->
+    <update id="updateStudentBlockQuestionForReIdentify">
+        update ms_paper_student_block b join ms_paper_student_question q
+        on b.mpsid=q.mpsid and b.mblockid=q.mblockid
+        left join ms_paper_student ps on ps.mpsid=b.mpsid
+        left join ms_scanbatch_paper sp on ps.mspid=sp.mspid
+        set b.stuanswer=null,b.converted=0,b.checked=0,b.hasgood=0,b.hasbad=0,b.firstcid=null,b.firstcime=null,b.firstccore=0,
+        b.secondcid=null,b.secondctime=null,b.secondcscore=0,b.arbitrateid=null,b.arbitratetime=null,b.arbitratescore=0,
+        b.hasproblem=0,b.problemtype=0,b.problemcomm=null,b.hasfinal=0,b.finalreason=0,
+        q.answered=0,q.answertype=0,q.stuanswer=null,q.converted=0,q.answertime=0,q.stuscore=0,
+        q.checked=0,q.firstcid=null,q.firstcime=null,q.firstccore=0,q.secondcid=null,q.secondctime=null,q.secondcscore=0,
+        q.arbitrateid=null,q.arbitratetime=null,q.arbitratescore=0,q.hasgood=0,
+        q.hasbad=0,q.hasproblem=0,q.problemtype=0,q.problemcomm=null,
+        ps.sstate=0,ps.stuscore=0.0,ps.stuscoretype=0,ps.hasbad=0,ps.batchid=null,ps.mspid=null,
+        ps.paperfront=null,ps.paperback=null,ps.pagenum=0
+        where b.mpid = #{param.mpid}
+        <if test="param.batchid!=null and param.batchid!=0"> and sp.batchid=#{param.batchid}</if>
+        <if test="param.hasidentify!=null and param.hasidentify==1"> and sp.identified=1</if>
+        <if test="param.hasidentify!=null and param.hasidentify==2"> and sp.identified=0</if>
+    </update>
+
 </mapper>