treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2026-05-12 17:13:11 +03:00
commit f8c8f92401
43 changed files with 149 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/account-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
clearing-parent/backend-api/pom.xml
View file

@ -11,7 +11,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>

2
clearing-parent/balance-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
clearing-parent/classes/pom.xml
View file

@ -12,7 +12,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<properties>

6
clearing-parent/cleaning-builders/pom.xml
View file

@ -6,13 +6,13 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<artifactId>cleaning-builders</artifactId>
<name>cleaning-builders</name>
<description>Cleaning builders module</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<packaging>jar</packaging>
@ -26,7 +26,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/clearing-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
clearing-parent/clearing-validation/pom.xml
View file

@ -8,12 +8,12 @@
<name>clearing-validation</name>
<description>Clearing-module, dependency version of platform-utils</description>
<packaging>jar</packaging>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<properties>
@ -35,13 +35,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/company-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
clearing-parent/csv-importer/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<artifactId>csv-importer</artifactId>

4
clearing-parent/db-scripts/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>db-scripts</artifactId>
<name>db-scripts</name>
<description>db-scripts for PostgreSQL</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<build>

8
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -5766,8 +5766,14 @@ COMMENT ON TABLE ORDER_AFFIL_DICTIONARY IS 'Справочник принадл
COMMENT ON COLUMN ORDER_AFFIL_DICTIONARY.ID IS 'Идентификатор';
COMMENT ON COLUMN ORDER_AFFIL_DICTIONARY.CODE IS 'Код';
COMMENT ON COLUMN ORDER_AFFIL_DICTIONARY.NAME IS 'Тип расчета';
CREATE TABLE COMMENT_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(8), NAME varchar(50));
COMMENT ON TABLE COMMENT_DICTIONARY IS 'Справочник комментариев';
COMMENT ON COLUMN COMMENT_DICTIONARY.ID IS 'Идентификатор';
COMMENT ON COLUMN COMMENT_DICTIONARY.CODE IS 'Код';
COMMENT ON COLUMN COMMENT_DICTIONARY.NAME IS 'Наименование';
/* views */
-- Data types
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.23') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.24') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION

11
clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
View file

@ -1361,7 +1361,14 @@ INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (6, 'CNCL', 'Снят
INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (7, 'REPL', 'Заменена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (8, 'RJCT', 'Отклонена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (1, 'TYPE=1', 'Тип 1 – по сделке с НУК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (2, 'TYPE=2', 'Тип 2 – закрывающая сделка для НУК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (3, 'TYPE=3', 'Тип 3 – по сделке ЦК с ДУК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (4, 'TYPE=4', 'Тип 4 – балансирующая сделка с ДУК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (5, 'TYPE=5', 'Тип 5 – закрывающая сделка для НУК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (6, 'TYPE=6', 'Тип 6 – закрывающая сделка для НУК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (7, 'TYPE=7', 'Тип 7 – закрывающая сделка для УК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO COMMENT_DICTIONARY(ID, CODE, NAME) values (8, 'TYPE=8', 'Тип 8 – балансирующая сделка с ДУК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
/* Business objects */
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.23.0.105') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.24.0.106') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION

11
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.24.sql Normal file
View file

@ -0,0 +1,11 @@
-- DB version: 3.23 -> 3.24
DROP TABLE IF EXISTS COMMENT_DICTIONARY ;
CREATE TABLE COMMENT_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(8), NAME varchar(50));
COMMENT ON TABLE COMMENT_DICTIONARY IS 'Справочник комментариев';
COMMENT ON COLUMN COMMENT_DICTIONARY.ID IS 'Идентификатор';
COMMENT ON COLUMN COMMENT_DICTIONARY.CODE IS 'Код';
COMMENT ON COLUMN COMMENT_DICTIONARY.NAME IS 'Наименование';
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.24') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION;

4
clearing-parent/dbf-exporter/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>dbf-exporter</artifactId>
<name>dbf-exporter</name>
<description>DBF exporter for DBF files</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<dependencies>

4
clearing-parent/dbf-importer/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>dbf-importer</artifactId>
<name>dbf-importer</name>
<description>DBF loader for DBF files</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<dependencies>

2
clearing-parent/default-management/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<artifactId>default-management</artifactId>

18
clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java
View file

@ -31,7 +31,7 @@ public class OrderTemplateBuilder {
default -> throw new IllegalArgumentException("Unsupported order category: " + context.getOrderCategory());
}
Side side = resolvePrimaryTransferSide(context.getRegistry(), settleCode);
enrichOrder(orderCurrency, context, side, "overnight", settleCode, finalCalculationResult);
enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult);
return orderCurrency;
}
@ -46,7 +46,7 @@ public class OrderTemplateBuilder {
}
;
Side side = resolveCounterTransferSide(context.getRegistry(), settleCode);
enrichOrder(orderCurrency, context, side, "overnight", settleCode, finalCalculationResult);
enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult);
return orderCurrency;
}
@ -61,7 +61,7 @@ public class OrderTemplateBuilder {
}
;
Side side = resolvePrimaryBalancingSide(context.getRegistry(), settleCode);
enrichOrder(orderCurrency, context, side, "balance", settleCode, finalCalculationResult);
enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult);
return orderCurrency;
}
@ -76,7 +76,7 @@ public class OrderTemplateBuilder {
}
;
Side side = resolveCounterBalancingSide(context.getRegistry(), settleCode);
enrichOrder(orderCurrency, context, side, "balance", settleCode, finalCalculationResult);
enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult);
return orderCurrency;
}
@ -91,6 +91,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(registry.getTradingCode());
order.setCounterPartyId(clcc.companyId());
order.setCounterTradingCode(clcc.tradingCode());
order.setComment("Type=1");
order.setType("CMOV");
return order;
}
@ -106,6 +107,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(clcc.tradingCode());
order.setCounterPartyId(registry.getCompanyId());
order.setCounterTradingCode(registry.getTradingCode());
order.setComment("Type=1");
order.setType("CMOV");
return order;
}
@ -121,6 +123,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(categoryP.tradingCode());
order.setCounterPartyId(clcc.companyId());
order.setCounterTradingCode(clcc.tradingCode());
order.setComment("Type=1");
order.setType("CMBL");
return order;
}
@ -136,6 +139,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(clcc.tradingCode());
order.setCounterPartyId(categoryP.companyId());
order.setCounterTradingCode(categoryP.tradingCode());
order.setComment("Type=1");
order.setType("CMBL");
return order;
}
@ -151,6 +155,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(registry.getTradingCode());
order.setCounterPartyId(clcc.companyId());
order.setCounterTradingCode(clcc.tradingCode());
order.setComment("Type=3");
order.setType("PLOV");
return order;
}
@ -166,6 +171,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(clcc.tradingCode());
order.setCounterPartyId(registry.getCompanyId());
order.setCounterTradingCode(registry.getTradingCode());
order.setComment("Type=3");
order.setType("PLOV");
return order;
}
@ -181,6 +187,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(rgcm.tradingCode());
order.setCounterPartyId(clcc.companyId());
order.setCounterTradingCode(clcc.tradingCode());
order.setComment("Type=3");
order.setType("PLBL");
return order;
}
@ -196,6 +203,7 @@ public class OrderTemplateBuilder {
order.setTradingCode(clcc.tradingCode());
order.setCounterPartyId(rgcm.companyId());
order.setCounterTradingCode(rgcm.tradingCode());
order.setComment("Type=3");
order.setType("PLBL");
return order;
}
@ -203,7 +211,6 @@ public class OrderTemplateBuilder {
public void enrichOrder(OrderCurrency order,
OrderCurrencyContext context,
Side side,
String comment,
SettleCode settleCode,
FinalCalculationResult finalCalculationResult) {
Registry registry = context.getRegistry();
@ -219,7 +226,6 @@ public class OrderTemplateBuilder {
order.setSide(side.getKey());
order.setSettleCode(settleCode.getKey());
order.setStatus("CRET");
order.setComment(comment);
order.setRegistryId(registry.getId());
order.setCreated(Instant.now());

4
clearing-parent/dictionary/pom.xml
View file

@ -8,12 +8,12 @@
<name>Clearing dictionary</name>
<description>Clearing dictionary</description>
<packaging>jar</packaging>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<properties>

8
clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CommentDictionary.java Normal file
View file

@ -0,0 +1,8 @@
package ru.clearing.platform.dictionary;
public class CommentDictionary extends AbstractDictionary {
private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
}

4
clearing-parent/extdb-importer/pom.xml
View file

@ -4,12 +4,12 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<artifactId>extdb-importer</artifactId>
<name>extdb-importer</name>
<description>Extdb importer module. Аналог trade-importer.</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<packaging>jar</packaging>
<properties>

2
clearing-parent/fix-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
clearing-parent/gateway-api/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

10
clearing-parent/imdg-hist/pom.xml
View file

@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>imdg-hist</artifactId>
<packaging>jar</packaging>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
@ -36,13 +36,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
@ -82,7 +82,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

10
clearing-parent/imdg/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>imdg</artifactId>
<name>Clearing in memory data grid</name>
<packaging>jar</packaging>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<properties>
@ -32,13 +32,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
@ -89,7 +89,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

31
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CommentDictionaryMapStore.java Normal file
View file

@ -0,0 +1,31 @@
package ru.spcex.clearing.imdg.dictionary;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import ru.clearing.platform.dictionary.CommentDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
@Component
public class CommentDictionaryMapStore extends DictionaryTMapStore<CommentDictionary> {
public CommentDictionaryMapStore(JdbcTemplate jdbcTemplate) {
super(jdbcTemplate);
}
@Override
public String getMapName() {
return IMDGDistributedNames.Map_CommentDictionary;
}
@Override
public String getTableName() {
return "COMMENT_DICTIONARY";
}
@Override
public CommentDictionary getDictionaryObject() {
return new CommentDictionary();
}
}

6
clearing-parent/lim-exporter/pom.xml
View file

@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lim-exporter</artifactId>
<name>Lim exporter</name>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<packaging>jar</packaging>
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<properties>
@ -35,7 +35,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

4
clearing-parent/pom.xml
View file

@ -7,12 +7,12 @@
<name>_parent_clearing</name>
<description>Clearing parent module</description>
<packaging>pom</packaging>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modules>

2
clearing-parent/registry-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
clearing-parent/reports-service/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>reports-service</artifactId>
<name>reports-service</name>
<description>Service for creating reports</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<dependencies>
<!-- Spring boot -->

4
clearing-parent/scheduler-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -51,7 +51,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/securities-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
clearing-parent/security-util/pom.xml
View file

@ -8,12 +8,12 @@
<name>security-util clearing</name>
<description>Clearing misc util for verify user roles</description>
<packaging>jar</packaging>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<properties>
@ -35,13 +35,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

6
clearing-parent/swt-exporter/pom.xml
View file

@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>swt-exporter</artifactId>
<name>Swt exporter</name>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<packaging>jar</packaging>
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<properties>
@ -35,7 +35,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/swt-importer/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
clearing-parent/test-clearing/pom.xml
View file

@ -4,11 +4,11 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<artifactId>test-clearing</artifactId>
<name>Test-clearing</name>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<dependencies>
<dependency>
<groupId>ru.spcex.platform</groupId>

6
clearing-parent/trade-importer/pom.xml
View file

@ -4,12 +4,12 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<artifactId>trade-importer</artifactId>
<name>trade-importer</name>
<description>Trade importer module</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<packaging>jar</packaging>
<properties>
@ -55,7 +55,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/utility-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
clearing-parent/xml-exporter/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>xml-exporter</artifactId>
<name>xml-exporter</name>
<description>XML exporter for XML files</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<dependencies>

4
clearing-parent/xml-importer/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>xml-importer</artifactId>
<name>xml-importer</name>
<description>XML loader for XML files</description>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<dependencies>

1
platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java
View file

@ -122,6 +122,7 @@ public final class IMDGDistributedNames {
public static final String Map_ResidenceDictionary = "Map_ResidenceDictionary";
public static final String Map_OrderStatusDictionary = "Map_OrderStatusDictionary";
public static final String Map_OrderAffilDictionary = "Map_OrderAffilDictionary";
public static final String Map_CommentDictionary = "Map_CommentDictionary";
public static final String Map_UserSettings = "Map_UserSettings";
public static final String Map_UserRoleSession = "Map_UserRoleSession";
@Deprecated

2
platform-parent/pom.xml
View file

@ -14,7 +14,7 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing</artifactId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modules>

4
pom.xml
View file

@ -9,7 +9,7 @@
<name>__parent_ROOT</name>
<description>Clearing main parent</description>
<packaging>pom</packaging>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
<modules>
<module>clearing-parent</module>
@ -24,7 +24,7 @@
<project.java.version>17</project.java.version>
<built.by>Maven</built.by>
<global.project.version>SPCEX-3.23.297</global.project.version>
<global.project.version>SPCEX-3.24.298</global.project.version>
<spring-boot.version>2.6.3</spring-boot.version>

2
z-distr/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.23.297</version>
<version>SPCEX-3.24.298</version>
</parent>
<modelVersion>4.0.0</modelVersion>