From 7886d13a245fe02500c5bb84d7aafd94ce28ac0a Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 24 Jun 2024 15:21:21 +0300 Subject: [PATCH] =?UTF-8?q?gateway-api=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20GATEWAY?= =?UTF-8?q?=5FRESULT=20=D0=B2=20GatewayService.requestOnReport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/gatewayapi/service/GatewayService.java | 3 +++ .../gatewayapi/service/builders/GatewayResultBuilder.java | 4 ++++ 2 files changed, 7 insertions(+) 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 d6945199e..b5a8da2eb 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 @@ -261,10 +261,13 @@ public class GatewayService extends QueueConsumer implements InitializingBean { .section(Section.FOND.getKey()) .type(reportType.getKey()) .content(content).build(); + GatewayResultBuilder gatewayBuilder = GatewayResultBuilder.builder(); + gatewayBuilder.outboundRequest(outboundRequest); String url = formingInboundUrl(inboundServerSettings.getPathLOCM()); HttpEntity r = makeDefaultRequest(outboundRequest); ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, r, SuccessResponse.class); + gatewayResultImdg.insert(gatewayBuilder.build()); SuccessResponse bodyResponse = response.getBody(); if (bodyResponse != null) { log.debug("Response from service: {}", bodyResponse); diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/GatewayResultBuilder.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/GatewayResultBuilder.java index 4f7a77464..c1ee1f550 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/GatewayResultBuilder.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/GatewayResultBuilder.java @@ -7,6 +7,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.clearing.AssetOperationRe import ru.spcex.clearing.platform.messaging.serialization.LogFormatter; import ru.spcex.platform.enumeration.InOutDirection; import ru.spcex.platform.enumeration.Section; +import ru.spcex.platform.utils.enumeration.IEnumKey; import java.time.Instant; @@ -39,6 +40,9 @@ public class GatewayResultBuilder { this.nameRequest = getNameReqByAsset(section, direction); else if (OutboundRequestType.FILL_LIMITS.equalsByKey(outboundRequest.getType())) this.nameRequest = getNameReqByLim(section); + else if (IEnumKey.contains(outboundRequest.getType(), OutboundRequestType.PFX64, OutboundRequestType.PFX65, OutboundRequestType.REPORT_KS_TMP, OutboundRequestType.REPORT_KS_FINAL)) { + this.nameRequest = "Выгрузка ТКР"; + } return this; }