试卷合并

sexam/src/main/java/com/xhkjedu/sexam/config/RabbitConfig.java

@@ -0,0 +1,46 @@
+package com.xhkjedu.sexam.config;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ywx
+ * @classname RabbitConfig
+ * @description
+ * @date 2021/6/18 12:51
+ **/
+@Configuration
+public class RabbitConfig {
+
+    @Value("${rabbitmq.examImgMergeQueue}")
+    private String examImgMergeQueue;
+    @Value("${rabbitmq.examImgMergeHandleQueue}")
+    private String examImgMergeHandleQueue;
+    @Value("${rabbitmq.examBaseToPdfQueue}")
+    private String examBaseToPdfQueue;
+    @Value("${rabbitmq.examBaseToPdfHandleQueue}")
+    private String examBaseToPdfHandleQueue;
+
+    @Bean
+    public Queue examImgMergeQueue() {
+        return new Queue(examImgMergeQueue);
+    }
+
+    @Bean
+    public Queue examImgMergeHandleQueue() {
+        return new Queue(examImgMergeHandleQueue);
+    }
+
+    @Bean
+    public Queue examBaseToPdfQueue() {
+        return new Queue(examBaseToPdfQueue);
+    }
+
+    @Bean
+    public Queue examBaseToPdfHandleQueue() {
+        return new Queue(examBaseToPdfHandleQueue);
+    }
+
+}

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentController.java

@@ -113,7 +113,7 @@ public class EPaperStudentController {
             N_Utils.validation(new Object[]{ps.getEpsid(), "试卷id", 1});
             List<EPaperStudentQuestion> qlist = ps.getQuestions();
             if (N_Utils.isListEmpty(qlist)) {
-                return new ResultVo(1, "试题");
+                return new ResultVo(1, "试题不能为空");
             }
             ePaperStudentService.saveCommitPaperForWeb(ps);
             return new ResultVo(0, "成功提交试卷");
@@ -123,5 +123,17 @@ public class EPaperStudentController {
         }
     }
 
+    @PostMapping("/sca")
+    public ResultVo saveCommitPaperScantron(@RequestBody PaperStudentWebVo ps) {
+        try {
+            N_Utils.validation(new Object[]{ps.getEpid(), "试卷id", 1});
+            ePaperStudentService.saveCommitPaperForScantron(ps);
+            return new ResultVo(0, "成功提交试卷");
+        } catch (Exception e) {
+            log.error("提交试卷(web)失败：" + e.getMessage());
+            return new ResultVo(1, "提交失败");
+        }
+    }
+
 
 }

sexam/src/main/java/com/xhkjedu/sexam/listener/MessageSender.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.sexam.listener;
 
 import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -17,6 +18,7 @@ import java.util.Map;
  * @date 2021/10/25 14:28
  **/
 @Component
+@Slf4j
 public class MessageSender {
     @Autowired
     private AmqpTemplate rabbitTemplate;
@@ -49,12 +51,14 @@ public class MessageSender {
      * @Author wn
      * @Date 2022/8/2 13:57
      **/
-    public void base64ToPdf(Integer epid,Integer examid, List<String> imgs,String savefolder) {
+    public void base64ToPdf(Integer epid,Integer examid, List<String> imgs,String savefolder,Integer scantroncol) {
         Map map = new HashMap();
         map.put("epid", epid);
         map.put("examid", examid);
         map.put("imgs", imgs);
-        map.put("savefolder","");
+        map.put("scantroncol", scantroncol);
+        map.put("savefolder",savefolder);
+
         rabbitTemplate.convertAndSend(examBaseToPdfQueue, JSON.toJSONString(map));
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentMapper.java

@@ -46,6 +46,9 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
     //学生提交试卷
     int updateStudentPaper(@Param("ps")EPaperStudent ps);
 
+    //更新缺考字段
+    void updateStudentPaperState(@Param("ps")EPaperStudent ps);
+
     //根据试卷id批量修改该试卷学生得分
     void updateBathStudentPaperScoreByEpid(@Param("epid")Integer epid);
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -627,12 +627,12 @@ public class EPaperQtypeService {
         if(paper.getPstate() == 1){
             eSubjectMapper.updateEsubjectStateByEpid(1,paper.getEpid());
             //提交之后把答题卡base图片转成pdf
-//            chandleScantronFile(paper.getEpid());
+            chandleScantronFile(paper.getEpid());
         }
     }
 
-    //答题卡种图片处理
-    private void chandleScantronFile(Integer epid){
+    //答题卡中图片处理
+    public void chandleScantronFile(Integer epid){
         //获取试卷中答题卡文件，
         Map map = ePaperMapper.getPaperScantronfile(epid);
         if(map.get("scantronfile")!=null){
@@ -641,9 +641,9 @@ public class EPaperQtypeService {
                 Integer examid = Integer.parseInt(map.get("examid").toString());
                 Integer schoolid = Integer.parseInt(map.get("schoolid").toString());
                 String cloudcode =  map.get("cloudcode").toString();
-                String path = cloudcode + File.separator + schoolid + File.separator + "exam" +
-                        File.separator;
-                convertUtil.baseToPdf(epid,examid,scantronfiles,path);
+                String path = cloudcode + File.separator + schoolid + File.separator + "exam";
+                Integer scantroncol = Integer.parseInt(map.get("scantroncol").toString());
+                convertUtil.baseToPdf(epid,examid,scantronfiles,path,scantroncol);
             }
         }
     }

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -381,4 +381,63 @@ public class EPaperStudentService {
         ePaperStudentMapper.updateStudentPaper(paperStudent);
     }
 
+    /**
+     * @Description 答题卡扫描时保存
+     * @Param [pswvo]
+     * @Return void
+     * @Author wn
+     * @Date 2022/8/3 9:17
+     **/
+    public void saveCommitPaperForScantron(PaperStudentWebVo pswvo){
+        //更加学生姓名和准考证号找到对应学生
+
+        int epsid = 0;
+        pswvo.setEpsid(epsid);
+        EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(pswvo.getEpsid());
+        //试卷不存在或者已提交
+        if(ps == null || ps.getSstate() == 1){
+            return;
+        }
+
+        if(pswvo.getSstate() == 3){
+            //说明学生缺考仅更新状态和
+            EPaperStudent paperStudent = new EPaperStudent();
+            paperStudent.setEpsid(pswvo.getEpsid());
+            paperStudent.setStupic(JSON.toJSONString(pswvo.getStupic()));
+            paperStudent.setSstate(3);
+            ePaperStudentMapper.updateStudentPaperState(paperStudent);
+        }else{
+            List<EPaperStudentQuestion> sqlist = pswvo.getQuestions();//学生提交试卷中试题
+
+            //获取试卷中所有试题答案及分值
+            List<PsqAnswerVo> anvolist = ePaperStudentQuestionMapper.listPaperQuestionsAnswer(pswvo.getEpsid());
+            Integer checknum = 0;//记录试卷中试题批阅数量
+            Double paperscore = 0D;//学生试卷得分
+            for(EPaperStudentQuestion q : sqlist){
+
+                //获取该试题正确答案
+                PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getEptqid().equals(q.getEptqid())).findFirst().orElse(null);
+
+                setCommitQuestion(q,anvo,2);
+                if(q.getChecked() == 2){
+                    checknum ++;
+                }
+                paperscore = ExamUtil.add(paperscore, q.getStuscore());
+            }
+            EPaperStudent paperStudent = new EPaperStudent();
+            paperStudent.setEpsid(pswvo.getEpsid());
+            paperStudent.setStupic(JSON.toJSONString(pswvo.getStupic()));
+            paperStudent.setSstate(2);
+            paperStudent.setStuscore(paperscore);
+            int checked = 0;
+            if(checknum == sqlist.size()){
+                checked = 1;
+            }
+            paperStudent.setChecked(checked);
+
+            ePaperStudentQuestionMapper.updateBatchStuQuestion(sqlist);
+            ePaperStudentMapper.updateStudentPaper(paperStudent);
+        }
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/utils/ConvertUtil.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.utils;
 
+import ch.qos.logback.core.net.SyslogOutputStream;
 import com.xhkjedu.sexam.listener.MessageSender;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -35,8 +36,8 @@ public class ConvertUtil {
      * @Author wn
      * @Date 2022/8/2 17:20
      **/
-    public void baseToPdf(Integer epid,Integer examid, List<String> imgs, String savefolder) {
-        messageSender.base64ToPdf(epid, examid,imgs, savefolder);
+    public void baseToPdf(Integer epid,Integer examid, List<String> imgs, String savefolder,Integer scantroncol) {
+        messageSender.base64ToPdf(epid, examid,imgs, savefolder,scantroncol);
     }
 
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/PaperStudentWebVo.java

@@ -20,4 +20,16 @@ public class PaperStudentWebVo {
 
     //试卷中试题
     private List<EPaperStudentQuestion> questions;
+
+    //学生答题卡图片
+    private List<String> stupic;
+
+    private Integer epid;//试卷id
+
+    private String stuname;//学生姓名
+
+    private String examno;//学生准考证号
+
+    private Integer sstate;//状态0未进场1已进场2已交卷3缺考
+
 }

sexam/src/main/resources/application.properties

@@ -51,7 +51,6 @@ spring.redis.jedis.pool.max-active=60000
 #缓存访问数据有效时长60*60*24*7
 redisdatatime=604800
 
-
 rabbitmq.examImgMergeQueue=xhkjedu.xhschool.examImgMergeQueue_dev
 rabbitmq.examImgMergeHandleQueue=xhkjedu.xhschool.examImgMergeHandleQueue_dev
 rabbitmq.examBaseToPdfQueue=xhkjedu.xhschool.examBaseToPdfQueue_dev

sexam/src/main/resources/mapper/paper/EPaperMapper.xml

@@ -119,7 +119,7 @@
 
     <!--获取试卷中答题卡文件-->
     <select id="getPaperScantronfile" resultType="java.util.Map">
-        select p.epid,p.examid,p.scantronfile,e.schoolid,
+        select p.epid,p.examid,p.scantronfile,p.scantroncol,e.schoolid,
         (select cloudcode from t_cloud limit 1) cloudcode
         from e_paper p left join e_base e on p.examid=e.examid
         where p.epid=#{epid}

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -162,10 +162,15 @@
     <!--学生提交试卷-->
     <update id="updateStudentPaper">
         update e_paper_student set endtime=#{endtime},costtime=#{ps.costtime}
-         ,sstate=#{ps.sstate},checked=#{ps.checked}
+         ,sstate=#{ps.sstate},checked=#{ps.checked},stupic=#{ps.stupic}
          ,stuscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM e_paper_student_question q WHERE q.epsid=#{ps.epsid})
         where epsid=#{ps.epsid}
     </update>
+    <!--更新缺考状态-->
+    <update id="updateStudentPaperState">
+        update e_paper_student set sstate=#{ps.sstate},checked=#{ps.checked},stupic=#{ps.stupic}
+        where epsid=#{ps.epsid}
+    </update>
 
     <!--批量更新学生试卷分值-->
     <update id="updateBathStudentPaperScoreByEpid">

sexam/src/main/resources/mapper/paperstudent/EPaperStudentQuestionMapper.xml

@@ -90,6 +90,11 @@
                     when epsqid=#{q.epsqid} then #{q.checktime}
                 </foreach>
             </trim>
+            <trim prefix="stupic = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when epsqid=#{q.epsqid} then #{q.stupic}
+                </foreach>
+            </trim>
         </trim>
         <where>
             <foreach collection="list" item="q" separator="or">

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -23,7 +23,8 @@ class SexamApplicationTests {
         ePaper.setEpid(68);
         ePaper.setPnum(15);
         ePaper.setPscore(172.0);
-//        ePaperQtypeService.savePaperAnalyzeForQuestion(ePaper);
+
+        ePaperQtypeService.chandleScantronFile(156);
     }
 
 }