定时任务、试卷分

sapi/src/main/java/com/xhkjedu/sapi/model/scantron/TScantron.java

@@ -34,6 +34,8 @@ public class TScantron extends BaseBean {
     private Double typedistance;
     // 布局1一栏 2二栏 3三栏
     private Integer slayout;
+    //栏边距
+    private Double columndistance;
     // 颜色
     private String scolor;
     // 考号类型1涂卡 2条形码 3手写1 4手写2

smarking/src/main/java/com/xhkjedu/smarking/config/ThreadPoolTaskExecutorConfig.java

@@ -0,0 +1,61 @@
+package com.xhkjedu.smarking.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * @描述 :配置线程池
+ * @创建时间 2019/9/30
+ * @修改人和其它信息
+ */
+@Configuration
+public class ThreadPoolTaskExecutorConfig {
+    /**
+     * 配置执行任务线程池
+     * 应用此池： @Async("asyncPoolTaskExecutor")
+     *
+     * @return
+     */
+    @Bean(name = "asyncPoolTaskExecutor")
+    public ThreadPoolTaskExecutor getAsyncThreadPoolTaskExecutor() {
+        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+        taskExecutor.setCorePoolSize(20);
+        taskExecutor.setMaxPoolSize(200);
+        taskExecutor.setQueueCapacity(25);
+        taskExecutor.setKeepAliveSeconds(200);
+        //定义线程池名字
+        taskExecutor.setThreadNamePrefix("asyncPoolTaskExecutor。");
+        //该方法就是这里的关键，用来设置线程池关闭的时候等待所有任务都完成再继续销毁其他的Bean，这样这些异步任务的销毁就会先于Redis线程池的销毁。
+        // 同时，这里还设置了setAwaitTerminationSeconds(60)，该方法用来设置线程池中任务的等待时间，如果超过这个时候还没有销毁就强制销毁，
+        // 以确保应用最后能够被关闭，而不是阻塞住。
+        taskExecutor.setWaitForTasksToCompleteOnShutdown(true);
+        taskExecutor.setAwaitTerminationSeconds(60);
+        // 线程池对拒绝任务（无线程可用）的处理策略，目前只支持AbortPolicy、CallerRunsPolicy；默认为后者
+        taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        taskExecutor.initialize();
+        return taskExecutor;
+    }
+
+    /** 
+    * @Description: 配置调度任务线程池
+    * @Author: lgq 
+    * @Date: 2020-03-11 16:15:27
+    */ 
+    @Bean
+    public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
+        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+        threadPoolTaskScheduler.setPoolSize(500);
+        threadPoolTaskScheduler.setThreadNamePrefix("taskExecutor-");
+        threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true);
+        threadPoolTaskScheduler.setRemoveOnCancelPolicy(true);
+        threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true);
+        threadPoolTaskScheduler.setAwaitTerminationSeconds(60);
+        threadPoolTaskScheduler.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        return threadPoolTaskScheduler;
+    }
+
+}

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

@@ -39,16 +39,15 @@ public class MessageSender {
 
     /**
      * @Description 学生答案合并
-     * @Param [mpsqid, userAnswers, device]
+     * @Param [mpsqid, userAnswers]
      * @Return void
      * @Author wn
      * @Date 2022/7/28 16:46
      **/
-    public void imgMerge(Integer mpsqid, List<String> userAnswers, Integer device) {
+    public void imgMerge(Integer mpsqid, List<String> userAnswers) {
         Map map = new HashMap();
         map.put("mpsqid", mpsqid);
         map.put("stuanswers", userAnswers);
-        map.put("device", device);
         if (userAnswers.toString().contains(node2)) {
             rabbitTemplate.convertAndSend(markingImgMergeQueue2, JSON.toJSONString(map));
         } else {

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsSubjectMapper.java

@@ -47,4 +47,10 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
 
     //试监控-考试基本信息
     Map<String,Object> getExamSubjectByMsid(@Param("msid") Integer msid);
+    //定时任务-科目开始考试
+    int updateStartSubject(@Param("strtime") String strtime);
+    //定时任务-科目结束考试-获取待结束考试
+    List<Integer> listMsidsForEndSubject(@Param("strtime") String strtime);
+    //定时任务-科目结束考试
+    int updateEndSubject(@Param("timestamp") Integer timestamp,@Param("msids")List<Integer> msids);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentQuestionMapper.java

@@ -30,6 +30,10 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
     List<MsPaperStudentQuestion> listStuQuestionStuAnswerPic(@Param("mpsid") Integer mpsid);
     //学生考试-提交试卷-生产学生题块-试卷中所有试题
     List<MsPaperStudentQuestion> listStuQuestionsByMpsid(@Param("mpsid") Integer mpsid);
+    //学生考试-提交试卷-修改未提交试题为已批阅
+    int updateStuQuestionsNoCommit(@Param("mpsid") Integer mpsid,@Param("timestamp") Integer timestamp);
+    //学生考试-提交试卷-获取试卷中未批改试题数量
+    Integer getStuQuestionNoCheckedNum(@Param("mpsid") Integer mpsid);
 
     //试卷答案-客观题-批量更新学生提交指定试题是否需要重新批改
     Integer updateBatchStuQuesNeeddeal(@Param("mpid") Integer mpid,@Param("list")List<MsPaperQtypeQuestion> list);
@@ -55,4 +59,9 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
     List<Map<String,Object>> listStuPaperQtypeQueAnswerForWebTk(@Param("mpsid")Integer mpsid);
     //学生试卷-题型试题、作答、得分情况（附件）
     List<Map<String,Object>> listStuPaperQtypeQueAnswerForWebFj(@Param("mpsid")Integer mpsid);
+
+    //定时任务-获取学生答案待合并试题
+    List<MsPaperStudentQuestion> listNoMergeStupic();
+
+
 }

smarking/src/main/java/com/xhkjedu/smarking/service/stupaper/MsPaperStudentQuestionService.java

@@ -0,0 +1,43 @@
+package com.xhkjedu.smarking.service.stupaper;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
+import com.xhkjedu.smarking.utils.ConvertUtil;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description 阅卷试卷学生试题表 服务实现类
+ * @Author auto
+ * @Date 2024-10-15
+ */
+@Service
+public class MsPaperStudentQuestionService {
+    @Resource
+    private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+    @Resource
+    private ConvertUtil convertUtil;
+
+    /*
+     * @Description 定时任务-合并
+     * @Date 2024/11/15 14:18:36
+     * @Author WN
+     * @Param []
+     * @Return void
+     **/
+    public void paperStuQuestionAnswerMerge() {
+        //获取试卷中未合并图片
+        List<MsPaperStudentQuestion> list = msPaperStudentQuestionMapper.listNoMergeStupic();
+        if (N_Utils.isListEmpty(list)) return;
+            for (MsPaperStudentQuestion sq : list) {
+                List<String> stuanswer = JSON.parseArray(sq.getStuanswer(), String.class);
+                if (N_Utils.isListNotEmpty(stuanswer) && stuanswer.size() > 1) {
+                    convertUtil.imgMerge(sq.getMpsqid(), stuanswer);
+                }
+            }
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/service/stupaper/MsPaperStudentService.java

@@ -196,7 +196,7 @@ public class MsPaperStudentService {
         // //获取试题正确答案
         List<QuestionAnswerVo> qaVos = msPaperStudentQuestionMapper.listPaperQuestionAnswers(pswvo.getMpsid());
         for (MsPaperStudentQuestion sq : questions) {
-            QuestionAnswerVo qaVo = qaVos.stream().filter(q -> q.getMpsqid() == sq.getMpsqid()).findFirst().orElse(null);
+            QuestionAnswerVo qaVo = qaVos.stream().filter(q -> q.getMpsqid().equals(sq.getMpsqid())).findFirst().orElse(null);
             setCommitQuestion(sq,qaVo);
         }
         msPaperStudentQuestionMapper.updateBatchStudentAnswer(questions);
@@ -281,8 +281,18 @@ public class MsPaperStudentService {
         if(paperStuExamVo.getMsstate() == 2) return new ResultVo(0, "考试已结束");
 
         int timestamp = N_Utils.getSecondTimestamp();
+
+        //更改未提交试题的批阅状态为已批改
+        msPaperStudentQuestionMapper.updateStuQuestionsNoCommit(mpsid,timestamp);
+        Integer nocheckedNum = msPaperStudentQuestionMapper.getStuQuestionNoCheckedNum(mpsid);
+        int checked = 0;
+        if (nocheckedNum == 0) {
+            checked = 2;//试卷中所有试题都批完后标识试卷已批改
+        }
+        ps.setChecked(checked);
         ps.setEndtime(timestamp);
         ps.setSstate(2);
+
         msPaperStudentMapper.updateStudentPaper(ps);
         chandleStudentQuestionNoconvertedPic(mpsid);
         return new ResultVo(1, "提交成功");
@@ -295,7 +305,7 @@ public class MsPaperStudentService {
             for (MsPaperStudentQuestion sq : psqlist) {
                 List<String> stuanswer = JSON.parseArray(sq.getStuanswer(), String.class);
                 if (N_Utils.isListNotEmpty(stuanswer) && stuanswer.size() > 1) {
-                    convertUtil.imgMerge(sq.getMpsqid(), stuanswer, 1);
+                    convertUtil.imgMerge(sq.getMpsqid(), stuanswer);
                 }
             }
         }

smarking/src/main/java/com/xhkjedu/smarking/task/ExamSubjectTask.java

@@ -0,0 +1,76 @@
+package com.xhkjedu.smarking.task;
+
+import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
+import com.xhkjedu.smarking.service.stupaper.MsPaperStudentQuestionService;
+import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description：考试科目状态定时任务
+ * @Author: WN
+ * @Date: 2024/11/15 10:10:48
+ **/
+@Slf4j
+@Component
+public class ExamSubjectTask {
+
+    @Resource
+    private MsSubjectMapper msSubjectMapper;
+    @Resource
+    private MsPaperStudentQuestionService msPaperStudentQuestionService;
+
+    /*
+     * @Description 单科开始考试
+     * @Date 2024/11/15 10:59:27
+     * @Author WN
+     * @Return void
+     **/
+    @Async("threadPoolTaskScheduler")
+    @Scheduled(cron = "${cron.updateSubjectState}")
+    public void startSubject() {
+        int timestamp = N_Utils.getSecondTimestamp();
+        String strtime = N_Utils.getStrtimeTimestamp(timestamp, "yyyy-MM-dd HH:mm");
+        msSubjectMapper.updateStartSubject(strtime);
+    }
+
+    /*
+     * @Description 单科结束考试
+     * @Date 2024/11/15 10:59:27
+     * @Author WN
+     * @Return void
+     **/
+    @Async("threadPoolTaskScheduler")
+    @Scheduled(cron = "${cron.updateSubjectState}")
+    public void endSubject() {
+        int timestamp = N_Utils.getSecondTimestamp();
+        String strtime = N_Utils.getStrtimeTimestamp(timestamp, "yyyy-MM-dd HH:mm");
+        //获取待结束科目（延后5分钟）
+        List<Integer> msids = msSubjectMapper.listMsidsForEndSubject(strtime);
+        if(N_Utils.isListNotEmpty(msids)){
+            msSubjectMapper.updateEndSubject(timestamp, msids);
+        }
+    }
+
+    @Scheduled(cron = "${cron.questionCheckState}")
+    public void unLockQuestion() {
+        // int timestamp = N_Utils.getSecondTimestamp();
+
+    }
+
+    /*
+     * @Description 合并学生作答多图
+     * @Date 2024/11/15 14:21:05
+     * @Author WN
+     * @Return void
+     **/
+    @Scheduled(cron = "${cron.mergeStupic}")
+    public void paperStuQuestionAnswerMerge() {
+        msPaperStudentQuestionService.paperStuQuestionAnswerMerge();
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/task/UriMapTask.java

@@ -0,0 +1,49 @@
+package com.xhkjedu.smarking.task;
+
+import com.xhkjedu.smarking.utils.MarkingUtil;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author ywx
+ * @classname ReadTask
+ * @description 阅读定时任务
+ * CronTrigger配置完整格式为： [秒] [分] [小时] [日] [月] [周] [年]
+ * 说明    必填    值                  允许的通配符
+ * 秒        是    0-59                , - * /
+ * 分        是    0-59                , - * /
+ * 时        是    0-23                , - * /
+ * 日        是    1-31                , - * ? / L W
+ * 月        是    1-12或JAN-DEC       , - * /
+ * 周        是    1-7或SUN-SAT        , - * ? / L W
+ * 年        否    empty 或1970-2099   , - * /
+ * , 表示指定多个值，例如在周字段上设置 "MON,WED,FRI" 表示周一，周三和周五触发
+ * - 表示区间。例如 在小时上设置 "10-12",表示 10,11,12点都会触发。
+ * * 表示所有值. 例如:在分的字段上设置 "*",表示每一分钟都会触发
+ * ? 表示不指定值。使用的场景为不需要关心当前设置这个字段的值。每月的10号触发一个操作，但不关心是周几,具体设置为 0 0 0 10 * ?
+ * / 用于递增触发。如在秒上面设置"5/15" 表示从5秒开始，每增15秒触发(5,20,35,50)
+ * L 表示最后的意思。在日字段设置上，表示当月的最后一天(依据当前月份，如果是二月还会依据是否是润年[leap]),
+ * 在周字段上表示星期六，相当于"7"或"SAT(不区分大小写)"。
+ * 如果在"L"前加上数字，则表示该数据的最后一个。例如在周字段上设置"6L"这样的格式,则表示“本月最后一个星期五"
+ * W 表示离指定日期的最近那个工作日(周一至周五). 例如在日字段上设置"15W"，表示离每月15号最近的那个工作日触发。
+ * 如果15号正好是周六，则找最近的周五(14号)触发, 如果15号是周未，则找最近的下周一(16号)触发.
+ * 如果15号正好在工作日(周一至周五)，则就在该天触发。(注，"W"前只能设置具体的数字,不允许区间"-").
+ * @date 2020/9/1 9:36
+ **/
+@Component
+public class UriMapTask {
+
+    /**
+     * 每隔3s清除一下请求地址map
+     * @Param []
+     * @Author ywx
+     * @Date 2020/11/9 12:30
+     * @return void
+     **/
+    @Scheduled(cron = "${cron.deleteUriMap}")
+    public void deleteUriMap() {
+        MarkingUtil.uriMap = new ConcurrentHashMap<>();
+    }
+}

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

@@ -21,13 +21,13 @@ public class ConvertUtil {
     /**
      * 学生答案图片合并mq
      *
-     * @param [mpsqid, userAnswers, device(1线上线下2答题卡)]
+     * @param [mpsqid, userAnswers,]
      * @return void
      * @author ywx
      * @date 2022/5/9 14:57
      */
-    public void imgMerge(Integer mpsqid, List<String> userAnswers, Integer device) {
-        messageSender.imgMerge(mpsqid, userAnswers, device);
+    public void imgMerge(Integer mpsqid, List<String> userAnswers) {
+        messageSender.imgMerge(mpsqid, userAnswers);
     }
 
     /** 考试附件试卷图片转pdf

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -80,4 +80,34 @@
         where ms.msid=#{msid}
     </select>
 
+    <!--定时任务-科目开始考试-->
+    <update id="updateStartSubject">
+        update ms_exam e left join ms_subject ms on e.examid = ms.examid
+        set ms.msstate=1
+        where e.examstate>=1 and e.deleted=1 and e.exammode=3
+        and ms.msstate=0 and concat(ms.sdate,' ',ms.begintime)&lt;=#{strtime}
+    </update>
+    <!--定时任务-科目结束考试-获取待结束考试-->
+    <select id="listMsidsForEndSubject">
+        select ms.msid from ms_subject ms left join ms_exam e on ms.examid=e.examid
+        where e.examstate>=1 and e.deleted=1 and e.exammode=3 and ms.msstate=1
+        and adddate(concat(ms.sdate,' ',ms.endtime),interval 5 minute) &lt;#{strtime}
+    </select>
+    <!--定时任务-科目结束考试-->
+    <update id="updateEndSubject">
+        update ms_subject ms
+        left join ms_paper_student mps on ms.msid=mps.msid and mps.sstate in(0,1)
+        set ms.msstate=2,mps.sstate=(case when mps.sstate=0 then 3 else 2 end)
+        ,mps.endtime=(case when mps.sstate=1 then #{timestamp} else mps.endtime end)
+        ,mps.stuscoretype=(case when mps.sstate=1 then 1 else 0 end)
+        ,mps.stuscore=(case when mps.sstate=1 then
+        (SELECT SUM(IFNULL(q.stuscore,0)) FROM ms_paper_student_question q WHERE q.mpsid=mps.mpsid)
+        else 0 end)
+        ,mps.costtime=(case where mps.sstate=1 then
+        (SELECT SUM(IFNULL(q.costtime,0)) FROM ms_paper_student_question q WHERE q.mpsid=mps.mpsid)
+        else 0 end)
+        where ms.msstate=1 and ms.msid in
+        <foreach collection="msids" item="msid" separator="," open="(" close=")">#{msid}</foreach>
+    </update>
+
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentMapper.xml

@@ -204,7 +204,8 @@
     </select>
     <!--学生考试-提交试卷-->
     <update id="updateStudentPaper">
-        update ms_paper_student set endtime=#{ps.endtime},sstate=#{ps.sstate}
+        update ms_paper_student set endtime=#{ps.endtime},sstate=#{ps.sstate},stuscoretype=1
+        ,stuscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM ms_paper_student_question q WHERE q.mpsid=#{ps.mpsid})
         <if test="ps.costtime==null and ps.costtime==0">
             ,costtime=(SELECT SUM(IFNULL(q.costtime,0)) FROM ms_paper_student_question q WHERE q.mpsid=#{ps.mpsid})
         </if>
@@ -235,7 +236,7 @@
 
     <!--扫描异常-清空学生扫描试卷信息-->
     <update id="updateStuPaperForScanErrorClear">
-        update ms_paper_student set sstate=0,checked=0,stuscore=0.0,hasbad=0,batchid=null,mspid=null,
+        update ms_paper_student set sstate=0,checked=0,stuscore=0.0,stuscoretype=0,hasbad=0,batchid=null,mspid=null,
                                     paperfront=null,paperback=null,pagenum=0 where mpsid=#{mpsid}
     </update>
     <!--扫描异常-缺考异常-更改状态-->
@@ -252,12 +253,12 @@
 
     <!--补录成绩-补录单科-->
     <update id="updateStuScoreForFillScore">
-        update ms_paper_student set stuscore=#{psc.fillscore},stuscoretype=2 where mpsid=#{psc.mpsid}
+        update ms_paper_student set stuscore=#{psc.fillscore},stuscoretype=2 where mpsid=#{psc.mpsid} and stuscoretype=0
     </update>
     <!--补录成绩-补录多科-->
     <update id="updateBatchStuScoreForFillScore">
         <foreach collection="list" item="p" separator=";">
-            update ms_paper_student set stuscore=#{p.fillscore},stuscoretype=2 where mpsid=#{p.mpsid}
+            update ms_paper_student set stuscore=#{p.fillscore},stuscoretype=2 where mpsid=#{p.mpsid} and stuscoretype=0
         </foreach>
     </update>
     <!--补录成绩-清空学生补录分数-->

smarking/src/main/resources/mapper/stupaper/MsPaperStudentQuestionMapper.xml

@@ -64,10 +64,19 @@
         where mpsid=#{mpsid} and answertype=2 and answered=1 and converted=1 order by qorder
     </select>
 
-    <!--学生考试-提交试卷-生产学生题块-试卷中所有试题-->
+    <!--学生考试-提交试卷-生成学生题块-试卷中所有试题-->
     <select id="listStuQuestionsByMpsid" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion">
         select * from ms_paper_student_question where mpsid=#{mpsid} order by qorder
     </select>
+    <!--学生考试-提交试卷-修改未提交试题为已批阅-->
+    <update id="updateStuQuestionsNoCommit">
+        UPDATE ms_paper_student_question SET costtime=0,checked=2,stuscore=0,firstccore=0,firstcime=#{timestamp}
+        WHERE mpsid=#{mpsid} AND answered=0
+    </update>
+    <!--学生考试-提交试卷-获取试卷中未批改试题数量-->
+    <select id="getStuQuestionNoCheckedNum" resultType="java.lang.Integer">
+        SELECT count(*) FROM ms_paper_student_question WHERE mpsid=#{mpsid} AND checked!=2
+    </select>
 
     <!--试卷答案-客观题-批量更新学生提交指定试题是否需要重新批改-->
     <update id="updateBatchStuQuesNeeddeal">
@@ -302,4 +311,10 @@
         left join ms_paper_qtype pt on pq.mptid=pt.mptid
         where psq.mpsid=#{mpsid} order by pt.mptorder, psq.qorder
     </select>
+
+    <!--定时任务-获取学生答案待合并试题-->
+    <select id="listNoMergeStupic" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion">
+        select mpsqid,stuanswer,examid from ms_paper_student_question
+        where answered=1 and answertype=2 and converted=1 order by mpsqid
+    </select>
 </mapper>