定时任务质量稽核

server/src/main/java/edp/davinci/controller/QualityTaskController.java

@@ -221,6 +221,7 @@ public class QualityTaskController extends BaseController {
     @ApiOperation(value = "setDispatch")
     @PutMapping(value = "/setDispatch/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity setDispatch(@PathVariable Long id, @RequestBody CronJobInfo cronJob, @ApiIgnore BindingResult bindingResult, @ApiIgnore @CurrentUser User user, HttpServletRequest request) {
+
         // 1. 保存任务
         if (bindingResult.hasErrors()) {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
@@ -235,9 +236,9 @@ public class QualityTaskController extends BaseController {
                 CronJob cronJob1 = cronJobService.getCronJob(qualityTask.getCronJobId(), user);
                 if (null != cronJob1) {
                     // 停止
-                    cronJobService.stopCronJob(qualityTask.getCronJobId(), user);
+                    cronJobService.stopCronJob(cronJob1.getId(), user);
                     // 删掉任务
-                    cronJobService.deleteCronJob(qualityTask.getCronJobId(), user);
+                    cronJobService.deleteCronJob(cronJob1.getId(), user);
                 }
 
             }
@@ -248,14 +249,13 @@ public class QualityTaskController extends BaseController {
         cronJob.setDescription("质量稽核任务");
         CronJobInfo jobInfo = cronJobService.createCronJob(cronJob, user);
 
-        // 4. 更新定时规则id到任务中
-        qualityTask.setCronJobId(jobInfo.getId());
-        qualityTaskService.updateQualityTask(qualityTask);
-
-
-        // 5. 执行
+        // 4. 执行
         CronJob cronJobStart =  cronJobService.startCronJob(jobInfo.getId(), user);
 
+        // 5.  更新定时规则id到任务中
+        qualityTask.setCronJobId(cronJobStart.getId());
+        qualityTaskService.updateQualityTask(qualityTask);
+
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request));
     }
 

server/src/main/java/edp/davinci/service/impl/AuditorScheduleServiceImpl.java

@@ -27,6 +27,7 @@ public class AuditorScheduleServiceImpl extends BaseScheduleService implements S
 
     @Override
     public void execute(long jobId) throws Exception {
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 质量稽核任务开始"+ jobId);
         CronJob cronJob = cronJobMapper.getById(jobId);
         cronJobMapper.updateExecLog(jobId, "");
         scheduleLogger.info("质量稽核: "+"CronJob({}) is start! --------------", jobId);

server/src/main/java/edp/davinci/service/impl/EmailScheduleServiceImpl.java

@@ -100,6 +100,7 @@ public class EmailScheduleServiceImpl extends BaseScheduleService implements Sch
 
     @Override
     public void execute(long jobId) throws Exception {
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 邮件任务开始"+ jobId);
         CronJob cronJob = cronJobMapper.getById(jobId);
         if (null == cronJob || StringUtils.isEmpty(cronJob.getConfig())) {
             scheduleLogger.error("CronJob({}) config is empty", jobId);