From 8000a22dd4eb29e3e104461387c10a251492fae5 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 28 Nov 2025 14:27:36 +0300 Subject: [PATCH] update flags --- .../service/UpdatingFlagsService.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java index 47e7a70..25715d0 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java @@ -5,11 +5,8 @@ import java.time.temporal.ChronoUnit; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; -import org.springframework.beans.factory.InitializingBean; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.app.UserPackage; @@ -24,13 +21,12 @@ import ru.nbch.credit_tracker.service.signal.SignalRestService; @Slf4j @Service @EnableScheduling -public class UpdatingFlagsService implements InitializingBean { +public class UpdatingFlagsService { private final SignalService signalService; private final SignalRestService signalRestService; private final MonitoringErrorProcesingService monitoringErrorProcesingService; private final Long daysToUpdateFlags; - private final String updateFlagsCronExpression; private final PhoneFidMapMapper phoneFidMapMapper; public UpdatingFlagsService(SignalService signalService, @@ -42,18 +38,10 @@ public class UpdatingFlagsService implements InitializingBean { this.signalRestService = signalRestService; this.monitoringErrorProcesingService = monitoringErrorProcesingService; this.daysToUpdateFlags = config.getDaysToUpdateFlags() != null ? config.getDaysToUpdateFlags() : 1; - this.updateFlagsCronExpression = config.getUpdateFlagsCronExpression() != null ? config.getUpdateFlagsCronExpression() : "*/10 * * * * *"; this.phoneFidMapMapper = phoneFidMapMapper; } - public void run() { - ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); - scheduler.setPoolSize(1); - scheduler.initialize(); - scheduler.schedule(this::update, new CronTrigger(updateFlagsCronExpression)); - } - - @Scheduled(cron = "${ct.update-flags-interval}") + @Scheduled(cron = "${ct.update-flags-cron-expression}") private void update() { log.info("Start updating flags"); List packages = signalService.findPackagesOnMonitoring(); @@ -100,9 +88,4 @@ public class UpdatingFlagsService implements InitializingBean { long daysPassed = ChronoUnit.DAYS.between(pastDateTime, now); return daysPassed >= daysToUpdateFlags; } - - @Override - public void afterPropertiesSet() throws Exception { - - } }