自动评阅试题

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

@@ -228,78 +228,75 @@ public class EPaperStudentService {
             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(2);
-                    psq.setChecktime(timestamp);
-                    psq.setAnswered(0);
-                }else{
-                    int ctype = answerVo.getCtype();
-                    if(psq.getAnswertype() == 1){
-                        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;
+                int ctype = answerVo.getCtype();
+                if(psq.getAnswertype() == 1){
+                    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);
+                                }
                             }
+                            stuscore = ExamUtil.round(stuScoreDouble,1);
+                        }
+                        if(stuscore.compareTo(answerVo.getScore()) == 1){
+                            stuscore = answerVo.getScore();
+                        }
 
-                            psq.setChecked(2);
-                            psq.setChecktime(timestamp);
-                        }else{
-                            if(stuanswers.size() > 1){
-                                coverted = 0;//上传的多张图片设为0未转换
-                            }
-                            psq.setChecked(0);
+                        psq.setChecked(2);
+                        psq.setChecktime(timestamp);
+                    }else{
+                        if(stuanswers.size() > 1){
+                            coverted = 0;//上传的多张图片设为0未转换
                         }
+                        psq.setChecked(0);
                     }
-                    psq.setAnswered(0);
+                }else{
                     psq.setChecked(0);
                 }
+            }else{
+                psq.setStuscore(stuscore);
+                psq.setAnswered(0);
+                psq.setChecked(2);
+                psq.setChecktime(timestamp);
             }
         }
         psq.setStuscore(stuscore);
@@ -340,7 +337,7 @@ public class EPaperStudentService {
         int noCheckNum = ePaperStudentQuestionMapper.getStuQuestionNoCheckNum(epsid);
         int checked = 0;
         if(noCheckNum == 0){
-            checked = 1;//试卷中所有试题都批完后标识试卷已批改
+            checked = 2;//试卷中所有试题都批完后标识试卷已批改
         }
         paperStudent.setChecked(checked);
         ePaperStudentMapper.updateStudentPaper(paperStudent);//修改试卷信息
@@ -396,7 +393,7 @@ public class EPaperStudentService {
         paperStudent.setStuscore(paperscore);
         int checked = 0;
         if(checknum == sqlist.size()){
-            checked = 1;
+            checked = 2;
         }
         paperStudent.setChecked(checked);
 
@@ -470,14 +467,16 @@ public class EPaperStudentService {
             paperStudent.setStuscore(paperscore);
             int checked = 0;
             if(checknum == sqlist.size()){
-                checked = 1;
+                checked = 2;
             }
             paperStudent.setChecked(checked);
 
             ePaperStudentQuestionMapper.updateBatchStuQuestion(sqlist);
             ePaperStudentMapper.updateStudentPaper(paperStudent);
-            //获取试卷中需要合并图片的试题
-            chandleStudentQuestionNoconvertedPic(pswvo.getEpsid(),2);
+            if(checked == 0){
+                //获取试卷中需要合并图片的试题
+                chandleStudentQuestionNoconvertedPic(pswvo.getEpsid(),2);
+            }
         }
     }
 

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

@@ -22,7 +22,7 @@ public class PaperStudentWebVo {
     private List<EPaperStudentQuestion> questions;
 
     //学生答题卡图片
-    private List<String> stupic;
+    private String stupic;
 
     private Integer epid;//试卷id
 

sexam/src/main/resources/application.properties

@@ -55,7 +55,7 @@ rabbitmq.examImgMergeQueue=xhkjedutest.xhschool.examImgMergeQueue_dev
 rabbitmq.examImgMergeHandleQueue=xhkjedutest.xhschool.examImgMergeHandleQueue_dev
 rabbitmq.examBaseToPdfQueue=xhkjedutest.xhschool.examBaseToPdfQueue_dev
 rabbitmq.examBaseToPdfHandleQueue=xhkjedutest.xhschool.examBaseToPdfHandleQueue_dev
-spring.rabbitmq.host=116.63.199.166
+spring.rabbitmq.host=49.4.26.249
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xhkjedu
 spring.rabbitmq.password=xhkjedud07