Merge remote-tracking branch 'origin/master' into ywx

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

@@ -60,7 +60,7 @@ public class EPaperStudentController {
     //待考界面--考试信息
     @PostMapping("/info")
     public ResultVo getExamSubjectPaper(@RequestBody EPaperStudent eps) {
-        N_Utils.validation(new Object[]{eps.getEpsid(), "学生id", 1});
+        N_Utils.validation(new Object[]{eps.getEpsid(), "考试学生id", 1});
         Map map = ePaperStudentService.getExamSubjectPaperByEpsid(eps.getEpsid());
         return new ResultVo(0, "成功获取考试信息", map);
     }

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

@@ -1,9 +1,10 @@
 package com.xhkjedu.sexam.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
+import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
-import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -23,7 +24,8 @@ public class MessageConsumer {
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
 
-
+    @Resource
+    private EPaperMapper ePaperMapper;
 
     /*
      * 学生答案图片合并完处理转换状态
@@ -33,7 +35,6 @@ public class MessageConsumer {
      * @author ywx
      * @date 2022/5/9 13:44
      */
-
     @RabbitHandler
     @RabbitListener(queues = "${rabbitmq.examImgMergeHandleQueue}")
     public void imgMergeHandleQueue(Message message) {
@@ -51,4 +52,24 @@ public class MessageConsumer {
             log.error("学生试题答案合并失败：" + e.getMessage());
         }
     }
+
+    /**
+     * @Description 修改试卷答题卡pdf
+     * @Param [message]
+     * @Return void
+     * @Author wn
+     * @Date 2022/8/2 14:00
+     **/
+    @RabbitHandler
+    @RabbitListener(queues = "${rabbitmq.examImgToPdfHandleQueue}")
+    public void imgToPdfHandleQueue(Message message) {
+        try {
+            String msg = new String(message.getBody(), "UTF-8");
+            System.out.println(LocalDateTime.now() + "答题卡图片合并接收消息内容：" + msg);
+            EPaper paper = JSON.parseObject(msg, EPaper.class);
+            ePaperMapper.updatePaperScantronpdf(paper);
+        } catch (Exception e) {
+            log.error("答题卡图片合并失败：" + e.getMessage());
+        }
+    }
 }

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

@@ -23,6 +23,8 @@ public class MessageSender {
 
     @Value("${rabbitmq.examImgMergeQueue}")
     private String examImgMergeQueue;
+    @Value("${rabbitmq.examImgToPdfQueue}")
+    private String examImgToPdfQueue;
 
 
     /**
@@ -39,4 +41,18 @@ public class MessageSender {
         map.put("device", device);
         rabbitTemplate.convertAndSend(examImgMergeQueue, JSON.toJSONString(map));
     }
+
+    /**
+     * @Description 答题卡图片合并为pdf
+     * @Param [epid, imgs]
+     * @Return void
+     * @Author wn
+     * @Date 2022/8/2 13:57
+     **/
+    public void imgToPdf(Integer epid, List<String> imgs) {
+        Map map = new HashMap();
+        map.put("epid", epid);
+        map.put("imgs", imgs);
+        rabbitTemplate.convertAndSend(examImgToPdfQueue, JSON.toJSONString(map));
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperMapper.java

@@ -55,4 +55,7 @@ public interface EPaperMapper extends TkMapper<EPaper> {
 
     //保存试卷试题数量和分值
     void updatePaperInfo(@Param("paper") EPaper paper);
+
+    //保存答题卡pdf
+    void updatePaperScantronpdf(@Param("paper") EPaper paper);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paper/EPaper.java

@@ -49,6 +49,8 @@ public class EPaper extends BaseBean {
     //答题卡文件
     private String scantronfile;
 
+    private String scantronpdf;//答题卡pdf
+
     //答题卡注意事项
     private String scantronnote;
 
@@ -67,7 +69,7 @@ public class EPaper extends BaseBean {
     //违规标记坐标3自定义考号
     private String cantronbad;
 
-    //考号类型1条形码2涂卡
+    //考号类型1条形码2准考证号（固定8位）3自定义考号
     private Integer codetype;
 
     //自定义考号列数

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

@@ -621,6 +621,8 @@ public class EPaperQtypeService {
         ePaperQtypeMapper.updateBatchQuestionForScan(questions);
         if(paper.getPstate() == 1){
             eSubjectMapper.updateEsubjectStateByEpid(1,paper.getEpid());
+
+
         }
     }
 }

sexam/src/main/resources/application.properties

@@ -54,7 +54,8 @@ redisdatatime=604800
 
 rabbitmq.examImgMergeQueue=xhkjedu.xhschool.examImgMergeQueue_dev
 rabbitmq.examImgMergeHandleQueue=xhkjedu.xhschool.examImgMergeHandleQueue_dev
-
+rabbitmq.examImgToPdfQueue=xhkjedu.xhschool.examImgToPdfQueue_dev
+rabbitmq.examImgToPdfHandleQueue=xhkjedu.xhschool.examImgToPdfHandleQueue_dev
 spring.rabbitmq.host=116.63.199.166
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xhkjedu

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

@@ -52,7 +52,7 @@
     <select id="getExamPaperAndSubject" resultType="java.util.Map">
         select ep.epid,ep.esid,ep.ptype,e.examname,e.examstate,s.subjectname,ep.scantronfile,ep.scantronnote,ep.scantronwh
         ,ep.scantroncol,ep.cantronmiss,ep.cantronbad,ep.codetype,ep.cantroncode,ep.pnum,ep.pscore,ep.cantronbarcode,
-               ep.cantronqrcode,ep.cantronpage,ep.cantronloc,ep.scantronspace,ep.codenum
+               ep.cantronqrcode,ep.cantronpage,ep.cantronloc,ep.scantronspace,ep.codenum,ep.scantronpdf
         from e_paper ep left join e_base e on ep.examid=e.examid
         left join t_subject s on ep.subjectid=s.subjectid where ep.epid=#{epid}
     </select>
@@ -94,7 +94,7 @@
         ,scantronwh=#{paper.scantronwh},scantroncol=#{paper.scantroncol},cantronmiss=#{paper.cantronmiss},
         cantronbad=#{paper.cantronbad},codetype=#{paper.codetype},codenum=#{paper.codenum},
         cantroncode=#{paper.cantroncode},cantronpage=#{paper.cantronpage},cantronbarcode=#{paper.cantronbarcode},
-        cantronqrcode=#{paper.cantronqrcode},cantronloc=#{paper.cantronloc}
+        cantronqrcode=#{paper.cantronqrcode},cantronloc=#{paper.cantronloc},scantronspace=#{paper.scantronspace}
         where epid=#{paper.epid}
     </update>
 
@@ -112,4 +112,9 @@
         where epid=#{paper.epid}
     </update>
 
+    <!--保存答题卡pdf-->
+    <update id="updatePaperScantronpdf">
+        update e_paper set scantronpdf=#{paper.scantronpdf} where epid=#{paper.epid}
+    </update>
+
 </mapper>