From c7c5da5943d8ffa0d4bc1c275a945487573bd275 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 21:34:32 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
index ef629f5..5b7e2ac 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import cn.lihu.jh.module.ecg.Utils;
+import cn.lihu.jh.module.ecg.config.DynamicSchedulingConfig;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import cn.lihu.jh.module.ecg.service.room.RoomService;
import org.springframework.scheduling.config.CronTask;
@@ -51,14 +52,7 @@
private ConfigApi configApi;
@Resource
- private ScheduledTaskRegistrar taskRegistrar;
-
- @Resource
- private QueueService queueService;
-
- @Resource
private RoomService roomService;
-
@Resource
private queueMapper queueMapper;
@@ -582,8 +576,8 @@
@Override
public void resetScheduler() {
- Set<ScheduledTask> taskList = taskRegistrar.getScheduledTasks();
- taskList.forEach((task)->task.cancel());
+ ScheduledTaskRegistrar taskRegistrar = DynamicSchedulingConfig.static_scheduledTaskRegistrar;
+ taskRegistrar.getScheduledTasks().forEach(ScheduledTask::cancel);
String strOpenCloseTime = configApi.getConfigValueByKey(ECG_OPENING_TIME_KEY);
List<LocalTime> list = Utils.parseOpeningTime(strOpenCloseTime);
@@ -598,18 +592,20 @@
taskRegistrar.scheduleCronTask(new CronTask(() -> {
System.out.println("Opening Task executed at: " + System.currentTimeMillis());
- queueService.startBiz();
+ startBiz();
}, openCronExpression));
taskRegistrar.scheduleCronTask(new CronTask(() -> {
System.out.println("Close Task executed at: " + System.currentTimeMillis());
- queueService.closeBiz();
+ closeBiz();
}, closeCronExpression));
taskRegistrar.scheduleCronTask(new CronTask(() -> {
System.out.println("Room Reset Task executed at: " + System.currentTimeMillis());
roomService.resetRoom();
}, roomResetCronExpression));
+
+ taskRegistrar.afterPropertiesSet();
}
@Override
--
Gitblit v1.9.3