diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index 2524cad27..f66e5c5c9 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index b30c32e3d..ec1c65334 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.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index 0d5984a20..9765ada8c 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 094e291aa..bf190c9fe 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 61b95d7a2..2a67c5f6d 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.5.10.1 + SPCEX-3.5.10.2 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index ac6e38b79..976da97a4 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index abfb62a8b..9d3d6687c 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile ru.spcex.clearing dictionary - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 3cda1e80d..2493e5c73 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 6db820dc2..ac28c82e1 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index a4145dbec..c084561a2 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 469005d9e..b6275f413 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 117975808..9f13059b8 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index e16028bb2..0c965d5d3 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.5.10.1 + SPCEX-3.5.10.2 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index f5b144f90..f04184e96 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 66bae9079..47ee46661 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile ru.spcex.clearing dictionary - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 52245dc5c..12c416e1c 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile ru.spcex.clearing dictionary - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index bb1d4d71b..cc6d215f0 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.5.10.1 + SPCEX-3.5.10.2 jar ru.spcex.clearing clearing-parent - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 35ac883d2..2e1e5a347 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 clearing ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index 704b89f6c..b2f7e9692 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 29cc0c3c8..4109f4807 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 612101d9f..445d50e57 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 450576c14..a20541f0a 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index bcdb2d9f8..4818ee8c5 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.5.10.1 + SPCEX-3.5.10.2 clearing-parent ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile ru.spcex.clearing dictionary - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index e42968f9d..105f1af57 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.5.10.1 + SPCEX-3.5.10.2 jar ru.spcex.clearing clearing-parent - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF09Exporter.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF09Exporter.java index 3030212c0..51efdf060 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF09Exporter.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF09Exporter.java @@ -1,6 +1,7 @@ package ru.spcex.clearing.swt.exporter.services.exportimpl; import com.hazelcast.aws.utility.StringUtil; +import net.logstash.logback.util.StringUtils; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.sdf.SDf09; import ru.spcex.clearing.imdg.IMDGDistributedNames; @@ -84,7 +85,12 @@ public class DF09Exporter extends AbstractExporterService { stringBuilder.append(record.getQuantity()).append(':'); stringBuilder.append(record.getSecurityCode()).append(':'); stringBuilder.append(record.getClientName()).append(':'); - stringBuilder.append(record.getResult()).append(SWTHeaderData.LINE_SEPARATOR); + if (StringUtils.isEmpty(record.getResult())) { + stringBuilder.append("001"); + } else { + stringBuilder.append(record.getResult()); + } + stringBuilder.append(SWTHeaderData.LINE_SEPARATOR); return stringBuilder.toString(); } diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 40caf6f93..102f16016 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 857bca592..598adc760 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.5.10.1 + SPCEX-3.5.10.2 test-clearing Test-clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index a44455f5c..38efb62d3 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.5.10.1 + SPCEX-3.5.10.2 trade-importer trade-importer Trade importer module - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index ff1b7026c..a586c517d 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.5.10.1 + SPCEX-3.5.10.2 4.0.0 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 0c0ae1887..b6a94f137 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 diff --git a/pom.xml b/pom.xml index 0e204e629..3fce979cf 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 9091e7e36..d3ea4087a 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.5.10.1 + SPCEX-3.5.10.2 4.0.0