From f72590da623705c467c5460ee5cb07160b7f8878 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 11 Jul 2025 12:46:38 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-862 --- .../execution/ExecutionCurrencyComponent.java | 6 +++--- .../service/execution/ExecutionDepositComponent.java | 10 ++++++---- .../service/execution/ExecutionFondComponent.java | 12 +++++++----- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java index 0a3dbbcd9..d1fb6cb50 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java @@ -202,7 +202,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); if (error.isPresent()) { - logError(sTrd.getId(), error.get()); + logError(sTrd.getTradeNum(), error.get()); continue; } ExecutionCurrency newEC; @@ -368,8 +368,8 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); } - private void logError(Long sTradeId, EnumMessage msg) { - String err = format("sTrade id=%d %s", sTradeId, msgResolver.resolve(msg)); + private void logError(Long sTradeNum, EnumMessage msg) { + String err = format("Сделка № %d не смогла быть обработана. %s", sTradeNum, msgResolver.resolve(msg)); log.warn(err); notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java index bcd55df81..a75a24cd5 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java @@ -92,7 +92,9 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { @Autowired - public ExecutionDepositComponent(ImdgProvider imdgProvider, Producer kafka, NotificationSender notifications, + public ExecutionDepositComponent(ImdgProvider imdgProvider, + Producer kafka, + NotificationSender notifications, @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafkaSender, IMessageResolver msgResolver) { this.sTradeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_STrades, STrades.class); @@ -186,7 +188,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); if (error.isPresent()) { - logError(sTrd.getId(), error.get()); + logError(sTrd.getTradeNum(), error.get()); continue; } ExecutionDeposit newED; @@ -355,8 +357,8 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { } - private void logError(Long sTradeId, EnumMessage msg) { - String err = format("sTrade id=%d %s", sTradeId, msgResolver.resolve(msg)); + private void logError(Long sTradeNum, EnumMessage msg) { + String err = format("Сделка № %d не смогла быть обработана. %s", sTradeNum, msgResolver.resolve(msg)); log.warn(err); notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java index 6babe6fe1..3ed703744 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.service.execution; +import static java.lang.String.format; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Instant; @@ -9,7 +10,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import static java.lang.String.format; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; @@ -66,7 +66,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.IEnumId; import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.enumeration.IMessageResolver; -import ru.spcex.platform.utils.enumeration.SimpleMessageResolver; import ru.spcex.platform.utils.log.ExceptionUtils; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; import ru.spcex.platform.utils.text.TextUtil; @@ -98,7 +97,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { //fixme ждать ТЗ Long tradeNum; Instant tradingDay; - private final IMessageResolver msgResolver = new SimpleMessageResolver(); + private final IMessageResolver msgResolver; private final KafkaSender kafkaSender; private final NotificationSender notifications; private final boolean valuation; @@ -109,7 +108,9 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { @Autowired public ExecutionFondComponent(ImdgProvider imdgProvider, ClearingServiceSettings settings, - @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafkaSender, NotificationSender notifications) { + @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafkaSender, + NotificationSender notifications, + IMessageResolver msgResolver) { this.sTradeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_STrades, STrades.class); this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class); this.listingImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Listing, Listing.class); @@ -129,6 +130,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { this.valuation = settings.getTrade().getValuation(); //fixme this.kafkaSender = kafkaSender; this.notifications = notifications; + this.msgResolver = msgResolver; resetTradingDay(); } @@ -409,7 +411,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { } private void logError(Long sTradeId, EnumMessage msg) { - String err = format("sTrade id=%d %s", sTradeId, msgResolver.resolve(msg)); + String err = format("Сделка № %d не смогла быть обработана. %s", sTradeId, msgResolver.resolve(msg)); log.warn(err); notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); }