From 7a4695281ef934ce9199b1b90ef9262a979e8826 Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Mon, 29 Sep 2025 13:12:00 +0300 Subject: [PATCH] Removed unused methods; Uncommented schedulers --- .../mapper/signal/PhoneFidMapMapper.java | 1 - .../service/MonitoringService.java | 37 ++++++++++--------- .../UpdateProcessingPackagesService.java | 17 +++++---- .../service/UpdatingFlagsService.java | 17 ++++++--- .../service/indic/PhoneService.java | 25 +------------ .../mapper/signal/PhoneFidMapMapper.xml | 11 ------ 6 files changed, 41 insertions(+), 67 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java index 80f216f..0e42995 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java @@ -15,7 +15,6 @@ public interface PhoneFidMapMapper { List findFullPhoneFidMap(@Param("packageId") Integer packageId, @Param("offset") int offset, @Param("limit") int limit); void updatePhoneFidMaps(@Param("subjects") List subjects); - void updatePhoneFid(@Param("subject") PhoneFidMap subject); void updatePhoneFidMapsErrors(@Param("subjects") List subjects); diff --git a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java index 1a8e25f..1f30550 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java @@ -1,22 +1,8 @@ package ru.nbch.credit_tracker.service; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.scheduling.concurrent.CustomizableThreadFactory; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.dto.Hit; @@ -36,6 +22,21 @@ import ru.nbch.credit_tracker.service.xml.stax.MonitoringSignalResponseStaxXmlWr import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; import ru.nbch.credit_tracker.utils.CTUtil; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + /** * Сервис периодического опроса официального сервиса сигналов на наличие новых отчетов по пакетам находящимся в статусе ON_MONITORING */ @@ -59,9 +60,9 @@ public class MonitoringService { } public void run() { -// ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("monitoring-")); -// long period = config.getMonitoringInterval() != null ? config.getMonitoringInterval() : 15; -// scheduler.scheduleAtFixedRate(this::monitor, 0, period, TimeUnit.MINUTES); + ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("monitoring-")); + long period = config.getMonitoringInterval() != null ? config.getMonitoringInterval() : 15; + scheduler.scheduleAtFixedRate(this::monitor, 0, period, TimeUnit.MINUTES); } private void monitor() { diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java index 5630238..2888c82 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java @@ -2,9 +2,12 @@ package ru.nbch.credit_tracker.service; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import ru.nbch.credit_tracker.entities.dto.UserPackage; import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.service.signal.SignalRestService; +import java.util.List; + /** * Сервис для завершения обработки пакетов находящихся в статусе PROCESSING * Запускается при старте приложения и отрабатывает 1 раз @@ -26,13 +29,13 @@ public class UpdateProcessingPackagesService { } public void run() { -// log.info("Start updating processing packages"); -// List packages = signalService.findPackagesOnProcessing(); -// for (UserPackage userPackage : packages) { -// log.info("Updating flags for Package {}", userPackage.getPackageName()); -// process(userPackage.getId(), userPackage.getPackageName()); -// } -// log.info("Finish updating processing packages"); + log.info("Start updating processing packages"); + List packages = signalService.findPackagesOnProcessing(); + for (UserPackage userPackage : packages) { + log.info("Updating flags for Package {}", userPackage.getPackageName()); + process(userPackage.getId(), userPackage.getPackageName()); + } + log.info("Finish updating processing packages"); } private void process(Integer packageId, String packageName) { 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 6b0a373..19549fb 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java @@ -1,10 +1,7 @@ package ru.nbch.credit_tracker.service; -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.List; -import java.util.function.Predicate; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.concurrent.CustomizableThreadFactory; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; @@ -12,6 +9,14 @@ import ru.nbch.credit_tracker.entities.dto.UserPackage; import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.service.signal.SignalRestService; +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.function.Predicate; + /** * Сервис периодического обновления фидов и флагов просрочек по пакетам находящимся в статусе ON_MONITORING * По обновленным пакетам формируется новый запрос постановки на мониторинг в официальный сервис сигналов @@ -38,8 +43,8 @@ public class UpdatingFlagsService { } public void run() { -// ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("updating-flags-")); -// scheduler.scheduleAtFixedRate(this::update, 0, updateFlagsInterval, TimeUnit.DAYS); + ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("updating-flags-")); + scheduler.scheduleAtFixedRate(this::update, 0, updateFlagsInterval, TimeUnit.DAYS); } private void update() { diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java index fa3b27c..7cd8a87 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java @@ -11,7 +11,6 @@ import ru.nbch.credit_tracker.mapper.indic.PhoneMapper; import java.time.LocalDate; import java.util.*; -import java.util.stream.Collectors; @Slf4j @Service @@ -25,13 +24,8 @@ public class PhoneService { /** * Ищет фиды по номерам телефона - * @return Map: key - номер телефона; value - fid + * @return Map: key - fid; value - {@link PhoneFidMap} */ - public Map findFidsPhoneData(List subjects) { - List phones = subjects.stream().map(subject -> "9" + subject.getPhone()).toList(); - return convertFidsDataToMap(mapper.findFids(phones)); - } - public Map defineFidByPhone(List subjects) { Map phoneFidMap = new HashMap<>(); List phones = subjects.stream(). @@ -65,23 +59,6 @@ public class PhoneService { return phoneFidMap; } - private Map convertFidsDataToMap(List fidsData) { - if (fidsData == null || fidsData.isEmpty()) { - return new HashMap<>(); - } - return fidsData.stream() - .collect(Collectors.groupingBy( - FidsData::getPhone, - Collectors.collectingAndThen( - Collectors.maxBy( - Comparator.comparing(FidsData::getFileSinceDate) - .thenComparing(FidsData::getFid) - ), - data -> data.map(FidsData::getFid).orElse(null) - ) - )); - } - @Getter @Setter @AllArgsConstructor diff --git a/src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml b/src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml index 3ff64c4..9d668d9 100644 --- a/src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml @@ -42,17 +42,6 @@ - - UPDATE signals_phone_fid_map - SET - fid = #{subject.fid}, - flag_debt5000 = #{subject.flagDebt5000}, - flag_90_12 = #{subject.flag90days}, - calculated_at = #{subject.calculatedAt}, - error_text = #{subject.errorText} - WHERE id = #{subject.id} - - UPDATE signals_phone_fid_map