Merge branch 'dev_v1.2.8' into dev_v1.2.9

imerge

themis-task/src/main/java/com/qmth/themis/task/listener/service/impl/MqTaskLogicServiceImpl.java

@@ -73,19 +73,15 @@ public class MqTaskLogicServiceImpl implements MqTaskLogicService {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(String.valueOf(mqDto.getBody()));
             for (int i = 0; i < jsonArray.size(); i++) {
                 TEExamActivity teExamActivity = JSONObject.toJavaObject((JSON) jsonArray.get(i), TEExamActivity.class);
-                if (Objects.nonNull(teExamActivity.getFinishTime())
-                        && teExamActivity.getFinishTime().longValue() > System.currentTimeMillis()) {
-                    String jobName = teExamActivity.getId() + "-" + teExamActivity.getFinishTime();
-                    if (Objects.equals(SystemConstant.DELETE, oper)) {
-                        quartzService.deleteJob(jobName, QuartzTaskEnum.EXAM_ACTIVITY_JOB_GROUP_NAME.name());
-                    } else if (Objects.equals(SystemConstant.INSERT, oper)) {
-                        quartzService.deleteJob(jobName, QuartzTaskEnum.EXAM_ACTIVITY_JOB_GROUP_NAME.name());
-                        if (Objects.nonNull(teExam.getEnable()) && teExam.getEnable().intValue() == 1
-                                && Objects.nonNull(teExamActivity.getEnable())
-                                && teExamActivity.getEnable().intValue() == 1) {
-                            this.setCron(teExamActivity.getFinishTime(), jobName, ExamActivityJob.class,
-                                    QuartzTaskEnum.EXAM_ACTIVITY_JOB_GROUP_NAME);
-                        }
+                String jobName = teExamActivity.getId() + "-" + teExamActivity.getFinishTime();
+                if (Objects.equals(SystemConstant.DELETE, oper)) {
+                    quartzService.deleteJob(jobName, QuartzTaskEnum.EXAM_ACTIVITY_JOB_GROUP_NAME.name());
+                } else if (Objects.equals(SystemConstant.INSERT, oper)) {
+                    quartzService.deleteJob(jobName, QuartzTaskEnum.EXAM_ACTIVITY_JOB_GROUP_NAME.name());
+                    if (Objects.nonNull(teExam.getEnable()) && teExam.getEnable().intValue() == 1 && Objects.nonNull(
+                            teExamActivity.getEnable()) && teExamActivity.getEnable().intValue() == 1) {
+                        this.setCron(teExamActivity.getFinishTime(), jobName, ExamActivityJob.class,
+                                QuartzTaskEnum.EXAM_ACTIVITY_JOB_GROUP_NAME);
                     }
                 }
             }
@@ -113,21 +109,19 @@ public class MqTaskLogicServiceImpl implements MqTaskLogicService {
                         SystemConstant.DEFAULT_OPENING_SECONDS :
                         openingSecondsTemp;
                 Long finalPrepareTime = teExamActivity.getStartTime() + (openingSecondsTemp * 1000);
-                if (Objects.nonNull(finalPrepareTime) && finalPrepareTime.longValue() > System.currentTimeMillis()) {
-                    String jobName = teExamActivity.getId() + "-" + finalPrepareTime;
-                    //                    JobKey jobKey = new JobKey(teExamActivity.getId() + "-" + finalPrepareTime,
-                    //                            QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME.name());
-                    //                    List<? extends Trigger> triggers = scheduler.getTriggersOfJob(jobKey);
-                    if (Objects.equals(SystemConstant.DELETE, oper)) {
-                        quartzService.deleteJob(jobName,
-                                QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME.name());
-                    } else if (Objects.equals(SystemConstant.INSERT, oper)) {
-                        quartzService.deleteJob(jobName,
-                                QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME.name());
-                        if (Objects.nonNull(teExamActivity.getEnable()) && teExamActivity.getEnable().intValue() == 1) {
-                            this.setCron(finalPrepareTime, jobName, ExamActivityFinalPrepareTimeJob.class,
-                                    QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME);
-                        }
+                String jobName = teExamActivity.getId() + "-" + finalPrepareTime;
+                //                    JobKey jobKey = new JobKey(teExamActivity.getId() + "-" + finalPrepareTime,
+                //                            QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME.name());
+                //                    List<? extends Trigger> triggers = scheduler.getTriggersOfJob(jobKey);
+                if (Objects.equals(SystemConstant.DELETE, oper)) {
+                    quartzService.deleteJob(jobName,
+                            QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME.name());
+                } else if (Objects.equals(SystemConstant.INSERT, oper)) {
+                    quartzService.deleteJob(jobName,
+                            QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME.name());
+                    if (Objects.nonNull(teExamActivity.getEnable()) && teExamActivity.getEnable().intValue() == 1) {
+                        this.setCron(finalPrepareTime, jobName, ExamActivityFinalPrepareTimeJob.class,
+                                QuartzTaskEnum.EXAM_ACTIVITY_FINAL_PREPARE_TIME_JOB_GROUP_NAME);
                     }
                 }
             }