From 7e8da9bf949b6d18af6e48035ea6c3d1ceb9738f Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 29 Jul 2025 10:34:43 +0300 Subject: [PATCH 1/2] up pom version SPCEX-3.19.251 --- 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 +++--- .../importer/services/TradeImporterServiceTest.java | 8 ++++++++ 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(+), 67 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 58512b6cb..426146b4a 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index d9fefd28b..9f3a99644 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.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index c9cd2eae0..9901d2918 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 5d0646845..d86ec64fa 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 55b12ffb0..c3340df5a 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.19.251 + SPCEX-3.19.252 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.19.251 + SPCEX-3.19.252 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index b3f852c71..84d25e277 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 09a191c1e..274ef68f4 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile ru.spcex.clearing dictionary - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index a15b37c9d..2124e762f 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 00d4f0f2f..bf2a0cc3d 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 01a3dd29a..1cce98a36 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 59645fcbe..b85077ad3 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index e53af58aa..635bd0547 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 0c49ab798..cfc1f3a24 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.19.251 + SPCEX-3.19.252 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.19.251 + SPCEX-3.19.252 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index b9e90c524..ba0b484e3 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index a8b60641c..9a448ea36 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile ru.spcex.clearing dictionary - SPCEX-3.19.251 + SPCEX-3.19.252 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index bcd7818fb..0caeb9195 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile ru.spcex.clearing dictionary - SPCEX-3.19.251 + SPCEX-3.19.252 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 90e5cc1ea..2c8feb60e 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.19.251 + SPCEX-3.19.252 jar ru.spcex.clearing clearing-parent - SPCEX-3.19.251 + SPCEX-3.19.252 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 82d7edb30..1d4884ddb 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.19.251 + SPCEX-3.19.252 clearing ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index 52270fcd2..dfcfb54f8 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 72fb028eb..9221c1145 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 928b99bb2..b004036e2 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.19.251 + SPCEX-3.19.252 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 6fd9e2916..77b4c93d7 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 3693c4342..db05dd944 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile ru.spcex.clearing dictionary - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index d99029f4c..d53dd94a4 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.19.251 + SPCEX-3.19.252 jar ru.spcex.clearing clearing-parent - SPCEX-3.19.251 + SPCEX-3.19.252 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 97fbb8ee5..34f10c9e8 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index ac3bba6e8..b508d1327 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.19.251 + SPCEX-3.19.252 test-clearing Test-clearing - SPCEX-3.19.251 + SPCEX-3.19.252 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 4a345507f..cde0f7ba6 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.19.251 + SPCEX-3.19.252 trade-importer trade-importer Trade importer module - SPCEX-3.19.251 + SPCEX-3.19.252 jar @@ -55,7 +55,7 @@ ru.spcex.clearing classes - SPCEX-3.19.251 + SPCEX-3.19.252 compile diff --git a/clearing-parent/trade-importer/src/test/java/ru/spcex/clearing/trade/importer/services/TradeImporterServiceTest.java b/clearing-parent/trade-importer/src/test/java/ru/spcex/clearing/trade/importer/services/TradeImporterServiceTest.java index 12f55e0c9..ddf3510a5 100644 --- a/clearing-parent/trade-importer/src/test/java/ru/spcex/clearing/trade/importer/services/TradeImporterServiceTest.java +++ b/clearing-parent/trade-importer/src/test/java/ru/spcex/clearing/trade/importer/services/TradeImporterServiceTest.java @@ -17,6 +17,7 @@ import javax.annotation.PostConstruct; import java.nio.file.Path; import java.nio.file.Paths; import java.time.LocalDate; +import java.time.LocalDateTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -100,4 +101,11 @@ class TradeImporterServiceTest extends AbstractServiceTest { trades.setClassCode("UESC"); return trades; } + + @Test + void dtT() { + LocalDate d=LocalDate.of(2025,7,1); + LocalDateTime dt=LocalDateTime.of(2025,7,1, 22,50,48); + assertEquals(d, dt.toLocalDate()); + } } \ No newline at end of file diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 9de4e92dd..c8190461c 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.19.251 + SPCEX-3.19.252 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 575ba5ee6..f400d600e 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index 1fecc50f9..bc984b4d3 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.19.251 + SPCEX-3.19.252 clearing-parent ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index a0d410391..f5eceb45b 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.19.251 + SPCEX-3.19.252 diff --git a/pom.xml b/pom.xml index fa07af1b4..faa7af8f5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.19.251 + SPCEX-3.19.252 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.19.251 + SPCEX-3.19.252 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 38ee829ad..671f71dcd 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.19.251 + SPCEX-3.19.252 4.0.0 From baa36246cbfea6187ebff08f3d22636f86482724 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 29 Jul 2025 12:02:03 +0300 Subject: [PATCH 2/2] create DM_X with PROC status --- .../src/main/java/ru/spcex/clearing/service/RegistryService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java index edd36483b..2a5f12286 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java @@ -329,6 +329,7 @@ public class RegistryService { } dm__.setRegistryCode(RegistryUtil.clearingCode(dm__)); dm__.setBalance(safeBD(dm__.getBalance()).add(requestPayload.getBalance())); + dm__.setRegistryStatus(RegistryStatus.PROC.getKey()); dm__.setSessionId(null); dm__.setSessionType(null); registryImdg.insert(dm__);