diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml
index 503158a8f..d8cd827fa 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml
index 763665abb..ad58e4c52 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.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json
index c0a124280..3117187cc 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.json
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json
@@ -1,6 +1,6 @@
{
- "version": "3.18.244.134",
+ "version": "3.19.244.135",
"enums": {
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
index 7dc34e616..80bfc3e29 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml
index 962bfee54..7a0172be7 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml
index 19456cc47..877b189f8 100644
--- a/clearing-parent/classes/pom.xml
+++ b/clearing-parent/classes/pom.xml
@@ -12,7 +12,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml
index 48759e5be..df15df593 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.18.244
+ SPCEX-3.19.244
cleaning-builders
cleaning-builders
Cleaning builders module
- SPCEX-3.18.244
+ SPCEX-3.19.244
jar
@@ -26,7 +26,7 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml
index 2a19fe24a..ea9c76732 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java
index 02cc6ff1d..f333776cf 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java
@@ -19,8 +19,7 @@ import ru.spcex.clearing.session.stage.StageResult;
import ru.spcex.clearing.session.stage.Task;
import ru.spcex.clearing.session.stage.TaskType;
import ru.spcex.clearing.session.stage.task.RequirementsAndObligationCreationCompoundPayload;
-import static ru.spcex.clearing.util.ComparatorUtil.execIdComparator;
-import static ru.spcex.clearing.util.ComparatorUtil.tradeTimeComparator;
+import static ru.spcex.clearing.util.ComparatorUtil.*;
import ru.spcex.platform.classes.base.interfaces.ExecutionType;
import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.collection.Pair;
@@ -65,7 +64,7 @@ public class RequirementsAndObligationCreationCompound extends RequirementsAndOb
List executionCurrency = data.getExecutionsCurrency();
List executionDeposit = data.getExecutionsFinal();
Map newRgss = storageMap(executionFond, executionCurrency, executionDeposit);
- Stream.of(executionFond, executionCurrency, executionDeposit).forEach(c -> c.sort(tradeTimeComparator.thenComparing(execIdComparator)));
+ Stream.of(executionFond, executionCurrency, executionDeposit).forEach(c -> c.sort(tradeTimeComparator.thenComparing(execIdComparator).thenComparing(execMarketComparator)));
int efs = executionFond.size();
int eds = executionDeposit.size();
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java
index a681d542f..9655e5bc9 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java
@@ -10,4 +10,7 @@ public class ComparatorUtil {
public static final Comparator execIdComparator
= Comparator.comparing(ExecutionCommon::getExchangeExecutionId);
+ public static final Comparator execMarketComparator
+ = Comparator.comparing(ExecutionCommon::getMarket);
+
}
diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml
index 187987eb4..4592970f2 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
@@ -35,13 +35,13 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
ru.spcex.clearing
dictionary
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml
index 9e416d818..59c55caba 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml
index 67eead1ca..b802b33d7 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml
index e334169cb..43403e270 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml
index 0f3c8a1ca..63b73664e 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml
index e8d78fbed..3815b8425 100644
--- a/clearing-parent/dictionary/pom.xml
+++ b/clearing-parent/dictionary/pom.xml
@@ -8,12 +8,12 @@
Clearing dictionary
Clearing dictionary
jar
- SPCEX-3.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml
index 38229ee6e..d6553c937 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.18.244
+ SPCEX-3.19.244
extdb-importer
extdb-importer
Extdb importer module. Аналог trade-importer.
- SPCEX-3.18.244
+ SPCEX-3.19.244
jar
diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml
index a51138a19..4eb189013 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml
index df113b3ea..d6f0a20a1 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
@@ -36,13 +36,13 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
ru.spcex.clearing
dictionary
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
@@ -82,7 +82,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml
index 779b54413..c3b7c38dd 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
@@ -32,13 +32,13 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
ru.spcex.clearing
dictionary
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
@@ -89,7 +89,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml
index fd7cb0cbb..c7a41c903 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.18.244
+ SPCEX-3.19.244
jar
ru.spcex.clearing
clearing-parent
- SPCEX-3.18.244
+ SPCEX-3.19.244
@@ -35,7 +35,7 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml
index 265026084..64c111cec 100644
--- a/clearing-parent/pom.xml
+++ b/clearing-parent/pom.xml
@@ -7,12 +7,12 @@
_parent_clearing
Clearing parent module
pom
- SPCEX-3.18.244
+ SPCEX-3.19.244
clearing
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml
index 90641f23c..f9c603d3f 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml
index d70cc66a0..285246221 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml
index 65f440fb6..cd208c420 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.18.244
+ SPCEX-3.19.244
4.0.0
@@ -51,7 +51,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml
index 580347f7d..7fe5c4ad7 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml
index 656f7cc63..e6829d48c 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
@@ -35,13 +35,13 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
ru.spcex.clearing
dictionary
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml
index 34cb6d7f3..e2c5e78f1 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.18.244
+ SPCEX-3.19.244
jar
ru.spcex.clearing
clearing-parent
- SPCEX-3.18.244
+ SPCEX-3.19.244
@@ -35,7 +35,7 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml
index d94ed8f5a..ed281fae6 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml
index 649183bb4..f7a96a99a 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.18.244
+ SPCEX-3.19.244
test-clearing
Test-clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
ru.spcex.platform
diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml
index 722c0a9e9..a162124eb 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.18.244
+ SPCEX-3.19.244
trade-importer
trade-importer
Trade importer module
- SPCEX-3.18.244
+ SPCEX-3.19.244
jar
@@ -55,7 +55,7 @@
ru.spcex.clearing
classes
- SPCEX-3.18.244
+ SPCEX-3.19.244
compile
diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml
index 49b58abcd..5a1ab2483 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.18.244
+ SPCEX-3.19.244
4.0.0
diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml
index ae3cbe6ce..dd8fc30ec 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml
index 588a9b020..f8f80e0ac 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.18.244
+ SPCEX-3.19.244
clearing-parent
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml
index dba723d42..2cc40a6d8 100644
--- a/platform-parent/pom.xml
+++ b/platform-parent/pom.xml
@@ -14,7 +14,7 @@
ru.spcex.clearing
clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
diff --git a/pom.xml b/pom.xml
index c80223a22..dc51c9329 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
__parent_ROOT
Clearing main parent
pom
- SPCEX-3.18.244
+ SPCEX-3.19.244
clearing-parent
@@ -24,7 +24,7 @@
17
Maven
- SPCEX-3.18.244
+ SPCEX-3.19.244
2.6.3
diff --git a/z-distr/pom.xml b/z-distr/pom.xml
index f7de15b47..b16706632 100644
--- a/z-distr/pom.xml
+++ b/z-distr/pom.xml
@@ -5,7 +5,7 @@
clearing
ru.spcex.clearing
- SPCEX-3.18.244
+ SPCEX-3.19.244
4.0.0