From f36f1b554259a608fc06fd75ded3cd7195ddbf82 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 29 May 2023 12:39:12 +0300 Subject: [PATCH] =?UTF-8?q?lim-exporter=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lim/exporter/services/AbstractExporterService.java | 9 ++++++++- .../lim/exporter/services/MoneyExporterService.java | 2 ++ .../lim/exporter/services/SecurityExporterService.java | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index 5d3989f4f..63d5d2f66 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -10,6 +10,7 @@ import ru.spcex.clearing.lim.exporter.config.SFTPConfig; import ru.spcex.clearing.platform.messaging.domain.cud.utilities.LimExportedRequest; import ru.spcex.clearing.platform.messaging.serialization.LogFormatter; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.platform.enumeration.ServiceStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.log.ExceptionUtils; @@ -28,7 +29,10 @@ import static ru.spcex.clearing.platform.messaging.domain.Consts.LIM_EXPORTED; public abstract class AbstractExporterService { private final Logger log = LoggerFactory.getLogger(getClass()); protected final Imdg registryImdg; - private final List validStatus = List.of("ACTV", "ROPN"); + private final List validStatus = List.of( + ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey() + // "ACTV", "ROPN" + ); private final Imdg tradingClearingRegistryImdg; private final DateTimeFormatter dtFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); private final SFTPConfig.LimGateway gateway; @@ -94,6 +98,9 @@ public abstract class AbstractExporterService { protected boolean checkNotBlocked(Registry registry) { if (registry.getTradingClearingRegistryId() == null) return false; TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(registry.getTradingClearingRegistryId()); + if (tradingClearingRegistry == null) { + log.warn("For registry.id={} not exist tradingClearingRegistry.id={}", registry.getId(), registry.getTradingClearingRegistryId()); + } if (tradingClearingRegistry != null && StringUtils.hasText(tradingClearingRegistry.getStatus())) { return validStatus.contains(tradingClearingRegistry.getStatus()); } diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java index 5ab00cc30..8b38fd616 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java @@ -50,6 +50,8 @@ public class MoneyExporterService extends AbstractExporterService { .collect(Collectors.groupingBy(Registry::getTradingClearingRegistry)); Map> byTcrD = registriesD.stream() .collect(Collectors.groupingBy(Registry::getTradingClearingRegistry)); + log.debug("Selected {} registriesA, {} registriesD. {} groups of A, {} groups of D.", + registriesA.size(), registriesD.size(), byTcrA.size(), byTcrD.size()); for (Map.Entry> entryA : byTcrA.entrySet()) { List registriesListA = entryA.getValue(); diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java index ae079aacc..2f5c3e7f4 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java @@ -1,6 +1,5 @@ package ru.spcex.clearing.lim.exporter.services; -import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -41,6 +40,9 @@ public class SecurityExporterService extends AbstractExporterService { "registryInstrumentType", "S", "registryUnit", "T" )); + log.debug("Selected {} registriesA.", + registries.size()); + for (Registry registry : registries) { if (checkNotBlocked(registry)) { limFileRows.add(getRow(registry));