diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index e5c5b4f05..b30f4e99b 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 63e128721..374686a9f 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.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index c0bba1d43..b91df4a46 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index f284b3003..6fc0f33a9 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 307409c2f..4bc25a83c 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.23.297 + SPCEX-3.24.298 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.23.297 + SPCEX-3.24.298 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 4c4151612..45bfe8817 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 10050bd14..d863ec57f 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile ru.spcex.clearing dictionary - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index ef2815b68..cf3121774 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/csv-importer/pom.xml b/clearing-parent/csv-importer/pom.xml index 3a9a7338b..c773648b2 100644 --- a/clearing-parent/csv-importer/pom.xml +++ b/clearing-parent/csv-importer/pom.xml @@ -6,7 +6,7 @@ ru.spcex.clearing clearing-parent - SPCEX-3.23.297 + SPCEX-3.24.298 csv-importer diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 63365d2fa..44befd43d 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 2362cc7cd..74a2917c3 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -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 \ No newline at end of file +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.24') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION \ No newline at end of file diff --git a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql index 68479fc09..e851ab95c 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql @@ -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 diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.24.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.24.sql new file mode 100644 index 000000000..3f6f54c6e --- /dev/null +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.24.sql @@ -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; \ No newline at end of file diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index e8e3a07ea..ba8834c02 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 4838df3e9..2ea158c7e 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/default-management/pom.xml b/clearing-parent/default-management/pom.xml index aedd77690..7b55bc241 100644 --- a/clearing-parent/default-management/pom.xml +++ b/clearing-parent/default-management/pom.xml @@ -6,7 +6,7 @@ ru.spcex.clearing clearing-parent - SPCEX-3.23.297 + SPCEX-3.24.298 default-management diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java index bbc744c44..3d341a054 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java @@ -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()); diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 238f944ac..143285c6f 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CommentDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CommentDictionary.java new file mode 100644 index 000000000..c3f28e49b --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CommentDictionary.java @@ -0,0 +1,8 @@ +package ru.clearing.platform.dictionary; + + +public class CommentDictionary extends AbstractDictionary { + private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; + + +} diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 6d5315445..87785a47e 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.23.297 + SPCEX-3.24.298 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.23.297 + SPCEX-3.24.298 jar diff --git a/clearing-parent/fix-service/pom.xml b/clearing-parent/fix-service/pom.xml index 66e52e754..ee79ed993 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index 678b61110..8961dff6a 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index ab03b3e3a..3996017a5 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile ru.spcex.clearing dictionary - SPCEX-3.23.297 + SPCEX-3.24.298 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index d8f5fa8cb..df99d9b18 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile ru.spcex.clearing dictionary - SPCEX-3.23.297 + SPCEX-3.24.298 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CommentDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CommentDictionaryMapStore.java new file mode 100644 index 000000000..7e6f1922a --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CommentDictionaryMapStore.java @@ -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 { + + 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(); + } + +} \ No newline at end of file diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 8f4bf0777..cb3c9f464 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.23.297 + SPCEX-3.24.298 jar ru.spcex.clearing clearing-parent - SPCEX-3.23.297 + SPCEX-3.24.298 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index b63a045bf..41e47b1e2 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.23.297 + SPCEX-3.24.298 clearing ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index e10cbacb5..02ed0eb22 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 1e9a231ce..187bb5cb2 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 263bdd459..a68f94655 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.23.297 + SPCEX-3.24.298 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index dd8dc6882..0bfa44d55 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index a213f61f2..7338c3a7f 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile ru.spcex.clearing dictionary - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 12e819b61..c163d44d4 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.23.297 + SPCEX-3.24.298 jar ru.spcex.clearing clearing-parent - SPCEX-3.23.297 + SPCEX-3.24.298 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 4f9858222..ea773eef4 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 0fb9874f2..66a7834e5 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.23.297 + SPCEX-3.24.298 test-clearing Test-clearing - SPCEX-3.23.297 + SPCEX-3.24.298 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index a99b469dd..88ab9bf2e 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.23.297 + SPCEX-3.24.298 trade-importer trade-importer Trade importer module - SPCEX-3.23.297 + SPCEX-3.24.298 jar @@ -55,7 +55,7 @@ ru.spcex.clearing classes - SPCEX-3.23.297 + SPCEX-3.24.298 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index c4ac1c054..9af7f7d24 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.23.297 + SPCEX-3.24.298 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index cbbb249e1..559f77389 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index e49ba50d8..153468eb1 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.23.297 + SPCEX-3.24.298 clearing-parent ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java index 47a6d108d..b89285a36 100644 --- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java @@ -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 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index cbf18d1d1..de33804e6 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.23.297 + SPCEX-3.24.298 diff --git a/pom.xml b/pom.xml index 3323fb5ab..9c1a5f70d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.23.297 + SPCEX-3.24.298 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.23.297 + SPCEX-3.24.298 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 4022b7a2e..0db3e2222 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.23.297 + SPCEX-3.24.298 4.0.0