diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/PipelineSchedulingBootstrapper.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/PipelineSchedulingBootstrapper.java index b0631390..f0dddc8c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/PipelineSchedulingBootstrapper.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/PipelineSchedulingBootstrapper.java @@ -26,7 +26,7 @@ public class PipelineSchedulingBootstrapper { private PipelineSchedulingPropertiesServiceImpl taskService; @Resource - private PipelineSchedulerConfig taskScheduler; + private PipelineSchedulerConfig pipelineSchedulerConfig; @Resource private PipelineExecutor pipelineExecutor; @@ -36,7 +36,7 @@ public class PipelineSchedulingBootstrapper { List tasks = taskService.getAllTasks(); for (PipelineSchedulingProperties task : tasks) { if (ContextStateEnum.RUNNING.getCode().equals(Integer.parseInt(task.getStatus()))) { - taskScheduler.addTask(task.getPipelineId(), ()->{ + pipelineSchedulerConfig.addTask(task.getPipelineId(), ()->{ pipelineExecutor.execute(task.getPipelineId()); }, task.getCronExpression()); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/config/PipelineSchedulerConfig.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/config/PipelineSchedulerConfig.java index 466bd545..6589d07b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/config/PipelineSchedulerConfig.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/config/PipelineSchedulerConfig.java @@ -1,6 +1,5 @@ package cd.casic.ci.process.engine.scheduler.config; -import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.context.annotation.Configuration; @@ -28,8 +27,9 @@ import java.util.concurrent.ScheduledFuture; @Configuration @EnableScheduling @Slf4j +@Component("pipelineSchedulerConfig") public class PipelineSchedulerConfig implements SchedulingConfigurer { - @Resource +// @Resource private ScheduledTaskRegistrar taskRegistrar; private final Map taskFutures = new HashMap<>(); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/dao/PipelineSchedulingPropertiesDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/dao/PipelineSchedulingPropertiesDao.java index a2186a03..db90aeaa 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/dao/PipelineSchedulingPropertiesDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/dao/PipelineSchedulingPropertiesDao.java @@ -2,6 +2,7 @@ package cd.casic.ci.process.engine.scheduler.dao; import cd.casic.ci.process.engine.scheduler.dateObject.PipelineSchedulingProperties; import cd.casic.framework.mybatis.core.mapper.BaseMapperX; +import org.apache.ibatis.annotations.Mapper; /** * @author HopeLi @@ -10,5 +11,6 @@ import cd.casic.framework.mybatis.core.mapper.BaseMapperX; * @Date: 2025/5/26 16:31 * @Description: */ +@Mapper public interface PipelineSchedulingPropertiesDao extends BaseMapperX { } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/service/impl/PipelineSchedulingPropertiesServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/service/impl/PipelineSchedulingPropertiesServiceImpl.java index 77facf79..37e1a649 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/service/impl/PipelineSchedulingPropertiesServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/scheduler/service/impl/PipelineSchedulingPropertiesServiceImpl.java @@ -30,7 +30,7 @@ public class PipelineSchedulingPropertiesServiceImpl extends ServiceImpl getAllTasks() { return taskRepository.selectList(null); @@ -38,7 +38,7 @@ public class PipelineSchedulingPropertiesServiceImpl extends ServiceImpl { + pipelineSchedulerConfig.addTask(task.getPipelineId(), () -> { },task.getCronExpression()); } taskRepository.insert(task); @@ -47,24 +47,24 @@ public class PipelineSchedulingPropertiesServiceImpl extends ServiceImpl().eq("task_id", taskId)); } public void startTask(String taskId) { - taskScheduler.startTask(taskId); + pipelineSchedulerConfig.startTask(taskId); taskRepository.update(null, new UpdateWrapper() .set("status", "RUNNING").eq("task_id", taskId)); } public void stopTask(String taskId) { - taskScheduler.stopTask(taskId); + pipelineSchedulerConfig.stopTask(taskId); taskRepository.update(null, new UpdateWrapper() .set("status", "STOPPED").eq("task_id", taskId)); }