diff --git a/src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java b/src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java index 891ec93..d3a78f1 100644 --- a/src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java +++ b/src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java @@ -3,18 +3,21 @@ package ru.nbch.credit_tracker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; +import ru.nbch.credit_tracker.service.MonitoringService; +import ru.nbch.credit_tracker.service.UpdateProcessingPackagesService; +import ru.nbch.credit_tracker.service.UpdatingFlagsService; @SpringBootApplication public class CreditTrackerApplication { public static void main(String[] args) { ConfigurableApplicationContext ctx = SpringApplication.run(CreditTrackerApplication.class, args); -// UpdateProcessingPackagesService updateProcessingPackagesService = ctx.getBean(UpdateProcessingPackagesService.class); -// MonitoringService monitoringService = ctx.getBean(MonitoringService.class); -// UpdatingFlagsService updatingFlagsService = ctx.getBean(UpdatingFlagsService.class); -// updateProcessingPackagesService.run(); -// monitoringService.run(); -// updatingFlagsService.run(); + UpdateProcessingPackagesService updateProcessingPackagesService = ctx.getBean(UpdateProcessingPackagesService.class); + MonitoringService monitoringService = ctx.getBean(MonitoringService.class); + UpdatingFlagsService updatingFlagsService = ctx.getBean(UpdatingFlagsService.class); + updateProcessingPackagesService.run(); + monitoringService.run(); + updatingFlagsService.run(); } } diff --git a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java index 0f3ca72..61dc791 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java @@ -15,8 +15,8 @@ import ru.nbch.credit_tracker.entities.external_request.signals.Signals; import ru.nbch.credit_tracker.entities.external_response.monitoring_report_error.MonitoringReportErrors; import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; import ru.nbch.credit_tracker.enums.Status; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; import ru.nbch.credit_tracker.service.indic.FlagsService; +import ru.nbch.credit_tracker.service.indic.FlagsService2; import ru.nbch.credit_tracker.service.indic.PersonService; import ru.nbch.credit_tracker.service.indic.PhoneService; import ru.nbch.credit_tracker.service.signal.HitsService; @@ -44,9 +44,8 @@ public class SignalService { private final HitsService hitsService; private final UserPackageService userPackageService; private final PhoneFidMapService phoneFidMapService; - private final PhoneFidMapMapper phoneFidMapMapper; private final PhoneService phoneService; - private final FlagsService flagsService; + private final FlagsService2 flagsService; private final PersonService personService; private final StaxXmlProcessor staxXmlProcessor; @@ -56,16 +55,14 @@ public class SignalService { HitsService hitsService, UserPackageService userPackageService, PhoneFidMapService phoneFidMapService, - PhoneFidMapMapper mapper, PhoneService phoneService, - FlagsService flagsService, + FlagsService2 flagsService, PersonService personService, StaxXmlProcessor staxXmlProcessor) { this.config = config; this.hitsService = hitsService; this.userPackageService = userPackageService; this.phoneFidMapService = phoneFidMapService; - this.phoneFidMapMapper = mapper; this.phoneService = phoneService; this.flagsService = flagsService; this.personService = personService; diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService2.java b/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService2.java index 720f8e3..629b181 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService2.java +++ b/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService2.java @@ -91,7 +91,7 @@ public class FlagsService2 { * @param flag90Days - рещультирующая мапа флагов просрочек 90_days */ private void findFlagsRuPastDueArrear(List fids, Map flag5000Map, Map flag90Days) { - log.debug("Start calculating flag 5000 and 90 days by RU_PASTDUEARREAR 2"); + log.debug("Start calculating flag 5000 and 90 days by RU_PASTDUEARREAR"); MapSqlParameterSource params = new MapSqlParameterSource(); params.addValue("fids", fids); @@ -167,7 +167,7 @@ public class FlagsService2 { } return null; }); - log.debug("Complete calculating flag 5000 and 90 days by RU_PASTDUEARREAR 2"); + log.debug("Complete calculating flag 5000 and 90 days by RU_PASTDUEARREAR"); } /** @@ -181,7 +181,7 @@ public class FlagsService2 { * @param flag90Days - рещультирующая мапа флагов просрочек 90_days */ private void findFlagsRuPaymt(List fids, Map flag90Days) { - log.debug("Start calculating flag 90 days by RU_PAPAYMT 2"); + log.debug("Start calculating flag 90 days by RU_PAPAYMT"); LocalDate yearAgo = LocalDate.now().minusYears(1); MapSqlParameterSource params = new MapSqlParameterSource(); params.addValue("fids", fids); @@ -233,7 +233,7 @@ public class FlagsService2 { } return null; }); - log.debug("Complete calculating flag 90 days by RU_PAPAYMT 2"); + log.debug("Complete calculating flag 90 days by RU_PAPAYMT"); }