From 59a5d2354528cde1b17c27fc29998f32f94e6fe2 Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 25 Mar 2026 14:12:17 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-944 --- clearing-parent/account-service/pom.xml | 2 +- clearing-parent/backend-api/pom.xml | 2 +- clearing-parent/balance-service/pom.xml | 2 +- clearing-parent/classes/pom.xml | 2 +- clearing-parent/cleaning-builders/pom.xml | 6 +++--- clearing-parent/clearing-service/pom.xml | 2 +- .../service/execution/ExecutionCurrencyComponent.java | 10 ++++++++-- clearing-parent/clearing-validation/pom.xml | 8 ++++---- clearing-parent/company-service/pom.xml | 2 +- clearing-parent/db-scripts/pom.xml | 4 ++-- clearing-parent/dbf-exporter/pom.xml | 4 ++-- clearing-parent/dbf-importer/pom.xml | 4 ++-- clearing-parent/dictionary/pom.xml | 4 ++-- clearing-parent/extdb-importer/pom.xml | 4 ++-- clearing-parent/gateway-api/pom.xml | 2 +- clearing-parent/imdg-hist/pom.xml | 10 +++++----- clearing-parent/imdg/pom.xml | 10 +++++----- clearing-parent/lim-exporter/pom.xml | 6 +++--- clearing-parent/pom.xml | 4 ++-- clearing-parent/registry-service/pom.xml | 2 +- clearing-parent/reports-service/pom.xml | 4 ++-- clearing-parent/scheduler-service/pom.xml | 4 ++-- clearing-parent/securities-service/pom.xml | 2 +- clearing-parent/security-util/pom.xml | 8 ++++---- clearing-parent/swt-exporter/pom.xml | 6 +++--- clearing-parent/swt-importer/pom.xml | 2 +- clearing-parent/test-clearing/pom.xml | 4 ++-- clearing-parent/trade-importer/pom.xml | 6 +++--- clearing-parent/utility-service/pom.xml | 2 +- clearing-parent/xml-exporter/pom.xml | 4 ++-- clearing-parent/xml-importer/pom.xml | 4 ++-- platform-parent/pom.xml | 2 +- pom.xml | 4 ++-- z-distr/pom.xml | 2 +- 34 files changed, 75 insertions(+), 69 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 967c021d8..c5e85954c 100644 --- a/clearing-parent/account-service/pom.xml +++ b/clearing-parent/account-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index c1ec1fc92..f8ee34299 100644 --- a/clearing-parent/backend-api/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -11,7 +11,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index d9bbeb003..c13ed2caa 100644 --- a/clearing-parent/balance-service/pom.xml +++ b/clearing-parent/balance-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index c71fdd8bd..d5bc960ea 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index fd0fc993a..eecbe703c 100644 --- a/clearing-parent/cleaning-builders/pom.xml +++ b/clearing-parent/cleaning-builders/pom.xml @@ -6,13 +6,13 @@ ru.spcex.clearing clearing-parent - SPCEX-3.21.276 + SPCEX-3.21.277 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.21.276 + SPCEX-3.21.277 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 392c83b96..a31b9a57a 100644 --- a/clearing-parent/clearing-service/pom.xml +++ b/clearing-parent/clearing-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 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 c493b6ac4..95c48b629 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 @@ -1,6 +1,5 @@ package ru.spcex.clearing.service.execution; -import static java.lang.String.format; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Instant; @@ -11,6 +10,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Optional; +import static java.lang.String.format; import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -266,7 +266,13 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { Company company = validator.getStored(ValidationStored.STradesCompany); Company counterCompany = validator.getStored(ValidationStored.STradesCounterCompany); TradingClearingRegistry rgstr = validator.getStored(ValidationStored.STradesTradingClearingRegistry); - Listing listing = listingImdg.getFirstObjectByFieldValues(Map.of("securityId", security.getId())); + Listing listing = listingImdg.getFirstObjectByFieldValues( + Map.of( + "securityId", security.getId(), + "market", sTrades.getClassCode() + ) + ); + ExecutionCurrency eCurrency = new ExecutionCurrency(); final Instant now = Instant.now(); diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index be2284187..e6d971dbb 100644 --- a/clearing-parent/clearing-validation/pom.xml +++ b/clearing-parent/clearing-validation/pom.xml @@ -8,12 +8,12 @@ clearing-validation Clearing-module, dependency version of platform-utils jar - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile ru.spcex.clearing dictionary - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 5464c6951..2d92e91ef 100644 --- a/clearing-parent/company-service/pom.xml +++ b/clearing-parent/company-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index b4f875ee3..e45842632 100644 --- a/clearing-parent/db-scripts/pom.xml +++ b/clearing-parent/db-scripts/pom.xml @@ -7,12 +7,12 @@ db-scripts db-scripts db-scripts for PostgreSQL - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 826e9c50b..2272a4bf7 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -7,12 +7,12 @@ dbf-exporter dbf-exporter DBF exporter for DBF files - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 08f3ac009..8dcb8918a 100644 --- a/clearing-parent/dbf-importer/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -8,12 +8,12 @@ dbf-importer dbf-importer DBF loader for DBF files - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 6fe5f0e63..91902ded1 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index f33070399..a9321c9ec 100644 --- a/clearing-parent/extdb-importer/pom.xml +++ b/clearing-parent/extdb-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.21.276 + SPCEX-3.21.277 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.21.276 + SPCEX-3.21.277 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index 7387e99b6..d8dfbfd86 100644 --- a/clearing-parent/gateway-api/pom.xml +++ b/clearing-parent/gateway-api/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index eb4bdfe32..11ca1a5f5 100644 --- a/clearing-parent/imdg-hist/pom.xml +++ b/clearing-parent/imdg-hist/pom.xml @@ -5,12 +5,12 @@ 4.0.0 imdg-hist jar - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile ru.spcex.clearing dictionary - SPCEX-3.21.276 + SPCEX-3.21.277 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index ff07b4698..054c5f115 100644 --- a/clearing-parent/imdg/pom.xml +++ b/clearing-parent/imdg/pom.xml @@ -7,12 +7,12 @@ imdg Clearing in memory data grid jar - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile ru.spcex.clearing dictionary - SPCEX-3.21.276 + SPCEX-3.21.277 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 367f1baf7..5fcce6be5 100644 --- a/clearing-parent/lim-exporter/pom.xml +++ b/clearing-parent/lim-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lim-exporter Lim exporter - SPCEX-3.21.276 + SPCEX-3.21.277 jar ru.spcex.clearing clearing-parent - SPCEX-3.21.276 + SPCEX-3.21.277 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 6b0c5d0b4..c95967e87 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.21.276 + SPCEX-3.21.277 clearing ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index f001b19b0..82302ebc7 100644 --- a/clearing-parent/registry-service/pom.xml +++ b/clearing-parent/registry-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 8cdd5a8cc..5913d9163 100644 --- a/clearing-parent/reports-service/pom.xml +++ b/clearing-parent/reports-service/pom.xml @@ -8,12 +8,12 @@ reports-service reports-service Service for creating reports - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 1be23c90e..f1a185001 100644 --- a/clearing-parent/scheduler-service/pom.xml +++ b/clearing-parent/scheduler-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 73e481b12..931eccb16 100644 --- a/clearing-parent/securities-service/pom.xml +++ b/clearing-parent/securities-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index d4fda1fa9..8f4f86fa5 100644 --- a/clearing-parent/security-util/pom.xml +++ b/clearing-parent/security-util/pom.xml @@ -8,12 +8,12 @@ security-util clearing Clearing misc util for verify user roles jar - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile ru.spcex.clearing dictionary - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index ae6a75626..9cb974520 100644 --- a/clearing-parent/swt-exporter/pom.xml +++ b/clearing-parent/swt-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 swt-exporter Swt exporter - SPCEX-3.21.276 + SPCEX-3.21.277 jar ru.spcex.clearing clearing-parent - SPCEX-3.21.276 + SPCEX-3.21.277 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 6df5374da..e92eea738 100644 --- a/clearing-parent/swt-importer/pom.xml +++ b/clearing-parent/swt-importer/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index f5172b6d7..eed0630d9 100644 --- a/clearing-parent/test-clearing/pom.xml +++ b/clearing-parent/test-clearing/pom.xml @@ -4,11 +4,11 @@ ru.spcex.clearing clearing-parent - SPCEX-3.21.276 + SPCEX-3.21.277 test-clearing Test-clearing - SPCEX-3.21.276 + SPCEX-3.21.277 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 092be9a0c..17a2adb58 100644 --- a/clearing-parent/trade-importer/pom.xml +++ b/clearing-parent/trade-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.21.276 + SPCEX-3.21.277 trade-importer trade-importer Trade importer module - SPCEX-3.21.276 + SPCEX-3.21.277 jar @@ -55,7 +55,7 @@ ru.spcex.clearing classes - SPCEX-3.21.276 + SPCEX-3.21.277 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 72942b5a1..cb31ae25d 100644 --- a/clearing-parent/utility-service/pom.xml +++ b/clearing-parent/utility-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 996a65a78..694df2993 100644 --- a/clearing-parent/xml-exporter/pom.xml +++ b/clearing-parent/xml-exporter/pom.xml @@ -7,12 +7,12 @@ xml-exporter xml-exporter XML exporter for XML files - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index e1abf5dfb..90d35b9cb 100644 --- a/clearing-parent/xml-importer/pom.xml +++ b/clearing-parent/xml-importer/pom.xml @@ -8,12 +8,12 @@ xml-importer xml-importer XML loader for XML files - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 470832f5b..f6ccd12a4 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.21.276 + SPCEX-3.21.277 diff --git a/pom.xml b/pom.xml index 3b6497b8f..f34371418 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.21.276 + SPCEX-3.21.277 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.21.276 + SPCEX-3.21.277 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 1c5c54a12..cc9315204 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.21.276 + SPCEX-3.21.277 4.0.0