Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/job/task/ExamJobTimerTaskRunner.java

@@ -5,6 +5,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import vip.xiaonuo.common.timer.CommonTimerTaskRunner;
 import vip.xiaonuo.dev.api.DevJobApi;
+import vip.xiaonuo.dev.modular.job.param.DevJobIdParam;
+import vip.xiaonuo.dev.modular.job.service.DevJobService;
 import vip.xiaonuo.dev.modular.message.enums.DevMessageCategoryEnum;
 import vip.xiaonuo.dev.modular.message.param.DevMessageSendParam;
 import vip.xiaonuo.dev.modular.message.service.DevMessageService;
@@ -39,6 +41,12 @@ public class ExamJobTimerTaskRunner implements CommonTimerTaskRunner {
     @Resource
     private CourseOpenMapper courseOpenMapper;
 
+
+    @Resource
+    private DevJobService devJobService;
+
+
+
     /**
      * 任务执行的具体内容
      *
@@ -47,7 +55,7 @@ public class ExamJobTimerTaskRunner implements CommonTimerTaskRunner {
      **/
     @Override
     public void action(String jobId) {
-        log.info("ExamJobTimerTaskRunner jobId:{} RUN...",jobId);
+        log.info("考试管理定时任务ExamJobTimerTaskRunner jobId:{} RUN...",jobId);
         try {
             if(jobId != null && !jobId.isEmpty()){
                 JSONObject jb = devJobApi.queryEntity(jobId);
@@ -75,13 +83,17 @@ public class ExamJobTimerTaskRunner implements CommonTimerTaskRunner {
                         tExamMapper.updateById(taskExam);
                     }
                 }else{
-                    log.error("ExamJobTimerTaskRunner jobId:{} Query Error", jobId);
+                    log.error("考试管理定时任务ExamJobTimerTaskRunner jobId:{} Query Error", jobId);
                 }
+                //运行完将定时任务进行关闭
+                DevJobIdParam devJobIdParam = new DevJobIdParam();
+                devJobIdParam.setId(jobId);
+                devJobService.stopJob(devJobIdParam);
             }else{
-                log.error("ExamJobTimerTaskRunner jobId IS Empty");
+                log.error("考试管理定时任务ExamJobTimerTaskRunner jobId IS Empty");
             }
         } catch (Exception e) {
-            log.error("ExamJobTimerTaskRunner  Error:{}", e);
+            log.error("考试管理定时任务ExamJobTimerTaskRunner  Error:{}", e);
             e.printStackTrace();
         }
     }

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/TExamServiceImpl.java

@@ -92,7 +92,6 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
     private DevMessageService devMessageService;
 
 
-
     @Resource
     private DevJobService devJobService;