diff --git a/credit-tracker.properties b/credit-tracker.properties index 7b96349..558cba1 100644 --- a/credit-tracker.properties +++ b/credit-tracker.properties @@ -65,6 +65,7 @@ ct.load-dir=/opt/app/reports # min ct.monitoring-interval=${MONITORING_INTERVAL:15} +ct.monitoring-membercodes=${MONITORING_MEMBERCODES:0001XX,0001BB} # days ct.update-flags-cron-expression=${UPDATE_FLAGS_CRON_EXPRESSION:0 25 18 * * *} ct.new-flags-cron-expression=${NEW_FLAGS_CRON_EXPRESSION:0 25 18 * * *} diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env index 12dc807..8da9c64 100644 --- a/docker_compose/credit_tracker_config.env +++ b/docker_compose/credit_tracker_config.env @@ -72,6 +72,7 @@ SIGNALS_USER=0001ZZ000001 # min MONITORING_INTERVAL=15 +MONITORING_MEMBERCODES=0001XX,0001BB # days DAYS_TO_UPDATE_FLAGS=30 diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml index 67f5c4c..42143e8 100644 --- a/docker_compose/docker-compose.yml +++ b/docker_compose/docker-compose.yml @@ -64,6 +64,7 @@ services: - SIGNALS_TOKEN=${SIGNALS_TOKEN} - SIGNALS_USER=${SIGNALS_USER} - MONITORING_INTERVAL=${MONITORING_INTERVAL} + - MONITORING_MEMBERCODES=${MONITORING_MEMBERCODES} - UPDATE_FLAGS_CRON_EXPRESSION=${UPDATE_FLAGS_CRON_EXPRESSION} - NEW_FLAGS_CRON_EXPRESSION=${NEW_FLAGS_CRON_EXPRESSION} - UPDATE_FIDS_CRON_EXPRESSION=${UPDATE_FIDS_CRON_EXPRESSION} diff --git a/pom.xml b/pom.xml index 57ac355..8ab72ae 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ru.nbch credit-tracker - 2.21.12 + 2.21.13 credit_tracker Credit Tracker Application diff --git a/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java b/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java index 320fb2f..7951474 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java +++ b/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java @@ -1,5 +1,6 @@ package ru.nbch.credit_tracker.config.settings; +import java.util.List; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -33,6 +34,7 @@ public class CreditTrackerSettings { private Long maxXmlFileSize; private String loadDir; private Long monitoringInterval; + private List monitoringMembercodes; private String updateFlagsCronExpression; private Integer daysToUpdateFlags; private Long daysToUpdateFids; diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java index 696a79e..d2edece 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java @@ -29,6 +29,7 @@ public interface UserPackageMapper { List findUserPackages(@Param("userId") String userId, @Param("statuses") List status); List findAllPackagesByStatus(@Param("statuses") String... statuses); + List findOnMonitoringByMemberCode(List membercodes); List findAllPackagesByUserId(@Param("userId") String userId); UserPackage findByPackageName(@Param("packageName") String packageName); diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java index 7fef55c..8a335d2 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java @@ -35,7 +35,6 @@ import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response. import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signal; import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signals; import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Subject; -import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.mapper.signal.FlagDetailMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.signal.HitsService; @@ -88,8 +87,7 @@ public class MonitoringService { private void monitor() { try { log.info("Start monitoring"); - List packages = userPackageMapper.findAllPackagesByStatus(Status.ON_MONITORING.name(), - Status.PROCESSING_REPEATED.name()); + List packages = userPackageMapper.findOnMonitoringByMemberCode(config.getMonitoringMembercodes()); for (UserPackage userPackage : packages) { MDC.put("ru.nbch.credit_tracker.log.mdc.key", "[" + userPackage.getPackageName() + "]"); processPackage(userPackage); diff --git a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml index 06df525..a9a46cc 100644 --- a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml @@ -229,6 +229,24 @@ + +