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 13:24:44 +03:00
parent add502ed0b
commit dd7595256c
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,11 +177,10 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
sTrades.removeIf(sTrd -> { sTrades.removeIf(sTrd -> {
Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation()); Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation());
if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) { if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) {
logNotifyW(format( log.warn(format(
"cannot parse strade.tradeNum=%d strade.operation %s", "cannot parse strade.tradeNum=%d strade.operation %s",
sTrd.getTradeNum(), sTrd.getTradeNum(),
sTrd.getOperation()) sTrd.getOperation()));
);
return true; return true;
} }
// MoneyFlowSide excDepSide = sTrdSide == Side.BUY ? MoneyFlowSide.BUY : MoneyFlowSide.SELL; // MoneyFlowSide excDepSide = sTrdSide == Side.BUY ? MoneyFlowSide.BUY : MoneyFlowSide.SELL;
@ -202,7 +201,8 @@ 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.getTradeNum(), error.get()); String err = format("Сделка № %d не смогла быть обработана. %s", sTrd.getTradeNum(), msgResolver.resolve(error.get()));
logNotifyE(err);
continue; continue;
} }
ExecutionCurrency newEC; ExecutionCurrency newEC;
@ -231,7 +231,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
String err = String.format("When create new ExecutionCurrency by STrade[%d] error: %s", String err = String.format("When create new ExecutionCurrency by STrade[%d] error: %s",
sTrd.getId(), sTrd.getId(),
ExceptionUtils.getStackTrace(e)); ExceptionUtils.getStackTrace(e));
logNotifyE(err); log.error(err);
} }
} }
log.info("batch putAll {} ExecutionCurrency", execsToInsert.size()); log.info("batch putAll {} ExecutionCurrency", execsToInsert.size());
@ -365,7 +365,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
private void logError(IEnumId subject, Object... args) { private void logError(IEnumId subject, Object... args) {
String err = msgResolver.resolve(new EnumMessage(subject, args)); String err = msgResolver.resolve(new EnumMessage(subject, args));
log.info("{}", err); log.info("{}", err);
notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); // notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH);
} }
private void logError(Long sTradeNum, EnumMessage msg) { private void logError(Long sTradeNum, EnumMessage msg) {

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

@ -163,7 +163,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent {
sTrades.removeIf(sTrd -> { sTrades.removeIf(sTrd -> {
Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation()); Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation());
if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) { if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) {
logNotifyW(format( log.warn(format(
"cannot parse strade.tradeNum=%d strade.operation %s", "cannot parse strade.tradeNum=%d strade.operation %s",
sTrd.getTradeNum(), sTrd.getTradeNum(),
sTrd.getOperation()) sTrd.getOperation())
@ -188,7 +188,8 @@ 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.getTradeNum(), error.get()); String err = format("Сделка № %d не смогла быть обработана. %s", sTrd.getTradeNum(), msgResolver.resolve(error.get()));
logNotifyE(err);
continue; continue;
} }
ExecutionDeposit newED; ExecutionDeposit newED;
@ -217,7 +218,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent {
String err = String.format("When create new ExecutionDeposit by STrade[%d] error: %s", String err = String.format("When create new ExecutionDeposit by STrade[%d] error: %s",
sTrd.getId(), sTrd.getId(),
ExceptionUtils.getStackTrace(e)); ExceptionUtils.getStackTrace(e));
logNotifyE(err); log.error(err);
} }
} }
log.info("batch putAll {} ExecutionDeposit", execsToInsert.size()); log.info("batch putAll {} ExecutionDeposit", execsToInsert.size());
@ -353,7 +354,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent {
private void logError(IEnumId subject, Object... args) { private void logError(IEnumId subject, Object... args) {
String err = msgResolver.resolve(new EnumMessage(subject, args)); String err = msgResolver.resolve(new EnumMessage(subject, args));
log.info("{}", err); log.info("{}", err);
notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); // notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH);
} }

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

@ -187,7 +187,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent {
sTrades.removeIf(sTrd -> { sTrades.removeIf(sTrd -> {
Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation()); Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation());
if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) { if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) {
logNotifyW(format( log.warn(format(
"cannot parse strade.tradeNum=%d strade.operation %s", "cannot parse strade.tradeNum=%d strade.operation %s",
sTrd.getTradeNum(), sTrd.getTradeNum(),
sTrd.getOperation()) sTrd.getOperation())
@ -212,7 +212,8 @@ public class ExecutionFondComponent 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()); String err = format("Сделка № %d не смогла быть обработана. %s", sTrd.getTradeNum(), msgResolver.resolve(error.get()));
logNotifyE(err);
continue; continue;
} }
ExecutionFond newED; ExecutionFond newED;
@ -241,7 +242,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent {
String err = String.format("When create new ExecutionFond by STrade[%d] error: %s", String err = String.format("When create new ExecutionFond by STrade[%d] error: %s",
sTrd.getId(), sTrd.getId(),
ExceptionUtils.getStackTrace(e)); ExceptionUtils.getStackTrace(e));
logNotifyE(err); log.error(err);
} }
} }
log.info("batch putAll {} ExecutionFond", execsToInsert.size()); log.info("batch putAll {} ExecutionFond", execsToInsert.size());
@ -407,7 +408,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent {
private void logError(IEnumId subject, Object... args) { private void logError(IEnumId subject, Object... args) {
String err = msgResolver.resolve(new EnumMessage(subject, args)); String err = msgResolver.resolve(new EnumMessage(subject, args));
log.info("{}", err); log.info("{}", err);
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 sTradeId, EnumMessage msg) {