From 4f8e13ca3c1c7dcbda0e92aa04a0c3ae60cce2b3 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Tue, 13 Jun 2023 12:03:22 +0300 Subject: [PATCH] add section to Limit request --- .../clearing/gatewayapi/service/GatewayService.java | 11 +++++------ .../exporter/services/AbstractExporterService.java | 4 ++++ .../lim/exporter/services/MoneyExporterService.java | 6 ++++++ .../exporter/services/SecurityExporterService.java | 6 ++++++ .../domain/cud/utilities/LimExportedRequest.java | 10 ++++++++++ 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index b9fdc8a3e..e17c17b5a 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -94,7 +94,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean { InboundRequest inboundRequest = new InboundRequest(); inboundRequest.setId(UUID.randomUUID()); inboundRequest.setType("FILL_LIMITS"); - inboundRequest.setSection(Section.FOND.getKey()); + inboundRequest.setSection(exportedRequest.getSection()); inboundRequest.setDatetime(Instant.now()); Map content = new HashMap<>(); @@ -104,7 +104,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean { String response = restTemplate.postForObject(url, request, String.class); - log.debug("LOCM task complete, response: {}", response); + log.debug("Limit request complete, response: {}", response); } public void requestOnDemandSecurity(BaseRequest userRequest) { @@ -127,14 +127,13 @@ public class GatewayService extends QueueConsumer implements InitializingBean { HttpEntity request = new HttpEntity<>(inboundRequest, httpHeaders); String response = restTemplate.postForObject(url, request, String.class); - log.debug("LOCM task 1/2 complete (FOND section), response: {}", response); + log.debug("LOSC task 1/2 complete (FOND section), response: {}", response); - inboundRequest.setSection(Section.FOND.getKey()); + inboundRequest.setSection(Section.MKR.getKey()); request = new HttpEntity<>(inboundRequest, httpHeaders); response = restTemplate.postForObject(url, request, String.class); - log.debug("LOCM task 2/2 complete (MKR section), response: {}", response); -// return null; + log.debug("LOSC task 2/2 complete (MKR section), response: {}", response); } private String formingInboundUrl(String path) { 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 63d5d2f66..58c85a67a 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.Section; import ru.spcex.platform.enumeration.ServiceStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -50,6 +51,8 @@ public abstract class AbstractExporterService { public abstract String getTargetFileName(); + public abstract Section section(); + public void process() { String fileName = getTargetFileName(); log.debug("Start export {} Lim file", fileName); @@ -79,6 +82,7 @@ public abstract class AbstractExporterService { void sendLimExportedNotification(String fileName) { LimExportedRequest limExportedRequest = new LimExportedRequest(); limExportedRequest.setLimFileName(fileName); + limExportedRequest.setSection(section().getKey()); log.debug("Send message to kafka \"{}\": {}", LIM_EXPORTED, LogFormatter.toStringWrapper(limExportedRequest)); kafkaSender.sendRequestToQueue(LIM_EXPORTED, limExportedRequest); } 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 695d8f519..3e0b110d6 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 @@ -8,6 +8,7 @@ import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.lim.exporter.config.LimFormat; import ru.spcex.clearing.lim.exporter.config.SFTPConfig; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.platform.enumeration.Section; import ru.spcex.platform.imdg.api.ImdgProvider; import java.math.BigDecimal; @@ -33,6 +34,11 @@ public class MoneyExporterService extends AbstractExporterService { return prepareFileName("money"); } + @Override + public Section section() { + return Section.MKR; + } + @Override public Collection getLimFileRows() { log.debug("Started loading and formation of money file lines"); 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 7244b2d83..4289f1795 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 @@ -7,6 +7,7 @@ import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.lim.exporter.config.LimFormat; import ru.spcex.clearing.lim.exporter.config.SFTPConfig; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.platform.enumeration.Section; import ru.spcex.platform.imdg.api.ImdgProvider; import java.time.LocalDate; @@ -31,6 +32,11 @@ public class SecurityExporterService extends AbstractExporterService { return prepareFileName("security"); } + @Override + public Section section() { + return Section.FOND; + } + @Override public Collection getLimFileRows() { log.debug("Started loading and formation of DEPO file lines"); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/LimExportedRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/LimExportedRequest.java index 57a81505c..b9a332577 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/LimExportedRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/LimExportedRequest.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class LimExportedRequest { @JsonProperty private String limFileName; + @JsonProperty + private String section; public String getLimFileName() { return limFileName; @@ -13,4 +15,12 @@ public class LimExportedRequest { public void setLimFileName(String limFileName) { this.limFileName = limFileName; } + + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } }