1.定时任务自动任务生成

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

@@ -23,6 +23,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -35,6 +36,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author DELL
+ */
 @RestController
 @RequestMapping(value = "/api/planTask")
 @Api(tags = "计划执行api")
@@ -155,23 +159,6 @@ public class PlanTaskController extends AbstractBaseController {
     }
 
     /**
-     * 定时查询任务状态
-     *
-     * @return
-     */
-    @ApiOperation(value = "定时执行任务表生成", notes = "定时执行任务表生成")
-    @RequestMapping(value = "/queryOmission", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
-    public CommonResponse pushCarData() {
-        try {
-            planTaskService.taskExecution(null);
-            return CommonResponseUtil.success();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure();
-        }
-    }
-
-    /**
      * 模拟定时任务调起服务
      *
      * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java

@@ -287,10 +287,11 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             }
 
             //2.4.删除今天可能重做生成的数据（计划重做后进行了计划的编辑）
-            if (iplanTaskDao.findById(plan.getPlanTaskId()) != null && plan.getFirstFlag() == XJConstant.PLAN_FIRST_STATUS_YES)
+            if (iplanTaskDao.findById(plan.getPlanTaskId()).isPresent() && plan.getFirstFlag() == XJConstant.PLAN_FIRST_STATUS_YES) {
                 if (iplanTaskDao.existsById(plan.getPlanTaskId())) {
                     iplanTaskDao.deleteById(plan.getPlanTaskId());
                 }
+            }
 
             //2.5.插入planTask及planTaskDetail
             insertPlanTaskAndDet(list, plan, XJConstant.SCHED_FLAG, now);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/task/PlanTaskJob.java

+package com.yeejoin.amos.maintenance.task;
+
+import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author DELL
+ */
+@Component
+@EnableScheduling
+public class PlanTaskJob {
+
+
+    @Autowired
+    private IPlanTaskService planTaskService;
+
+    /**
+     * 定时查询任务状态
+     */
+    @Scheduled(cron = "${jobs.cron}")
+    public void scheduleJob() {
+        planTaskService.taskExecution(null);
+    }
+}