提交试卷

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

@@ -2,15 +2,16 @@ package com.xhkjedu.sexam.controller.paperstudent;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xhkjedu.sexam.model.paper.EPaperQtype;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.service.paperstudent.EPaperStudentService;
 import com.xhkjedu.sexam.vo.paperstudent.EPaperStudentVo;
+import com.xhkjedu.sexam.vo.paperstudent.PaperStudentWebVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +28,7 @@ import java.util.Map;
  **/
 @RestController
 @RequestMapping("/eps")
+@Slf4j
 public class EPaperStudentController {
     @Resource
     private EPaperStudentService ePaperStudentService;
@@ -76,6 +78,35 @@ public class EPaperStudentController {
            return new ResultVo(1,"提交试题失败");
        }
     }
+    //提交试卷
+    @PostMapping("/scp")
+    public ResultVo saveCommitPaper(@RequestBody EPaperStudent ps){
+        try {
+            N_Utils.validation(new Object[]{ps.getEpsid(),"试卷id",1});
+            ePaperStudentService.saveCommitPaper(ps.getEpsid());
+            return new ResultVo(0,"成功提交试卷");
+        }catch (Exception e){
+            log.error("提交试卷失败："+e.getMessage());
+            return new ResultVo(1,"提交失败");
+        }
+    }
+
+    //提交试卷--网页端
+    @PostMapping("/scpw")
+    public ResultVo saveCommitPaperWeb(@RequestBody PaperStudentWebVo ps){
+        try {
+            N_Utils.validation(new Object[]{ps.getEpsid(),"试卷id",1});
+            List<EPaperStudentQuestion> qlist = ps.getQuestions();
+            if(N_Utils.isListEmpty(qlist)){
+                return new ResultVo(1,"试题");
+            }
+            ePaperStudentService.saveCommitPaperForWeb(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/MessageConsumer.java

@@ -0,0 +1,55 @@
+package com.xhkjedu.sexam.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
+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;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+/**
+ * 消息到达消费者监听类
+ */
+@Component
+@Slf4j
+public class MessageConsumer {
+
+    @Resource
+    private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
+
+
+
+    /*
+     * 学生答案图片合并完处理转换状态
+     *
+     * @param [message]
+     * @return void
+     * @author ywx
+     * @date 2022/5/9 13:44
+     */
+
+    @RabbitHandler
+    @RabbitListener(queues = "${rabbitmq.examImgMergeHandleQueue}")
+    public void imgMergeHandleQueue(Message message) {
+        try {
+            String msg = new String(message.getBody(), "UTF-8");
+            System.out.println(LocalDateTime.now() + "学生试题答案合并接收消息内容：" + msg);
+            EPaperStudentQuestion psq = JSON.parseObject(msg, EPaperStudentQuestion.class);
+            psq.setDevice(null);
+            if (psq.getConverted() != 1) {//合并失败不修改学生答案
+                psq.setStuanswer(null);
+            } else {
+                psq.setStuanswer(JSON.toJSONString(new String[]{psq.getStuanswer()}));
+            }
+            ePaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
+        } catch (Exception e) {
+            log.error("学生试题答案合并失败：" + e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.xhkjedu.sexam.listener;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @className MessageSender
+ * @description
+ * @date 2021/10/25 14:28
+ **/
+@Component
+public class MessageSender {
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+
+    @Value("${rabbitmq.examImgMergeQueue}")
+    private String examImgMergeQueue;
+
+
+    /**
+     * @Description 学生答案合并
+     * @Param [epsqid, userAnswers, device]
+     * @Return void
+     * @Author wn
+     * @Date 2022/7/28 16:46
+     **/
+    public void imgMerge(Integer epsqid, List<String> userAnswers, Integer device) {
+        Map map = new HashMap();
+        map.put("epsqid", epsqid);
+        map.put("userAnswers", userAnswers);
+        map.put("device", device);
+        rabbitTemplate.convertAndSend(examImgMergeQueue, JSON.toJSONString(map));
+    }
+}

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

@@ -39,4 +39,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
     //学生试卷附件(web)
     List<EPaperQtype> listStuPaperFjQuestionsForWeb(@Param("epsid")Integer epsid);
+
+    //学生提交试卷
+    int updateStudentPaper(@Param("ps")EPaperStudent ps);
 }

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

@@ -7,6 +7,8 @@ import com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Description 学生试卷试题
  * @Author WN
@@ -20,4 +22,19 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
 
     //提交单题
     void updateStuAnswer(@Param("q")EPaperStudentQuestion q);
+
+    //处理学生未提交试题
+    void updateStuQuesitonNoCommit(@Param("epsid")Integer epsid);
+
+    //学生作业未批改试题数量
+    Integer getStuQuestionNoCheckNum(@Param("epsid")Integer epsid);
+
+    //获取试卷中未合并图片
+    List<EPaperStudentQuestion> listStuQuesitonStuAnswerPic(@Param("epsid")Integer epsid);
+
+    //获取试卷中所有试题正确答案及分值
+    List<PsqAnswerVo> listPaperQuestionsAnswer(@Param("epsid")Integer epsid);
+
+    //批量提交试题
+    void updateBatchStuQuestion(@Param("list")List<EPaperStudentQuestion> list);
 }

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

@@ -56,9 +56,6 @@ public class EPaperQtypeQuestion extends BaseBean {
     //作文格数
     private Integer gnum;
 
-    //答题区
-    private String dtq;
-
     //难易度
     @Transient
     private Integer complexity;

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

@@ -137,6 +137,15 @@ public class EPaperQtypeService {
                 if(q.getOptionnum()==null){
                     q.setOptionnum(0);
                 }
+                if(epaper.getPtype() == 1){
+                    q.setQn(q.getQorder().toString());
+                }
+                if(q.getCtype() == 14){
+                    q.setGnum(900);//语文作文格数
+                }else if(q.getCtype() == 15){
+                    q.setGnum(10);//英语作文行数
+                }
+
                 qtqs.add(q);
             }
         }

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

@@ -8,12 +8,16 @@ import com.xhkjedu.sexam.model.paper.EPaperQtype;
 import com.xhkjedu.sexam.model.paper.EPaperQtypeQuestion;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
+import com.xhkjedu.sexam.utils.ConvertUtil;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.paperstudent.EPaperStudentVo;
+import com.xhkjedu.sexam.vo.paperstudent.PaperStudentWebVo;
 import com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo;
 import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -34,6 +38,8 @@ public class EPaperStudentService {
     private EPaperQtypeMapper ePaperQtypeMapper;
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
+    @Autowired
+    private ConvertUtil convertUtil;
 
     /**
      * @Description 学生进行中考试列表
@@ -166,116 +172,199 @@ public class EPaperStudentService {
         try {
             //学生作答提交时先判断试卷是否设置的正确答案
             PsqAnswerVo answerVo = ePaperStudentQuestionMapper.getPaperQuestionAnswer(psq.getEpsqid());
-            int timestamp = N_Utils.getSecondTimestamp();
-            psq.setAnswertime(timestamp);
-            int coverted = 1;//是否转换0未转换1已转换2转换失败
-            String stuanswer = psq.getStuanswer();
-            List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
-            Double stuscore = 0.0;
+            setCommitQuestion(psq,answerVo,1);
+            ePaperStudentQuestionMapper.updateStuAnswer(psq);
+        }catch (Exception e){
+            log.error("提交试题失败："+e.getMessage());
+            throw new Exception("提交试题失败");
+        }
 
-            if(N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
-                    && N_Utils.isEmpty(psq.getStuanswertxt())){
-                psq.setStuscore(stuscore);
-                psq.setChecked(2);
-                psq.setChecktime(timestamp);
-                psq.setAnswered(0);
-            }else{
-                //试卷已经设置了正确答案
-                if (answerVo.getAnswered() == 1){
-                    String qanswer = answerVo.getAnswer();
-                    List<String> qanswers = JSON.parseArray(qanswer,String.class);
-                    if(N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
-                            && N_Utils.isEmpty(psq.getStuanswertxt())){
-                        psq.setStuscore(stuscore);
-                        psq.setChecked(1);
-                        psq.setChecktime(timestamp);
-                        psq.setAnswered(0);
-                    }else{
-                        int ctype = answerVo.getCtype();
-                        if(N_Utils.isObjectiveQuestion(ctype)){
-                            //客观题进行批阅
-                            if(ctype == 1 || ctype == 4 || ctype == 5 || ctype == 6){
-                                //单选、判断
-                                if(stuanswer.equalsIgnoreCase(qanswer)) {
-                                    stuscore = answerVo.getScore();
-                                }
-                            }else if(ctype == 2){//多选
-                                //多选、选错不得分
-                                if(stuanswers.get(0).length() <= qanswer.length()){
-                                    String[] qanswerList = qanswers.get(0).split("");
-                                    String[] stuanswerList = stuanswers.get(0).split("");
-                                    int rightNum = 0;//选对个数
-                                    for(String sa : stuanswerList){
-                                        int right = 0;
-                                        for(String qa : qanswerList){
-                                            if(qa.equals(sa)){
-                                                right = 1;
-                                                rightNum ++;
-                                            }
-                                        }
-                                        if(right == 0){//说明选错
-                                            rightNum = 0;
-                                            break;
+    }
+
+    //判断但道题情况
+    private void setCommitQuestion(EPaperStudentQuestion psq,PsqAnswerVo answerVo,Integer type){
+        int timestamp = N_Utils.getSecondTimestamp();
+        psq.setAnswertime(timestamp);
+        int coverted = 1;//是否转换0未转换1已转换2转换失败
+        String stuanswer = psq.getStuanswer();
+        List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
+        Double stuscore = 0D;
+
+        if(N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
+                && N_Utils.isEmpty(psq.getStuanswertxt())){
+            psq.setStuscore(stuscore);
+            psq.setChecked(2);
+            psq.setChecktime(timestamp);
+            psq.setAnswered(0);
+        }else{
+            //试卷已经设置了正确答案
+            if (answerVo.getAnswered() == 1){
+                String qanswer = answerVo.getAnswer();
+                List<String> qanswers = JSON.parseArray(qanswer,String.class);
+                if(N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
+                        && N_Utils.isEmpty(psq.getStuanswertxt())){
+                    psq.setStuscore(stuscore);
+                    psq.setChecked(1);
+                    psq.setChecktime(timestamp);
+                    psq.setAnswered(0);
+                }else{
+                    int ctype = answerVo.getCtype();
+                    if(N_Utils.isObjectiveQuestion(ctype)){
+                        //客观题进行批阅
+                        if(ctype == 1 || ctype == 4 || ctype == 5 || ctype == 6){
+                            //单选、判断
+                            if(stuanswer.equalsIgnoreCase(qanswer)) {
+                                stuscore = answerVo.getScore();
+                            }
+                        }else if(ctype == 2){//多选
+                            //多选、选错不得分
+                            if(stuanswers.get(0).length() <= qanswer.length()){
+                                String[] qanswerList = qanswers.get(0).split("");
+                                String[] stuanswerList = stuanswers.get(0).split("");
+                                int rightNum = 0;//选对个数
+                                for(String sa : stuanswerList){
+                                    int right = 0;
+                                    for(String qa : qanswerList){
+                                        if(qa.equals(sa)){
+                                            right = 1;
+                                            rightNum ++;
                                         }
                                     }
-                                    if(rightNum>0){
-                                        if(qanswerList.length == rightNum){
-                                            //全选对
-                                            stuscore = answerVo.getScore();
-                                        }else if (qanswerList.length > rightNum){
-                                            //少选得半分
-                                            stuscore = ExamUtil.div(answerVo.getScore(),2,1);
-                                        }
+                                    if(right == 0){//说明选错
+                                        rightNum = 0;
+                                        break;
                                     }
                                 }
-                            }else if(ctype == 7 || ctype == 8 || ctype == 10){
-                                //完形填空、阅读理解、任务型阅读
-                                Double qscore = ExamUtil.div(answerVo.getScore(),qanswers.size());
-                                Double stuScoreDouble = 0d;
-                                for(int i=0;i<qanswers.size();i++){
-                                    if(qanswers.get(i).equalsIgnoreCase(stuanswers.get(i))){
-                                        stuScoreDouble = ExamUtil.add(stuScoreDouble,qscore);
+                                if(rightNum>0){
+                                    if(qanswerList.length == rightNum){
+                                        //全选对
+                                        stuscore = answerVo.getScore();
+                                    }else if (qanswerList.length > rightNum){
+                                        //少选得半分
+                                        stuscore = ExamUtil.div(answerVo.getScore(),2,1);
                                     }
                                 }
-                                stuscore = ExamUtil.round(stuScoreDouble,1);
                             }
-                            if(stuscore.compareTo(answerVo.getScore()) == 1){
-                                stuscore = answerVo.getScore();
+                        }else if(ctype == 7 || ctype == 8 || ctype == 10){
+                            //完形填空、阅读理解、任务型阅读
+                            Double qscore = ExamUtil.div(answerVo.getScore(),qanswers.size());
+                            Double stuScoreDouble = 0d;
+                            for(int i=0;i<qanswers.size();i++){
+                                if(qanswers.get(i).equalsIgnoreCase(stuanswers.get(i))){
+                                    stuScoreDouble = ExamUtil.add(stuScoreDouble,qscore);
+                                }
                             }
-                            psq.setStuscore(stuscore);
-                            psq.setChecked(2);
-                            psq.setChecktime(timestamp);
-                        }else{
+                            stuscore = ExamUtil.round(stuScoreDouble,1);
+                        }
+                        if(stuscore.compareTo(answerVo.getScore()) == 1){
+                            stuscore = answerVo.getScore();
+                        }
+                        psq.setStuscore(stuscore);
+                        psq.setChecked(2);
+                        psq.setChecktime(timestamp);
+                    }else{
 
-                            if(stuanswers.size() > 0){
-                                coverted = 0;//上传的多张图片设为0未转换
+                        if(stuanswers.size() > 0){
+                            coverted = 0;//上传的多张图片设为0未转换
+                            if(type == 2){
+                                //网页端提交试卷时直接合并多张图片试题
+                                convertUtil.imgMerge(psq.getEptqid(),stuanswers,1);
                             }
                         }
-                        psq.setAnswered(1);
                     }
+                    psq.setAnswered(1);
                 }
             }
-
-            Integer costtime = answerVo.getCosttime();
-            if(costtime == null){
-                costtime = 0;
-            }
-            psq.setCosttime(psq.getCosttime() + costtime);
-            psq.setConverted(coverted);
-            ePaperStudentQuestionMapper.updateStuAnswer(psq);
-        }catch (Exception e){
-            log.error("提交试题失败："+e.getMessage());
-            throw new Exception("提交试题失败");
         }
 
+        Integer costtime = answerVo.getCosttime();
+        if(costtime == null){
+            costtime = 0;
+        }
+        psq.setCosttime(psq.getCosttime() + costtime);
+        psq.setConverted(coverted);
     }
 
-    public int saveCommitPaper(Integer epsid){
+    /**
+     * @Description 提交试卷
+     * @Param [epsid]
+     * @Return int
+     * @Author wn
+     * @Date 2022/7/28 16:59
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void saveCommitPaper(Integer epsid){
         EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(epsid);
         if(ps == null || ps.getSstate() == 1){
-            return 1;
+            return;
+        }
+        EPaperStudent paperStudent = new EPaperStudent();
+        paperStudent.setEpsid(epsid);
+        paperStudent.setSstate(2);
+
+        //更改试卷中学生未提交的试题设置为0分，标记为已批改
+        ePaperStudentQuestionMapper.updateStuQuesitonNoCommit(epsid);
+        //获取试卷中未批阅试题数量
+        int noCheckNum = ePaperStudentQuestionMapper.getStuQuestionNoCheckNum(epsid);
+        int checked = 0;
+        if(noCheckNum == 0){
+            checked = 1;//试卷中所有试题都批完后标识试卷已批改
+        }
+        paperStudent.setChecked(checked);
+        ePaperStudentMapper.updateStudentPaper(paperStudent);//修改试卷信息
+        List<EPaperStudentQuestion> psqlist = ePaperStudentQuestionMapper.listStuQuesitonStuAnswerPic(epsid);
+        if(N_Utils.isListNotEmpty(psqlist)){
+            for(EPaperStudentQuestion sq : psqlist){
+                List<String> stuanswer = JSON.parseArray(sq.getStuanswer(),String.class);
+                if(N_Utils.isListNotEmpty(stuanswer) && stuanswer.size()>1){
+                    convertUtil.imgMerge(sq.getEpsqid(),stuanswer,1);
+                }
+            }
+        }
+    }
+
+    /**
+     * @Description 提交试卷、试题（网页端）
+     * @Param [pswvo]
+     * @Return void
+     * @Author wn
+     * @Date 2022/7/28 19:18
+     **/
+    public void saveCommitPaperForWeb(PaperStudentWebVo pswvo){
+        List<EPaperStudentQuestion> sqlist = pswvo.getQuestions();//学生提交试卷中试题
+        EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(pswvo.getEpsid());
+        //试卷不存在或者已提交
+        if(ps == null || ps.getSstate() == 1){
+            return;
         }
-        return 1;
+        //获取试卷中所有试题答案及分值
+        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.setEndtime(N_Utils.getSecondTimestamp());
+        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

@@ -0,0 +1,31 @@
+package com.xhkjedu.sexam.utils;
+
+import com.xhkjedu.sexam.listener.MessageSender;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname ConvertUtil
+ * @description 文件转换工具类
+ * @date 2021/10/27 9:32
+ **/
+@Component
+public class ConvertUtil {
+    @Autowired
+    private MessageSender messageSender;
+
+    /**
+     * 学生答案图片合并mq
+     *
+     * @param [psqid, userAnswers, device(1线上线下2答题卡)]
+     * @return void
+     * @author ywx
+     * @date 2022/5/9 14:57
+     */
+    public void imgMerge(Integer psqid, List<String> userAnswers, Integer device) {
+        messageSender.imgMerge(psqid, userAnswers, device);
+    }
+
+}

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

@@ -0,0 +1,23 @@
+package com.xhkjedu.sexam.vo.paperstudent;
+
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author WN
+ * Date 2022/7/28 17:15
+ **/
+@Data
+public class PaperStudentWebVo {
+    //试卷学生id
+    private Integer epsid;
+
+    //花费时间
+    private Integer costtime;
+
+    //试卷中试题
+    private List<EPaperStudentQuestion> questions;
+}

sexam/src/main/resources/application.properties

@@ -51,6 +51,10 @@ 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
+
 spring.rabbitmq.host=116.63.199.166
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xhkjedu

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

@@ -87,7 +87,6 @@
         where t.epid=#{epid} order by t.eptorder,q.qorder
     </select>
 
-
     <resultMap id="qtypesQuestionsForScan" type="java.util.Map">
         <result column="eptname" property="eptname"></result>
         <result column="ctype" property="ctype"></result>
@@ -99,10 +98,10 @@
             <result column="qctype" property="qctype"></result>
             <result column="score" property="score"></result>
             <result column="qorder" property="qorder"></result>
+            <result column="qn" property="qn"></result>
             <result column="optionnum" property="optionnum"></result>
             <result column="coord" property="coord"></result>
             <result column="gnum" property="gnum"></result>
-            <result column="dtq" property="dtq"></result>
             <result column="qoption" property="qoption"></result>
         </collection>
     </resultMap>
@@ -110,7 +109,7 @@
     <!--制作答题卡时获取试卷中试题-->
     <select id="listPaperqtypeQuestionsForScan" resultMap="qtypesQuestionsForScan">
         select t.eptname ,t.ctype,t.eptnum,t.eptorder,t.eptscore,
-        tq.eptqid,tq.ctype qctype,tq.score,tq.qorder,tq.optionnum,tq.coord,tq.gnum,tq.dtq,q.qoption
+        tq.eptqid,tq.ctype qctype,tq.score,tq.qorder,tq.qn,tq.optionnum,tq.coord,tq.gnum,q.qoption
         from e_paper_qtype_question tq  left join e_paper_qtype t on t.eptid=tq.eptid
         left join t_question q on tq.questionid=q.questionid
         where t.epid=#{epid} order by t.eptorder,tq.qorder,q.sorder
@@ -145,11 +144,6 @@
                     when eptqid=#{q.eptqid} then #{q.gnum}
                 </foreach>
             </trim>
-            <trim prefix="dtq = case" suffix="end,">
-                <foreach collection="list" item="q">
-                    when eptqid=#{q.eptqid} then #{q.dtq}
-                </foreach>
-            </trim>
         </trim>
         <where>
             <foreach collection="list" item="q" separator="or">

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

@@ -149,4 +149,12 @@
         left join e_paper_qtype pt on psq.epid=pt.epid
         where psq.epsid=#{epsid} order by pt.eptorder, psq.qorder
     </select>
+
+    <!--学生提交试卷-->
+    <update id="updateStudentPaper">
+        update t_paper_student set endtime=#{endtime},costtime=#{ps.costtime}
+         ,sstate=#{ps.sstate},checked=#{ps.checked}
+         ,stuscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM e_paper_student_question q WHERE q.epsid=#{ps.epsid})
+        where epsid=#{ps.epsid}
+    </update>
 </mapper>

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

@@ -16,4 +16,85 @@
         answertime=#{q.answertime},costtime=#{q.costtime},stuscore=#{q.stuscore},
         checked=#{q.checked},checkid=#{q.checkid},checktime=#{q.checktime} where epsqid=#{q.epsqid}
     </update>
+
+    <!--处理学生试卷中未提交试题-->
+    <update id="updateStuQuesitonNoCommit">
+        UPDATE e_paper_student_question SET costtime=0,checked=2,stuscore=0,checktime=UNIX_TIMESTAMP(NOW())
+        WHERE epsid=#{epsid} AND answered=0
+    </update>
+
+    <!--学生作业未批改试题数量-->
+    <select id="getStuQuestionNoCheckNum" resultType="java.lang.Integer">
+        SELECT count(*) FROM e_paper_student_question WHERE epsid=#{epsid} AND checked!=2
+    </select>
+
+    <!--获取试卷中未合并图片-->
+    <select id="listStuQuesitonStuAnswerPic" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
+        select epsqid,stuanswer from e_paper_student_question
+        where epsid=#{epsid} and answertype=1 and converted=0
+    </select>
+
+    <!--获取试卷中所有试题正确答案及分值-->
+    <select id="listPaperQuestionsAnswer" resultType="com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo">
+        select distinct psq.eptqid,psq.costtime,ptq.ctype,ptq.score,ptq.answer,p.answered
+        from e_paper_student_question psq left join e_paper_qtype_question ptq on psq.eptqid=ptq.eptqid
+        left join e_paper p on psq.epid=p.epid where psq.epsid=#{epsid} order by ptq.qorder
+    </select>
+
+    <!--批量提交试题-->
+    <update id="updateBatchStuQuestion">
+        update e_paper_student_question
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="answered = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.answered}
+                </foreach>
+            </trim>
+            <trim prefix="answertype = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.answertype}
+                </foreach>
+            </trim>
+            <trim prefix="stuanswer = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.stuanswer}
+                </foreach>
+            </trim>
+            <trim prefix="stuanswertxt = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.stuanswertxt}
+                </foreach>
+            </trim>
+            <trim prefix="converted = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.converted}
+                </foreach>
+            </trim>
+            <trim prefix="answertime = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.answertime}
+                </foreach>
+            </trim>
+            <trim prefix="stuscore = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.stuscore}
+                </foreach>
+            </trim>
+            <trim prefix="checked = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.checked}
+                </foreach>
+            </trim>
+            <trim prefix="checktime = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.checktime}
+                </foreach>
+            </trim>
+        </trim>
+        <where>
+            <foreach collection="list" item="q" separator="or">
+                eptqid=#{q.eptqid}
+            </foreach>
+        </where>
+    </update>
 </mapper>

sstudy/src/main/java/com/xhkjedu/sstudy/controller/question/QuestionController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author ywx
@@ -150,7 +151,7 @@ public class QuestionController {
                 question.getQstem(),"试题题干",2,question.getScore(),"试题分值",1
                 ,question.getComplexity(),"试题难易度",1,question.getQtypeid(),"试题题型id",2,question.getCreateid(),"教师id",1 });
 
-        String id = tQuestionService.saveUpdateQuestion(question);
-        return new ResultVo(0, "保存成功",id);
+        Map map = tQuestionService.saveUpdateQuestion(question);
+        return new ResultVo(0, "保存成功",map);
     }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionService.java

@@ -17,7 +17,9 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author ywx
@@ -319,7 +321,7 @@ public class QuestionService {
      * @Date 2022/7/19 16:02
      **/
     @Transactional(rollbackFor = Exception.class)
-    public String saveUpdateQuestion(TQuestion question){
+    public Map saveUpdateQuestion(TQuestion question){
         QuestionVo oldQuestion = questionMapper.findById(question.getQuestionid());//原试题详细信息
         delQuestionATag(question);//优化试题内容
         question.setSubjectid(oldQuestion.getSubjectid());
@@ -328,7 +330,7 @@ public class QuestionService {
         List<TQuestionPoint> saveQPoints = new ArrayList<>();//试题知识集合
         List<TQuestionDirector> saveQDirs = new ArrayList<>();//试题章节集合
 
-        setSaveUpdateQuestion(question,saveQues,saveQPoints);
+        Map map = setSaveUpdateQuestion(question,saveQues,saveQPoints);
         setSaveUpdateQuesitonDirector(oldQuestion,question,saveQDirs);
         questionMapper.saveBathQuestion(saveQues);//保存试题
         questionPointMapper.batchSave(saveQPoints);//保存试题关联知识点信息
@@ -345,11 +347,13 @@ public class QuestionService {
         ub.setCreatetime(question.getCreatetime());
         userBasketMapper.insertSelective(ub);//保存新试题进入试题栏*/
 
-        return question.getQuestionid();
+        return map;
     }
 
     //处理试题试题和知识
-    private void setSaveUpdateQuestion(TQuestion question,List<TQuestion> saveQues,List<TQuestionPoint> saveQPoints){
+    private Map setSaveUpdateQuestion(TQuestion question,List<TQuestion> saveQues,List<TQuestionPoint> saveQPoints){
+        Map map = new HashMap();
+        List<Map> sonlist = new ArrayList<>();
         int timestamp = N_Utils.getSecondTimestamp();
         question.setCount(0);
         question.setQstate(1);
@@ -358,6 +362,8 @@ public class QuestionService {
         String questionid = StudyUtil.getId();
         question.setQuestionid(questionid);
         saveQues.add(question);
+        map.put("questionid",questionid);
+
         //qlevel试题类型1单体2母题3子题
         if(question.getQlevel() == 2){//是母体并且包含子题
             List<TQuestion> sonques = question.getQuestions();
@@ -373,6 +379,10 @@ public class QuestionService {
                 sq.setCreatetime(timestamp);
                 sq.setSchoolid(question.getSchoolid());
                 saveQues.add(sq);
+                Map sonmap = new HashMap();
+                sonmap.put("sorder",sq.getSorder());
+                sonmap.put("quesitonid",sqid);
+                sonlist.add(sonmap);
 
                 //知识点
                 List<TQuestionPoint> points = sq.getQuestionPoints();
@@ -413,6 +423,8 @@ public class QuestionService {
                 }
             }
         }
+        map.put("sonlist",sonlist);
+        return map;
     }