From 96611c980319250c4bd9db04fe0e3598a2a53c32 Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 25 Mar 2026 14:12:17 +0300 Subject: [PATCH 1/8] 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 +- .../execution/ExecutionCurrencyComponent.java | 17 ++++++++++++++--- 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/fix-service/pom.xml | 2 +- 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 +- 35 files changed, 82 insertions(+), 71 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index df152d125..23d1ddae7 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 01369a12c..2ec0fdafc 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.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index 969bc8e63..a1c29a39c 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 9cc81f726..4250ab79b 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 04928c373..f22ff84e8 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.22.285 + SPCEX-3.22.286 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.22.285 + SPCEX-3.22.286 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index dc9ea788a..c537aab00 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.22.285 + SPCEX-3.22.286 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..0cbb9a371 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; @@ -42,6 +42,7 @@ import ru.spcex.clearing.service.validation.ValidationStored; import ru.spcex.clearing.service.validation.strades.CompanyByTradingCodeCashingValidationRule; import ru.spcex.clearing.service.validation.strades.STradesSecurityPresentValidationRule; import ru.spcex.clearing.service.validation.strades.TcrByCodeAndCmpIsActiveCashingValidationRule; +import ru.spcex.clearing.validation.common.rules.FieldNotBlankRequiredRule; import ru.spcex.platform.enumeration.ObjectType; import ru.spcex.platform.enumeration.Priority; import ru.spcex.platform.enumeration.Section; @@ -266,7 +267,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(); @@ -424,7 +431,11 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent { new CompanyByTradingCodeCashingValidationRule<>( STrades::getCpFirmId, valCash.cmpCash, ValidationStored.STradesCounterCompany ), - new TcrByCodeAndCmpIsActiveCashingValidationRule(valCash.tcrCash) + new TcrByCodeAndCmpIsActiveCashingValidationRule(valCash.tcrCash), + FieldNotBlankRequiredRule.instance( + "classCode", + STrades::getClassCode, + ClearingError.RequiredFieldEmpty, true) ); } diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 48a22c561..bf3cf8740 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile ru.spcex.clearing dictionary - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 29e57f9ba..105f7c276 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 6144d2bc3..a23255345 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index c59fa9323..7696fc59a 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index a4852f292..398dd38d1 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index f24ed0a5e..2bd25acc4 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 686d47a5f..acf8c13b4 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.22.285 + SPCEX-3.22.286 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.22.285 + SPCEX-3.22.286 jar diff --git a/clearing-parent/fix-service/pom.xml b/clearing-parent/fix-service/pom.xml index a990906fe..9bfbeadd7 100644 --- a/clearing-parent/fix-service/pom.xml +++ b/clearing-parent/fix-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index e423b404d..df56d888d 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 567588b9c..759e17112 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile ru.spcex.clearing dictionary - SPCEX-3.22.285 + SPCEX-3.22.286 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index f7a241fbf..2d1f642b9 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile ru.spcex.clearing dictionary - SPCEX-3.22.285 + SPCEX-3.22.286 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 131b44b9d..0e3ddaf2f 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.22.285 + SPCEX-3.22.286 jar ru.spcex.clearing clearing-parent - SPCEX-3.22.285 + SPCEX-3.22.286 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index dec5eb5c1..da3a09901 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.22.285 + SPCEX-3.22.286 clearing ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index c942c31a4..712d8ae2f 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 81e21b95f..8b00ee5c3 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 79697af09..057ef29cb 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.22.285 + SPCEX-3.22.286 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index b3803aab6..fba89482a 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 20d035128..ee6788f91 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile ru.spcex.clearing dictionary - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index edf4cbebf..93f81c3a2 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.22.285 + SPCEX-3.22.286 jar ru.spcex.clearing clearing-parent - SPCEX-3.22.285 + SPCEX-3.22.286 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index e77579ccf..ed62fbd25 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 6e519acfd..1c753803d 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.22.285 + SPCEX-3.22.286 test-clearing Test-clearing - SPCEX-3.22.285 + SPCEX-3.22.286 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 524e37523..ac842f152 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.22.285 + SPCEX-3.22.286 trade-importer trade-importer Trade importer module - SPCEX-3.22.285 + SPCEX-3.22.286 jar @@ -55,7 +55,7 @@ ru.spcex.clearing classes - SPCEX-3.22.285 + SPCEX-3.22.286 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index fd64021de..fe89461ca 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.22.285 + SPCEX-3.22.286 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 4a8f811a3..d0a21e8e4 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index fc116daac..61e462517 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.22.285 + SPCEX-3.22.286 clearing-parent ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 3985023a6..e74d61c59 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.22.285 + SPCEX-3.22.286 diff --git a/pom.xml b/pom.xml index 9a8a4fe97..fd90ca824 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.22.285 + SPCEX-3.22.286 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.22.285 + SPCEX-3.22.286 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index cb41e6326..da360997d 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.22.285 + SPCEX-3.22.286 4.0.0 From 380ea1077e8232b6c143cd778b8d4faba56b5204 Mon Sep 17 00:00:00 2001 From: Aleksey Kulikov Date: Fri, 27 Mar 2026 14:03:52 +0300 Subject: [PATCH 2/8] http://jira.mfd.msk:8088/browse/CLS-946 --- .../ks/KSRepCashRegistersReportBuilder.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java index 412c38c2a..264f3aaa2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java @@ -20,6 +20,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.builders.CSVReportBuilder; import ru.spcex.clearing.reports.builders.EmptyParams; import ru.spcex.clearing.reports.builders.bean.KSRepCashRegistersReport; +import ru.spcex.platform.enumeration.AccountStatus; import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.ClearingCategory; import ru.spcex.platform.enumeration.RegistryStatus; @@ -110,6 +111,22 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder Date: Mon, 30 Mar 2026 14:47:01 +0300 Subject: [PATCH 3/8] http://jira.mfd.msk:8088/browse/CLS-945 --- .../services/AbstractExporterService.java | 23 +++++++++++++++++++ .../services/MoneyExporterService.java | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index 59fb09121..c51f70b7b 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -12,6 +12,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.StringUtils; +import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; import ru.clearing.classes.statics.data.security.Security; @@ -24,6 +25,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationNew import ru.spcex.clearing.platform.messaging.serialization.LogFormatter; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.platform.enumeration.AccountStatus; import ru.spcex.platform.enumeration.ObjectType; import ru.spcex.platform.enumeration.Priority; import ru.spcex.platform.enumeration.Section; @@ -39,7 +41,9 @@ public abstract class AbstractExporterService { private final Logger log = LoggerFactory.getLogger(getClass()); protected final Imdg registryImdg; private final List validStatus = List.of(ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey()); + private final List validAccountStatus = List.of(AccountStatus.ACTIVE.getKey(), AccountStatus.CLOSE.getKey()); private final Imdg tradingClearingRegistryImdg; + private final Imdg accountImdg; private final SecuritySelector securitySelector; private final DateTimeFormatter dtFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); private final SFTPConfig.LimGateway gateway; @@ -51,6 +55,7 @@ public abstract class AbstractExporterService { this.kafkaSender = kafkaSender; this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class); this.tradingClearingRegistryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class); + this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class); this.securitySelector = new SecuritySelector<>(imdgProvider, Security.class); } @@ -144,6 +149,24 @@ public abstract class AbstractExporterService { safeBD(registry.getBalance()).compareTo(BigDecimal.ZERO) != 0; } + protected boolean checkNotBlockedMoneyRegistry(Registry registry) { + if (registry.getTradingClearingRegistryId() == null) return false; + TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(registry.getTradingClearingRegistryId()); + if (tradingClearingRegistry == null) { + log.warn("For registry.id={} not exist tradingClearingRegistry.id={}", registry.getId(), registry.getTradingClearingRegistryId()); + return false; + } + if (validStatus.contains(tradingClearingRegistry.getStatus())) { + return false; + } + if (registry.getBalance().equals(BigDecimal.ZERO)) { + return false; + } + + Account account = accountImdg.getSingleObjectByID(tradingClearingRegistry.getMoneyAccountId()); + return !validAccountStatus.contains(account.getAccount()); + } + protected BigDecimal sumNegativeABS(Collection registries) { if (registries == null || registries.isEmpty()) return BigDecimal.ZERO; BigDecimal result = BigDecimal.ZERO; diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java index 54dea16af..22b5b7a46 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java @@ -80,7 +80,7 @@ public class MoneyExporterService extends AbstractExporterService { stlmntDtPrdct ); for (Registry registry : registriesA) { - if (checkNotBlocked(registry)) { + if (checkNotBlockedMoneyRegistry(registry)) { BigDecimal dmtSumElement = BigDecimal.ZERO; BigDecimal omtSumElementToday = BigDecimal.ZERO; BigDecimal tmtSumElementToday = BigDecimal.ZERO; From 6c5623797edbe021eafd5dd18ee0d3969f3db885 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Mon, 30 Mar 2026 17:00:28 +0300 Subject: [PATCH 4/8] http://jira.mfd.msk:8088/browse/CLS-945 --- .../lim/exporter/services/AbstractExporterService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index c51f70b7b..c72508111 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -41,7 +41,7 @@ public abstract class AbstractExporterService { private final Logger log = LoggerFactory.getLogger(getClass()); protected final Imdg registryImdg; private final List validStatus = List.of(ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey()); - private final List validAccountStatus = List.of(AccountStatus.ACTIVE.getKey(), AccountStatus.CLOSE.getKey()); + private final List invalidAccountStatus = List.of(AccountStatus.BLOCKED.getKey(), AccountStatus.CLOSE.getKey()); private final Imdg tradingClearingRegistryImdg; private final Imdg accountImdg; private final SecuritySelector securitySelector; @@ -156,15 +156,15 @@ public abstract class AbstractExporterService { log.warn("For registry.id={} not exist tradingClearingRegistry.id={}", registry.getId(), registry.getTradingClearingRegistryId()); return false; } - if (validStatus.contains(tradingClearingRegistry.getStatus())) { + if (!validStatus.contains(tradingClearingRegistry.getStatus())) { return false; } if (registry.getBalance().equals(BigDecimal.ZERO)) { return false; } - Account account = accountImdg.getSingleObjectByID(tradingClearingRegistry.getMoneyAccountId()); - return !validAccountStatus.contains(account.getAccount()); + Account account = accountImdg.getSingleObjectByID(registry.getAccountId()); + return !invalidAccountStatus.contains(account.getAccount()); } protected BigDecimal sumNegativeABS(Collection registries) { From cafcfb4a487a55e77a7d1f2e92789e117cb9b90b Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Mon, 30 Mar 2026 17:01:01 +0300 Subject: [PATCH 5/8] 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/fix-service/pom.xml | 2 +- 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, 68 insertions(+), 68 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 23d1ddae7..fb2949a1e 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 2ec0fdafc..fcf4947ac 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.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index a1c29a39c..bba036b97 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 4250ab79b..c021e6828 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index f22ff84e8..371b37df3 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.22.286 + SPCEX-3.22.287 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.22.286 + SPCEX-3.22.287 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index c537aab00..bbb027b80 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index bf3cf8740..c8f94e903 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile ru.spcex.clearing dictionary - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 105f7c276..cedf78fe7 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index a23255345..f3d193397 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 7696fc59a..45d32867b 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 398dd38d1..93548f797 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 2bd25acc4..25a00dfdd 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index acf8c13b4..9ff8f21c0 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.22.286 + SPCEX-3.22.287 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.22.286 + SPCEX-3.22.287 jar diff --git a/clearing-parent/fix-service/pom.xml b/clearing-parent/fix-service/pom.xml index 9bfbeadd7..e4b313285 100644 --- a/clearing-parent/fix-service/pom.xml +++ b/clearing-parent/fix-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index df56d888d..88c0faabd 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 759e17112..0d88ca430 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile ru.spcex.clearing dictionary - SPCEX-3.22.286 + SPCEX-3.22.287 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 2d1f642b9..e07c601df 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile ru.spcex.clearing dictionary - SPCEX-3.22.286 + SPCEX-3.22.287 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 0e3ddaf2f..7cd1d7660 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.22.286 + SPCEX-3.22.287 jar ru.spcex.clearing clearing-parent - SPCEX-3.22.286 + SPCEX-3.22.287 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index da3a09901..123a8241b 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.22.286 + SPCEX-3.22.287 clearing ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index 712d8ae2f..8c9d41059 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 8b00ee5c3..31df1d929 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 057ef29cb..3217c926e 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.22.286 + SPCEX-3.22.287 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index fba89482a..5345d45c1 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index ee6788f91..7c3cd0588 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile ru.spcex.clearing dictionary - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 93f81c3a2..f87677dce 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.22.286 + SPCEX-3.22.287 jar ru.spcex.clearing clearing-parent - SPCEX-3.22.286 + SPCEX-3.22.287 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index ed62fbd25..6e5652ec7 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 1c753803d..f8b6c57d8 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.22.286 + SPCEX-3.22.287 test-clearing Test-clearing - SPCEX-3.22.286 + SPCEX-3.22.287 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index ac842f152..9c8a11224 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.22.286 + SPCEX-3.22.287 trade-importer trade-importer Trade importer module - SPCEX-3.22.286 + SPCEX-3.22.287 jar @@ -55,7 +55,7 @@ ru.spcex.clearing classes - SPCEX-3.22.286 + SPCEX-3.22.287 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index fe89461ca..f8fa7dcae 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.22.286 + SPCEX-3.22.287 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index d0a21e8e4..06dc83a7f 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index 61e462517..1f6ddc8c0 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.22.286 + SPCEX-3.22.287 clearing-parent ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index e74d61c59..006f090fa 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.22.286 + SPCEX-3.22.287 diff --git a/pom.xml b/pom.xml index fd90ca824..43a6aeeed 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.22.286 + SPCEX-3.22.287 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.22.286 + SPCEX-3.22.287 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index da360997d..0b3bd1f41 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.22.286 + SPCEX-3.22.287 4.0.0 From d5112bccc32947acd7119df599139b8c99533984 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Mon, 30 Mar 2026 17:04:48 +0300 Subject: [PATCH 6/8] http://jira.mfd.msk:8088/browse/CLS-945 --- .../lim/exporter/services/AbstractExporterService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index c72508111..a06b78ad0 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -159,12 +159,12 @@ public abstract class AbstractExporterService { if (!validStatus.contains(tradingClearingRegistry.getStatus())) { return false; } - if (registry.getBalance().equals(BigDecimal.ZERO)) { + Account account = accountImdg.getSingleObjectByID(registry.getAccountId()); + if (registry.getBalance().equals(BigDecimal.ZERO) && invalidAccountStatus.contains(account.getAccount())) { return false; } - Account account = accountImdg.getSingleObjectByID(registry.getAccountId()); - return !invalidAccountStatus.contains(account.getAccount()); + return true; } protected BigDecimal sumNegativeABS(Collection registries) { From 21dcef8fb18a6b20ba4a66e55936d0bd6e1f3e5f Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 31 Mar 2026 11:05:40 +0300 Subject: [PATCH 7/8] http://jira.mfd.msk:8088/browse/CLS-945 --- .../clearing/lim/exporter/services/AbstractExporterService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index a06b78ad0..6c63b0f93 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -160,7 +160,7 @@ public abstract class AbstractExporterService { return false; } Account account = accountImdg.getSingleObjectByID(registry.getAccountId()); - if (registry.getBalance().equals(BigDecimal.ZERO) && invalidAccountStatus.contains(account.getAccount())) { + if (registry.getBalance().compareTo(BigDecimal.ZERO) == 0 && invalidAccountStatus.contains(account.getAccount())) { return false; } From 5c5c09754428fa572c097a1bfcc02e8e527edcc0 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 31 Mar 2026 12:06:28 +0300 Subject: [PATCH 8/8] http://jira.mfd.msk:8088/browse/CLS-945 --- .../clearing/lim/exporter/services/AbstractExporterService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index 6c63b0f93..8d53a7926 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -160,7 +160,7 @@ public abstract class AbstractExporterService { return false; } Account account = accountImdg.getSingleObjectByID(registry.getAccountId()); - if (registry.getBalance().compareTo(BigDecimal.ZERO) == 0 && invalidAccountStatus.contains(account.getAccount())) { + if (registry.getBalance().compareTo(BigDecimal.ZERO) == 0 && invalidAccountStatus.contains(account.getStatus())) { return false; }