diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt index 500168e4..f335e1d6 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt @@ -235,12 +235,13 @@ class ActionScheduler : AgentRunningSubModule, Void>() suspend fun checkThenExecute(then: (currentTime: ZonedDateTime) -> Unit) = wheelActionsLock.withLock { fun loadActions( + source: Set, now: ZonedDateTime, load: (latestExecutingTime: ZonedDateTime, actionData: ScheduledActionData) -> Unit, repair: () -> Unit ) { val runLoading = { - for (actionData in listScheduledActions()) { + for (actionData in source) { val latestExecutingTime = parseToZonedDateTime( actionData.scheduleType, @@ -271,7 +272,7 @@ class ActionScheduler : AgentRunningSubModule, Void>() } } - loadActions(currentTime, load, repair) + loadActions(actionsGroupByHour[currentTime.hour], currentTime, load, repair) } fun loadDayActions(currentTime: ZonedDateTime) { @@ -285,7 +286,7 @@ class ActionScheduler : AgentRunningSubModule, Void>() } } - loadActions(currentTime, load, repair) + loadActions(listScheduledActions(), currentTime, load, repair) } val currentTime = ZonedDateTime.now()