From dd7595256c014893c25df5ec2ded75f4ba82b253 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 11 Jul 2025 13:24:44 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-862 --- .../execution/ExecutionCurrencyComponent.java | 12 ++++++------ .../service/execution/ExecutionDepositComponent.java | 9 +++++---- .../service/execution/ExecutionFondComponent.java | 9 +++++---- 3 files changed, 16 insertions(+), 14 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 d1fb6cb50..c493b6ac4 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 @@ -177,11 +177,10 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { sTrades.removeIf(sTrd -> { Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation()); if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) { - logNotifyW(format( + log.warn(format( "cannot parse strade.tradeNum=%d strade.operation %s", sTrd.getTradeNum(), - sTrd.getOperation()) - ); + sTrd.getOperation())); return true; } // MoneyFlowSide excDepSide = sTrdSide == Side.BUY ? MoneyFlowSide.BUY : MoneyFlowSide.SELL; @@ -202,7 +201,8 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); if (error.isPresent()) { - logError(sTrd.getTradeNum(), error.get()); + String err = format("Сделка № %d не смогла быть обработана. %s", sTrd.getTradeNum(), msgResolver.resolve(error.get())); + logNotifyE(err); continue; } ExecutionCurrency newEC; @@ -231,7 +231,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { String err = String.format("When create new ExecutionCurrency by STrade[%d] error: %s", sTrd.getId(), ExceptionUtils.getStackTrace(e)); - logNotifyE(err); + log.error(err); } } log.info("batch putAll {} ExecutionCurrency", execsToInsert.size()); @@ -365,7 +365,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { private void logError(IEnumId subject, Object... args) { String err = msgResolver.resolve(new EnumMessage(subject, args)); log.info("{}", err); - notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); +// notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); } private void logError(Long sTradeNum, EnumMessage msg) { 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 a75a24cd5..4b6f5c1da 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 @@ -163,7 +163,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { sTrades.removeIf(sTrd -> { Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation()); if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) { - logNotifyW(format( + log.warn(format( "cannot parse strade.tradeNum=%d strade.operation %s", sTrd.getTradeNum(), sTrd.getOperation()) @@ -188,7 +188,8 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); if (error.isPresent()) { - logError(sTrd.getTradeNum(), error.get()); + String err = format("Сделка № %d не смогла быть обработана. %s", sTrd.getTradeNum(), msgResolver.resolve(error.get())); + logNotifyE(err); continue; } ExecutionDeposit newED; @@ -217,7 +218,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { String err = String.format("When create new ExecutionDeposit by STrade[%d] error: %s", sTrd.getId(), ExceptionUtils.getStackTrace(e)); - logNotifyE(err); + log.error(err); } } log.info("batch putAll {} ExecutionDeposit", execsToInsert.size()); @@ -353,7 +354,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent { private void logError(IEnumId subject, Object... args) { String err = msgResolver.resolve(new EnumMessage(subject, args)); log.info("{}", err); - notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); +// 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 3ed703744..710bb425a 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 @@ -187,7 +187,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { sTrades.removeIf(sTrd -> { Side sTrdSide = IEnumKey.getEnumByKey(Side.class, sTrd.getOperation()); if (sTrdSide == null || !(sTrdSide.equals(Side.BUY) || sTrdSide.equals(Side.SELL))) { - logNotifyW(format( + log.warn(format( "cannot parse strade.tradeNum=%d strade.operation %s", sTrd.getTradeNum(), sTrd.getOperation()) @@ -212,7 +212,8 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { IValidator validator = valFor(sTrd); Optional error = validator.tillFirstError(); if (error.isPresent()) { - logError(sTrd.getId(), error.get()); + String err = format("Сделка № %d не смогла быть обработана. %s", sTrd.getTradeNum(), msgResolver.resolve(error.get())); + logNotifyE(err); continue; } ExecutionFond newED; @@ -241,7 +242,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { String err = String.format("When create new ExecutionFond by STrade[%d] error: %s", sTrd.getId(), ExceptionUtils.getStackTrace(e)); - logNotifyE(err); + log.error(err); } } log.info("batch putAll {} ExecutionFond", execsToInsert.size()); @@ -407,7 +408,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent { private void logError(IEnumId subject, Object... args) { String err = msgResolver.resolve(new EnumMessage(subject, args)); log.info("{}", err); - notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); +// notifications.sendNotification(ObjectType.vfrs, err, Priority.HIGH); } private void logError(Long sTradeId, EnumMessage msg) {