From 4a38552b3f791fedd3ce977e6bdab98524866466 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Mon, 9 Dec 2024 11:43:43 +0300 Subject: [PATCH 1/5] up pom version --- 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 +- 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 +- 33 files changed, 67 insertions(+), 67 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 2e0386039..66f1301bf 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 83b38bc40..69eade619 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.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index c7d96c01c..259f81df8 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 474ede36c..98fc7e40d 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index d39dbbc2e..9e09a4676 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.16.210 + SPCEX-3.16.211 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.16.210 + SPCEX-3.16.211 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 2b6ad8f6d..74f6d81e7 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 76559a017..ac09aea9d 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile ru.spcex.clearing dictionary - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index d2d91d866..11e5661e1 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index d20481bc8..82e61c17b 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index e33cdcb12..a2a0bc9c3 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 0f7e5bc6a..eb1ab4e0a 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 7fa290d1e..7f758df02 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 7015585c6..409cb3f69 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.16.210 + SPCEX-3.16.211 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.16.210 + SPCEX-3.16.211 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index cca150b95..2a9959192 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 4f2c50656..b01974c29 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile ru.spcex.clearing dictionary - SPCEX-3.16.210 + SPCEX-3.16.211 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index c13bd4791..9e43fc1b0 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile ru.spcex.clearing dictionary - SPCEX-3.16.210 + SPCEX-3.16.211 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index c7d8ee32a..0dca71f55 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.16.210 + SPCEX-3.16.211 jar ru.spcex.clearing clearing-parent - SPCEX-3.16.210 + SPCEX-3.16.211 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index fd6dc3477..39eebefa2 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.16.210 + SPCEX-3.16.211 clearing ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index c21b4d52e..22587dc0f 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index e30b241cc..4586eff56 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index f636d5ac6..99c3b931b 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.16.210 + SPCEX-3.16.211 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 2772763c8..ee9bb5e61 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 698a91141..9ac713776 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile ru.spcex.clearing dictionary - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index c316e4c84..42ae5120a 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.16.210 + SPCEX-3.16.211 jar ru.spcex.clearing clearing-parent - SPCEX-3.16.210 + SPCEX-3.16.211 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index abd77c92c..48caebe49 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 5a899c92c..4d8035b59 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.16.210 + SPCEX-3.16.211 test-clearing Test-clearing - SPCEX-3.16.210 + SPCEX-3.16.211 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 006fec42b..e619f33fb 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.16.210 + SPCEX-3.16.211 trade-importer trade-importer Trade importer module - SPCEX-3.16.210 + SPCEX-3.16.211 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.16.210 + SPCEX-3.16.211 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 7ebca8dc9..34b539483 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.16.210 + SPCEX-3.16.211 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 7c469edf4..cd4d5516d 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index b7ab1f80e..7a456f489 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.16.210 + SPCEX-3.16.211 clearing-parent ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 4cdeef4ac..59574b340 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.16.210 + SPCEX-3.16.211 diff --git a/pom.xml b/pom.xml index 841bee6c3..a78bbb148 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.16.210 + SPCEX-3.16.211 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.16.210 + SPCEX-3.16.211 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index a66f28e43..8fd89bdeb 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.16.210 + SPCEX-3.16.211 4.0.0 From 88a45e7361b12c7ecb2fdf697de7f0e809cf5379 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 9 Dec 2024 16:07:07 +0300 Subject: [PATCH 2/5] http://jira.mfd.msk:8088/browse/CLS-795 --- .../reports/builders/ks/KSRepLccValueReportBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java index ce3254318..d1ee7f3eb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java @@ -185,7 +185,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder= 0 && delta.compareTo(quantity) <= 0) { freeQuantity = delta; - } else if (delta.compareTo(BigDecimal.ZERO) < 0 && delta.compareTo(quantity) > 0) { + } else if (delta.compareTo(BigDecimal.ZERO) < 0 || delta.compareTo(quantity) > 0) { freeQuantity = quantity; } else freeQuantity = BigDecimal.ZERO; } From 95fd3012ec91ddfae7fcf9560a01bf441d259653 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 9 Dec 2024 17:32:10 +0300 Subject: [PATCH 3/5] http://jira.mfd.msk:8088/browse/CLS-795 --- .../reports/builders/ks/KSRepLccValueReportBuilder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java index d1ee7f3eb..dd3916b39 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java @@ -246,6 +246,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder= 0 && delta.compareTo(quantity) <= 0) { + freeQuantityIsDelta = true; freeQuantity = delta; } else if (delta.compareTo(BigDecimal.ZERO) < 0 || delta.compareTo(quantity) > 0) { freeQuantity = quantity; @@ -279,7 +281,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder Date: Mon, 9 Dec 2024 18:26:52 +0300 Subject: [PATCH 4/5] http://jira.mfd.msk:8088/browse/CLS-795 add some logs --- .../ks/KSRepLccValueReportBuilder.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java index dd3916b39..66bab95f7 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java @@ -117,6 +117,46 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder registriesForTKR = entryTKR.getValue(); + log.debug( + "tkr = {}: Found registries: {}, id = [{}]", + tkr, + registriesForTKR.size(), + registriesForTKR.stream().map(r -> String.valueOf(r.getId())).collect(Collectors.joining(",")) + ); + List amfRegistries = registriesForTKR.stream().filter( + r -> r.getRegistryDesignation().equalsIgnoreCase(RegistryDesignation.A.getKey()) && + r.getRegistryInstrumentType().equalsIgnoreCase(RegistryInstrumentType.M.getKey()) && + r.getRegistryUnit().equalsIgnoreCase(RegistryUnit.F.getKey()) + ).toList(); + log.debug( + "tkr = {}: AM_F registries {} id = [{}]", + tkr, + amfRegistries.size(), + amfRegistries.stream().map(r -> String.valueOf(r.getId())).collect(Collectors.joining(",")) + ); + List omtRegistries = registriesForTKR.stream().filter( + r -> r.getRegistryDesignation().equalsIgnoreCase(RegistryDesignation.O.getKey()) && + r.getRegistryInstrumentType().equalsIgnoreCase(RegistryInstrumentType.M.getKey()) && + r.getRegistryUnit().equalsIgnoreCase(RegistryUnit.T.getKey()) + ).toList(); + log.debug( + "tkr = {}: OM_T registries {} id = [{}]", + tkr, + omtRegistries.size(), + omtRegistries.stream().map(r -> String.valueOf(r.getId())).collect(Collectors.joining(",")) + ); + List tmtRegistries = registriesForTKR.stream().filter( + r -> r.getRegistryDesignation().equalsIgnoreCase(RegistryDesignation.T.getKey()) && + r.getRegistryInstrumentType().equalsIgnoreCase(RegistryInstrumentType.M.getKey()) && + r.getRegistryUnit().equalsIgnoreCase(RegistryUnit.T.getKey()) + ).toList(); + log.debug( + "tkr = {}: TM_T registries {} id = [{}]", + tkr, + tmtRegistries.size(), + tmtRegistries.stream().map(r -> String.valueOf(r.getId())).collect(Collectors.joining(",")) + ); + String firmId = registriesForTKR.iterator().next().getTradingCode(); BigDecimal sumValue = BigDecimal.ZERO; @@ -127,6 +167,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder currencies = new HashMap<>(); Map rates = new HashMap<>(); for (Registry registry : registriesForTKR) { + String securitySymbol = registry.getSecuritySymbol(); RegistryStatus status = IEnumKey.getEnumByKey(RegistryStatus.class, registry.getRegistryStatus()); Rates currencyRate = getRate(securitySymbol, currencyRates); From 10a35391303a5ccb9ec910ab208a68d743f55c4e Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 9 Dec 2024 18:59:26 +0300 Subject: [PATCH 5/5] http://jira.mfd.msk:8088/browse/CLS-795 --- .../reports/builders/ks/KSRepLccValueReportBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java index 66bab95f7..716f2734e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java @@ -308,7 +308,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder= 0 && delta.compareTo(quantity) <= 0) { freeQuantityIsDelta = true; freeQuantity = delta;