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

http://jira.mfd.msk:8088/browse/CLS-862

Browse source
This commit is contained in:
etreschenkov 2025-07-11 12:46:38 +03:00
parent cccb4017b3
commit f72590da62
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java
View file

@ -202,7 +202,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
IValidator validator = valFor(sTrd); IValidator validator = valFor(sTrd);
Optional<EnumMessage> error = validator.tillFirstError(); Optional<EnumMessage> error = validator.tillFirstError();
if (error.isPresent()) { if (error.isPresent()) {
logError(sTrd.getId(), error.get()); logError(sTrd.getTradeNum(), error.get());
continue; continue;
} }
ExecutionCurrency newEC; ExecutionCurrency newEC;
@ -368,8 +368,8 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH);
} }
private void logError(Long sTradeId, EnumMessage msg) { private void logError(Long sTradeNum, EnumMessage msg) {
String err = format("sTrade id=%d %s", sTradeId, msgResolver.resolve(msg)); String err = format("Сделка № %d не смогла быть обработана. %s", sTradeNum, msgResolver.resolve(msg));
log.warn(err); log.warn(err);
notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH);
} }

10
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java
View file

@ -92,7 +92,9 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent {
@Autowired @Autowired
public ExecutionDepositComponent(ImdgProvider imdgProvider, Producer<String, Object> kafka, NotificationSender notifications, public ExecutionDepositComponent(ImdgProvider imdgProvider,
Producer<String, Object> kafka,
NotificationSender notifications,
@Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafkaSender, @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafkaSender,
IMessageResolver msgResolver) { IMessageResolver msgResolver) {
this.sTradeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_STrades, STrades.class); this.sTradeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_STrades, STrades.class);
@ -186,7 +188,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent {
IValidator validator = valFor(sTrd); IValidator validator = valFor(sTrd);
Optional<EnumMessage> error = validator.tillFirstError(); Optional<EnumMessage> error = validator.tillFirstError();
if (error.isPresent()) { if (error.isPresent()) {
logError(sTrd.getId(), error.get()); logError(sTrd.getTradeNum(), error.get());
continue; continue;
} }
ExecutionDeposit newED; ExecutionDeposit newED;
@ -355,8 +357,8 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent {
} }
private void logError(Long sTradeId, EnumMessage msg) { private void logError(Long sTradeNum, EnumMessage msg) {
String err = format("sTrade id=%d %s", sTradeId, msgResolver.resolve(msg)); String err = format("Сделка № %d не смогла быть обработана. %s", sTradeNum, msgResolver.resolve(msg));
log.warn(err); log.warn(err);
notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH);
} }

12
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java
View file

@ -1,5 +1,6 @@
package ru.spcex.clearing.service.execution; package ru.spcex.clearing.service.execution;
import static java.lang.String.format;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.Instant; import java.time.Instant;
@ -9,7 +10,6 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import static java.lang.String.format;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.event.Level; 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.IEnumId;
import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.enumeration.IEnumKey;
import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.enumeration.SimpleMessageResolver;
import ru.spcex.platform.utils.log.ExceptionUtils; import ru.spcex.platform.utils.log.ExceptionUtils;
import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD;
import ru.spcex.platform.utils.text.TextUtil; import ru.spcex.platform.utils.text.TextUtil;
@ -98,7 +97,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent {
//fixme ждать ТЗ //fixme ждать ТЗ
Long tradeNum; Long tradeNum;
Instant tradingDay; Instant tradingDay;
private final IMessageResolver msgResolver = new SimpleMessageResolver(); private final IMessageResolver msgResolver;
private final KafkaSender kafkaSender; private final KafkaSender kafkaSender;
private final NotificationSender notifications; private final NotificationSender notifications;
private final boolean valuation; private final boolean valuation;
@ -109,7 +108,9 @@ public class ExecutionFondComponent implements IExecutionUploadComponent {
@Autowired @Autowired
public ExecutionFondComponent(ImdgProvider imdgProvider, public ExecutionFondComponent(ImdgProvider imdgProvider,
ClearingServiceSettings settings, 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.sTradeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_STrades, STrades.class);
this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class); this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class);
this.listingImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Listing, Listing.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.valuation = settings.getTrade().getValuation(); //fixme
this.kafkaSender = kafkaSender; this.kafkaSender = kafkaSender;
this.notifications = notifications; this.notifications = notifications;
this.msgResolver = msgResolver;
resetTradingDay(); resetTradingDay();
} }
@ -409,7 +411,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent {
} }
private void logError(Long sTradeId, EnumMessage msg) { 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); log.warn(err);
notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH);
} }