教师阅卷

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectTeacherController.java

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 /**
  * @author ywx
@@ -133,11 +135,12 @@ public class EPaperCorrectTeacherController {
      * @Date 2022/7/28 15:30
      **/
     @PostMapping("/correct")
-    public ResultVo correctQuestion(@RequestBody EPaperStudentQuestion vo) {
+    public ResultVo correctQuestion(@RequestBody EPaperStudentQuestion vo) throws ExecutionException, InterruptedException {
         Integer epsid = vo.getEpsid();
         Integer epsqid = vo.getEpsqid();
         Integer checkid = vo.getCheckid();
         N_Utils.validation(new Object[]{epsid, "试卷学生id", 1, epsqid, "试卷学生试题id", 1, checkid, "批阅人", 1});
-        return correctTeacherService.correctQuestion(vo);
+        Future<ResultVo> future = correctTeacherService.correctQuestion(vo);
+        return future.get();
     }
 }

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

@@ -8,12 +8,14 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Future;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -77,13 +79,17 @@ public class EPaperCorrectTeacherService {
 
     //批阅试题
     @Async("asyncPoolTaskExecutor")
-    public ResultVo correctQuestion(EPaperStudentQuestion psq) {
-        correctTeacherMapper.correctQuestion(psq);
-        Integer epsid = psq.getEpsid();
-        Integer num = correctTeacherMapper.getNotCorrect(epsid);//学生未批改试题数量
-        if (num == 0) {//批阅完成修改学生试卷批阅状态
-            correctTeacherMapper.updateCheckStuById(epsid, psq.getCheckid());
+    public Future<ResultVo> correctQuestion(EPaperStudentQuestion psq) {
+        try {
+            correctTeacherMapper.correctQuestion(psq);
+            Integer epsid = psq.getEpsid();
+            Integer num = correctTeacherMapper.getNotCorrect(epsid);//学生未批改试题数量
+            if (num == 0) {//批阅完成修改学生试卷批阅状态
+                correctTeacherMapper.updateCheckStuById(epsid, psq.getCheckid());
+            }
+            return new AsyncResult<>(new ResultVo(0, "批阅成功"));
+        } catch (Exception e) {
+            return new AsyncResult<>(new ResultVo(1, e.getMessage()));
         }
-        return new ResultVo(0, "批阅成功");
     }
 }

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

@@ -59,8 +59,8 @@
     </select>
     <!--试题批阅情况-->
     <select id="getCheckQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
-        select count(psq.epsqid)tjnum,count(case when psq.checked=1 then psq.epsqid else null end)pynum
-        ,count(case when psq.checked=1 and psq.checkid=#{teacherid} then psq.epsqid else null end)wpynum
+        select count(psq.epsqid)tjnum,count(case when psq.checked=2 then psq.epsqid else null end)pynum
+        ,count(case when psq.checked=2 and psq.checkid=#{teacherid} then psq.epsqid else null end)wpynum
         from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder=#{qorder} and psq.answered=1
     </select>
     <!--修改试卷学生试题为批阅中-->
@@ -70,20 +70,20 @@
     <!--获取上一份批阅试题-->
     <select id="getPreQuestion" resultType="java.util.Map">
         select psq.epsqid,psq.stuanswer,psq.qn,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
-        from e_paper_student_question psq where psq.epid=#{epid} and psq.checked=1 and psq.checkid=#{teacherid}
+        from e_paper_student_question psq where psq.epid=#{epid} and psq.checked=2 and psq.checkid=#{teacherid}
         order by psq.checktime desc limit 1
     </select>
     <!--阅卷记录-->
     <select id="listRecord" resultType="java.util.Map">
         select psq.epsqid,psq.stuanswer,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.checktime
         from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder=#{qorder}
-        and psq.checked=1 and psq.checkid=#{teacherid}
+        and psq.checked=2 and psq.checkid=#{teacherid}
         order by psq.checktime desc
     </select>
     <!--批阅试题-->
     <update id="correctQuestion">
         update e_paper_student_question
-        set stuscore=#{psq.stuscore},checked=1
+        set stuscore=#{psq.stuscore},checked=2
         ,checkid=#{psq.checkid},checktime=unix_timestamp()
         ,good=#{psq.good},bad=#{psq.bad}
         <if test="psq.stuanswer!=null and psq.stuanswer!=''">