treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lim-exporter добавил логов

Browse source
This commit is contained in:
AKurakin 2023-05-29 12:39:12 +03:00
parent af0a234e9b
commit f36f1b5542
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java
View file

@ -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.domain.cud.utilities.LimExportedRequest;
import ru.spcex.clearing.platform.messaging.serialization.LogFormatter; import ru.spcex.clearing.platform.messaging.serialization.LogFormatter;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; 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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.log.ExceptionUtils; 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 { public abstract class AbstractExporterService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
protected final Imdg<Registry> registryImdg; protected final Imdg<Registry> registryImdg;
private final List<String> validStatus = List.of("ACTV", "ROPN"); private final List<String> validStatus = List.of(
ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey()
// "ACTV", "ROPN"
);
private final Imdg<TradingClearingRegistry> tradingClearingRegistryImdg; private final Imdg<TradingClearingRegistry> tradingClearingRegistryImdg;
private final DateTimeFormatter dtFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); private final DateTimeFormatter dtFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
private final SFTPConfig.LimGateway gateway; private final SFTPConfig.LimGateway gateway;
@ -94,6 +98,9 @@ public abstract class AbstractExporterService {
protected boolean checkNotBlocked(Registry registry) { protected boolean checkNotBlocked(Registry registry) {
if (registry.getTradingClearingRegistryId() == null) return false; if (registry.getTradingClearingRegistryId() == null) return false;
TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(registry.getTradingClearingRegistryId()); 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())) { if (tradingClearingRegistry != null && StringUtils.hasText(tradingClearingRegistry.getStatus())) {
return validStatus.contains(tradingClearingRegistry.getStatus()); return validStatus.contains(tradingClearingRegistry.getStatus());
} }

2
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java
View file

@ -50,6 +50,8 @@ public class MoneyExporterService extends AbstractExporterService {
.collect(Collectors.groupingBy(Registry::getTradingClearingRegistry)); .collect(Collectors.groupingBy(Registry::getTradingClearingRegistry));
Map<String, List<Registry>> byTcrD = registriesD.stream() Map<String, List<Registry>> byTcrD = registriesD.stream()
.collect(Collectors.groupingBy(Registry::getTradingClearingRegistry)); .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<String, List<Registry>> entryA : byTcrA.entrySet()) { for (Map.Entry<String, List<Registry>> entryA : byTcrA.entrySet()) {
List<Registry> registriesListA = entryA.getValue(); List<Registry> registriesListA = entryA.getValue();

4
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java
View file

@ -1,6 +1,5 @@
package ru.spcex.clearing.lim.exporter.services; package ru.spcex.clearing.lim.exporter.services;
import org.apache.kafka.clients.producer.Producer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -41,6 +40,9 @@ public class SecurityExporterService extends AbstractExporterService {
"registryInstrumentType", "S", "registryInstrumentType", "S",
"registryUnit", "T" "registryUnit", "T"
)); ));
log.debug("Selected {} registriesA.",
registries.size());
for (Registry registry : registries) { for (Registry registry : registries) {
if (checkNotBlocked(registry)) { if (checkNotBlocked(registry)) {
limFileRows.add(getRow(registry)); limFileRows.add(getRow(registry));