wangliang пре 2 година
родитељ
комит
eefbbe6aeb

+ 0 - 2
themis-task/src/main/java/com/qmth/themis/task/quartz/MqActivityJob.java

@@ -56,8 +56,6 @@ public class MqActivityJob extends QuartzJobBean {
         Long finishTime = System.currentTimeMillis();
         Long finishTime = System.currentTimeMillis();
         QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
         QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
         teExamQueryWrapper.lambda().eq(TEExam::getEnable, 1)
         teExamQueryWrapper.lambda().eq(TEExam::getEnable, 1)
-//                .eq(TEExam::getForceFinish, 0)
-                .ne(TEExam::getMonitorStatus, InvigilateMonitorStatusEnum.FINISHED)
                 .le(TEExam::getEndTime, finishTime);
                 .le(TEExam::getEndTime, finishTime);
         List<TEExam> teExamList = teExamService.list(teExamQueryWrapper);
         List<TEExam> teExamList = teExamService.list(teExamQueryWrapper);
         if (Objects.nonNull(teExamList) && teExamList.size() > 0) {
         if (Objects.nonNull(teExamList) && teExamList.size() > 0) {

+ 2 - 1
themis-task/src/main/java/com/qmth/themis/task/start/StartRunning.java

@@ -66,7 +66,8 @@ public class StartRunning implements CommandLineRunner {
         Map mqActivityMap = new HashMap();
         Map mqActivityMap = new HashMap();
         mqActivityMap.put(SystemConstant.NAME, MqActivityJob.class.getName());
         mqActivityMap.put(SystemConstant.NAME, MqActivityJob.class.getName());
         quartzService.deleteJob(QuartzTaskEnum.MQ_ACTIVITY_JOB_NAME.name(), QuartzTaskEnum.MQ_ACTIVITY_JOB_GROUP_NAME.name());
         quartzService.deleteJob(QuartzTaskEnum.MQ_ACTIVITY_JOB_NAME.name(), QuartzTaskEnum.MQ_ACTIVITY_JOB_GROUP_NAME.name());
-        quartzService.addJob(MqActivityJob.class, QuartzTaskEnum.MQ_ACTIVITY_JOB_NAME.name(), QuartzTaskEnum.MQ_ACTIVITY_JOB_GROUP_NAME.name(), "0 0 0 * * ?", mqActivityMap);
+//        quartzService.addJob(MqActivityJob.class, QuartzTaskEnum.MQ_ACTIVITY_JOB_NAME.name(), QuartzTaskEnum.MQ_ACTIVITY_JOB_GROUP_NAME.name(), "0 0 0 * * ?", mqActivityMap);
+        quartzService.addJob(MqActivityJob.class, QuartzTaskEnum.MQ_ACTIVITY_JOB_NAME.name(), QuartzTaskEnum.MQ_ACTIVITY_JOB_GROUP_NAME.name(), "0 0/1 * * * ?", mqActivityMap);
         log.info("增加mqActivityjob end");
         log.info("增加mqActivityjob end");
 
 
         log.info("增加客观题答案缓存加载job start");
         log.info("增加客观题答案缓存加载job start");