diff --git a/clearing-parent/backend-api/src/main/resources/data.xml b/clearing-parent/backend-api/src/main/resources/data.xml
index d337f06f7..aa2cfa865 100644
--- a/clearing-parent/backend-api/src/main/resources/data.xml
+++ b/clearing-parent/backend-api/src/main/resources/data.xml
@@ -1,479 +1,473 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/clearing-parent/backend-api/src/main/resources/meta.xml b/clearing-parent/backend-api/src/main/resources/meta.xml
index 55f60361c..8c47e00a7 100644
--- a/clearing-parent/backend-api/src/main/resources/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta.xml
@@ -4,6 +4,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,11 +176,16 @@
-
-
+
+
+
+
+
+
+
@@ -174,6 +199,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -303,7 +350,7 @@
-
+
@@ -359,7 +406,7 @@
-
+
@@ -496,11 +543,13 @@
-
-
+
+
+
+
-
+
@@ -515,9 +564,11 @@
+
+
@@ -525,6 +576,11 @@
+
+
+
+
+
@@ -585,6 +641,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -714,17 +810,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AccountTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AccountTypeDictionary.java
new file mode 100644
index 000000000..00cfbfdc5
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AccountTypeDictionary.java
@@ -0,0 +1,12 @@
+package ru.clearing.platform.dictionary;
+
+
+/**
+ * Справочник типов счетов
+ *
+ * Dictionary DB table: ACCOUNT_TYPE_DICTIONARY
+ **/
+public class AccountTypeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/BalanceAccountTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/BalanceAccountTypeDictionary.java
new file mode 100644
index 000000000..12705e856
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/BalanceAccountTypeDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник типов лимитов
+ *
+ * Dictionary DB table: BALANCE_ACCOUNT_TYPE_DICTIONARY
+ **/
+public class BalanceAccountTypeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingCategoryDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingCategoryDictionary.java
new file mode 100644
index 000000000..5a2dadc1f
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingCategoryDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник категорий участника клиринга
+ *
+ * Dictionary DB table: CLEARING_CATEGORY_DICTIONARY
+ **/
+public class ClearingCategoryDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingStatusDictionary.java
new file mode 100644
index 000000000..a301ab817
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingStatusDictionary.java
@@ -0,0 +1,12 @@
+//package ru.clearing.platform.dictionary;
+//
+//
+///**
+// * Справочник результатов клиринга
+// *
+// * Dictionary DB table: CLEARING_STATUS_DICTIONARY
+// **/
+//public class ClearingStatusDictionary extends AbstractDictionary {
+// private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+//
+//}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyCodeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyCodeDictionary.java
new file mode 100644
index 000000000..2f8b2b247
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyCodeDictionary.java
@@ -0,0 +1,12 @@
+package ru.clearing.platform.dictionary;
+
+
+/**
+ * Справочник кодов валют
+ *
+ * Dictionary DB table: CURRENCY_CODE_DICTIONARY
+ **/
+public class CurrencyCodeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ExtErrorDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ExtErrorDictionary.java
new file mode 100644
index 000000000..66ee995ea
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ExtErrorDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ *
+ *
+ * Dictionary DB table: EXT_ERROR_DICTIONARY
+ **/
+public class ExtErrorDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InOutDirectionDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InOutDirectionDictionary.java
new file mode 100644
index 000000000..9950d0a5f
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InOutDirectionDictionary.java
@@ -0,0 +1,12 @@
+package ru.clearing.platform.dictionary;
+
+
+/**
+ * Справочник значений направления денежного потока
+ *
+ * Dictionary DB table: IN_OUT_DIRECTION_DICTIONARY
+ **/
+public class InOutDirectionDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InstrumentTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InstrumentTypeDictionary.java
new file mode 100644
index 000000000..2e3505b7f
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InstrumentTypeDictionary.java
@@ -0,0 +1,12 @@
+package ru.clearing.platform.dictionary;
+
+
+/**
+ * Справочник типов инструмента
+ *
+ * Dictionary DB table: INSTRUMENT_TYPE_DICTIONARY
+ **/
+public class InstrumentTypeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InterestStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InterestStatusDictionary.java
new file mode 100644
index 000000000..92a3c3d18
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InterestStatusDictionary.java
@@ -0,0 +1,12 @@
+//package ru.clearing.platform.dictionary;
+//
+///**
+// * Справочник статусов возваращения процентов
+// *
+// * Dictionary DB table: INTEREST_STATUS_DICTIONARY
+// **/
+//public class InterestStatusDictionary extends AbstractDictionary {
+// private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+//
+//
+//}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalPurposeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalPurposeDictionary.java
new file mode 100644
index 000000000..2d151d1e4
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalPurposeDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник целей записей в журнале мониторинга и контроля
+ *
+ * Dictionary DB table: MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY
+ **/
+public class ManagementJournalPurposeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalStatusDictionary.java
new file mode 100644
index 000000000..8f49847bc
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalStatusDictionary.java
@@ -0,0 +1,12 @@
+package ru.clearing.platform.dictionary;
+
+
+/**
+ * Справочник статусов журнала мониторинга и контроля
+ *
+ * Dictionary DB table: MANAGEMENT_JOURNAL_STATUS_DICTIONARY
+ **/
+public class ManagementJournalStatusDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalTypeDictionary.java
new file mode 100644
index 000000000..4377c7823
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ManagementJournalTypeDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник типов записей в журнале мониторинга и контроля
+ *
+ * Dictionary DB table: MANAGEMENT_JOURNAL_TYPE_DICTIONARY
+ **/
+public class ManagementJournalTypeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/MoneyFlowSideDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/MoneyFlowSideDictionary.java
new file mode 100644
index 000000000..074f8ff38
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/MoneyFlowSideDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Направление заявки
+ *
+ * Dictionary DB table: MONEY_FLOW_SIDE_DICTIONARY
+ **/
+public class MoneyFlowSideDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OperationStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OperationStatusDictionary.java
new file mode 100644
index 000000000..383d108e6
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OperationStatusDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник статусов операций
+ *
+ * Dictionary DB table: OPERATION_STATUS_DICTIONARY
+ **/
+public class OperationStatusDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OperationTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OperationTypeDictionary.java
new file mode 100644
index 000000000..6c902ff25
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OperationTypeDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник типов операций
+ *
+ * Dictionary DB table: OPERATION_TYPE_DICTIONARY
+ **/
+public class OperationTypeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ResultStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ResultStatusDictionary.java
new file mode 100644
index 000000000..893bfef4b
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ResultStatusDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Статус обработки
+ *
+ * Dictionary DB table: RESULT_STATUS_DICTIONARY
+ **/
+public class ResultStatusDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SectorDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SectorDictionary.java
new file mode 100644
index 000000000..fe21d906a
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SectorDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник секторов
+ *
+ * Dictionary DB table: SECTOR_DICTIONARY
+ **/
+public class SectorDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceDictionary.java
new file mode 100644
index 000000000..0c96c885d
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник услуги
+ *
+ * Dictionary DB table: SERVICE_DICTIONARY
+ **/
+public class ServiceDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceProductDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceProductDictionary.java
new file mode 100644
index 000000000..c1c9d2ab3
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceProductDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник продукта для услуги
+ *
+ * Dictionary DB table: SERVICE_PRODUCT_DICTIONARY
+ **/
+public class ServiceProductDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceStatusDictionary.java
new file mode 100644
index 000000000..fc219ea61
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ServiceStatusDictionary.java
@@ -0,0 +1,11 @@
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник услуги
+ *
+ * Dictionary DB table: SERVICE_STATUS_DICTIONARY
+ **/
+public class ServiceStatusDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/StatementTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/StatementTypeDictionary.java
new file mode 100644
index 000000000..fc78b37b8
--- /dev/null
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/StatementTypeDictionary.java
@@ -0,0 +1,12 @@
+package ru.clearing.platform.dictionary;
+
+
+/**
+ * Справочник типов поступлений/списаний от ПРЦ
+ *
+ * Dictionary DB table: STATEMENT_TYPE_DICTIONARY
+ **/
+public class StatementTypeDictionary extends AbstractDictionary {
+ private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
+}
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java
index 23eefe7b5..d3d1b44ff 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/AutoconfiguredMap.java
@@ -1,7 +1,17 @@
package ru.spcex.clearing.imdg.base;
-public interface AutoconfiguredMap {
+import com.hazelcast.core.MapLoader;
+
+public interface AutoconfiguredMap extends MapLoader {
+ /**
+ *
+ * @return IMDGDistributedNames.*
+ */
String getMapName();
+ /**
+ * Список индексируемых полей, для быстрого поиска
+ * @return
+ */
String[] getIndexingField();
}
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/DictionaryTMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/DictionaryTMapStore.java
new file mode 100644
index 000000000..bf4491ab2
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/DictionaryTMapStore.java
@@ -0,0 +1,18 @@
+package ru.spcex.clearing.imdg.base;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import ru.clearing.platform.dictionary.Dictionary;
+
+/**
+ * Store для автонастраиваемых map словарей
+ */
+public abstract class DictionaryTMapStore extends DictionaryMapStore implements AutoconfiguredMap {
+ protected DictionaryTMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String[] getIndexingField() {
+ return new String[]{"code"};
+ }
+}
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java
index 34120e399..b211c13d0 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/TemplateMapStore.java
@@ -12,7 +12,7 @@ import java.util.*;
* MapStore для шаблонных бизнес-объектов
* @Component
*/
-public abstract class TemplateMapStore extends ObjectBaseMapStore implements AutoconfiguredMap {
+public abstract class TemplateMapStore extends ObjectBaseMapStore implements AutoconfiguredMap {
protected final int validateSize = getFields().length;
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java
index e92d9c962..676e81a5f 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java
@@ -7,7 +7,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
-import ru.spcex.clearing.imdg.base.TemplateMapStore;
+import ru.spcex.clearing.imdg.base.AutoconfiguredMap;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
import ru.spcex.clearing.imdg.businessevent.CompanyUpdateMapStore;
import ru.spcex.clearing.imdg.businessobject.CompanyMapStore;
import ru.spcex.clearing.imdg.dictionary.*;
@@ -145,31 +146,39 @@ public class PoolMapConfigs {
// }
@Autowired
- private List> listOfAutopluginStores;
+ private List> listOfAutopluginStores;
// @Qualifier("AutoconfiguredMapStore")
public List autoconfiguratorOfMapstorages() {
List out = new ArrayList<>();
HashSet existMapStores = new HashSet<>();
- for (TemplateMapStore> mapStore : listOfAutopluginStores) {
- log.debug("Link mapstore {} to map {}", mapStore.toString(), mapStore.getMapName());
- if (StringUtils.isEmpty(mapStore.getMapName())) {
- throw new IllegalArgumentException("MapStore " + mapStore + " has empty mapName");
- }
- if (existMapStores.contains(mapStore.getMapName())) {
- throw new IllegalArgumentException("MapStore " + mapStore + " has wrong mapName=\"" + mapStore.getMapName() + "\" is duplicated");
- }
- existMapStores.add(mapStore.getMapName()); // IMDGDistributedNames
- MapConfig mapCfg = makeDefaultMapConfig(mapStore.getMapName(), mapStore);
- if (mapStore.getIndexingField() != null && mapStore.getIndexingField().length > 0) {
- if (log.isTraceEnabled()) {
- log.trace("Create indexing filed on {}: {}", mapStore.getMapName(), Arrays.toString(mapStore.getIndexingField()));
+ for (AutoconfiguredMap> mapStore : listOfAutopluginStores) {
+ try {
+ log.debug("Link mapstore {} to map {}", mapStore.toString(), mapStore.getMapName());
+ if (StringUtils.isEmpty(mapStore.getMapName())) {
+ throw new IllegalArgumentException("MapStore " + mapStore + " has empty mapName");
}
- for (String indexName : mapStore.getIndexingField()) {
- mapCfg.addMapIndexConfig(makeMapIndexConfig(indexName));
+ if (existMapStores.contains(mapStore.getMapName())) {
+ throw new IllegalArgumentException("MapStore " + mapStore + " has wrong mapName=\"" + mapStore.getMapName() + "\" is duplicated");
}
+ existMapStores.add(mapStore.getMapName()); // IMDGDistributedNames
+ MapConfig mapCfg = makeDefaultMapConfig(mapStore.getMapName(), mapStore);
+ if (mapStore.getIndexingField() != null && mapStore.getIndexingField().length > 0) {
+ if (log.isTraceEnabled()) {
+ log.trace("Create indexing filed on {}: {}", mapStore.getMapName(), Arrays.toString(mapStore.getIndexingField()));
+ }
+ for (String indexName : mapStore.getIndexingField()) {
+ mapCfg.addMapIndexConfig(makeMapIndexConfig(indexName));
+ }
+ }
+ if (mapStore instanceof DictionaryTMapStore) {
+ log.trace("Use near cache for {}", mapStore.getMapName());
+ mapCfg.setNearCacheConfig(makeDefaultNearCacheConfig());
+ }
+ out.add(mapCfg);
+ } catch (RuntimeException e) {
+ throw new RuntimeException("Can not configure MapStore " + mapStore.getMapName() + "(" + mapStore.toString() + "): " + e, e);
}
- out.add(mapCfg);
}
log.debug("Configured {} mapStore's", out.size());
return out;
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AccountTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AccountTypeDictionaryMapStore.java
new file mode 100644
index 000000000..dfeec7734
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AccountTypeDictionaryMapStore.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.AccountTypeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class AccountTypeDictionaryMapStore extends DictionaryTMapStore {
+
+ public AccountTypeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_AccountTypeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "ACCOUNT_TYPE_DICTIONARY";
+ }
+
+ @Override
+ public AccountTypeDictionary getDictionaryObject() {
+ return new AccountTypeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/BalanceAccountTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/BalanceAccountTypeDictionaryMapStore.java
new file mode 100644
index 000000000..c775a4fd4
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/BalanceAccountTypeDictionaryMapStore.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.BalanceAccountTypeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class BalanceAccountTypeDictionaryMapStore extends DictionaryTMapStore {
+
+ public BalanceAccountTypeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_BalanceAccountTypeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "BALANCE_ACCOUNT_TYPE_DICTIONARY";
+ }
+
+ @Override
+ public BalanceAccountTypeDictionary getDictionaryObject() {
+ return new BalanceAccountTypeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingCategoryDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingCategoryDictionaryMapStore.java
new file mode 100644
index 000000000..710e62564
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingCategoryDictionaryMapStore.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.ClearingCategoryDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ClearingCategoryDictionaryMapStore extends DictionaryTMapStore {
+
+ public ClearingCategoryDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ClearingCategoryDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "CLEARING_CATEGORY_DICTIONARY";
+ }
+
+ @Override
+ public ClearingCategoryDictionary getDictionaryObject() {
+ return new ClearingCategoryDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingStatusDictionaryMapStore.java
new file mode 100644
index 000000000..3a9c4dac6
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingStatusDictionaryMapStore.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.ClearingStatusDictionary;
+//import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+//import ru.spcex.clearing.imdg.IMDGDistributedNames;
+//
+//@Component
+//public class ClearingStatusDictionaryMapStore extends DictionaryTMapStore {
+//
+// public ClearingStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+// super(jdbcTemplate);
+// }
+//
+// @Override
+// public String getMapName() {
+// return IMDGDistributedNames.Map_ClearingStatusDictionary;
+// }
+//
+// @Override
+// public String getTableName() {
+// return "CLEARING_STATUS_DICTIONARY";
+// }
+//
+// @Override
+// public ClearingStatusDictionary getDictionaryObject() {
+// return new ClearingStatusDictionary();
+// }
+//
+//}
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyCodeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyCodeDictionaryMapStore.java
new file mode 100644
index 000000000..39072a2c0
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyCodeDictionaryMapStore.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.CurrencyCodeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class CurrencyCodeDictionaryMapStore extends DictionaryTMapStore {
+
+ public CurrencyCodeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_CurrencyCodeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "CURRENCY_CODE_DICTIONARY";
+ }
+
+ @Override
+ public CurrencyCodeDictionary getDictionaryObject() {
+ return new CurrencyCodeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ExtErrorDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ExtErrorDictionaryMapStore.java
new file mode 100644
index 000000000..cca23a922
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ExtErrorDictionaryMapStore.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.ExtErrorDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ExtErrorDictionaryMapStore extends DictionaryTMapStore {
+
+ public ExtErrorDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ExtErrorDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "EXT_ERROR_DICTIONARY";
+ }
+
+ @Override
+ public ExtErrorDictionary getDictionaryObject() {
+ return new ExtErrorDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InOutDirectionDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InOutDirectionDictionaryMapStore.java
new file mode 100644
index 000000000..df121bb17
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InOutDirectionDictionaryMapStore.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.InOutDirectionDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class InOutDirectionDictionaryMapStore extends DictionaryTMapStore {
+
+ public InOutDirectionDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_InOutDirectionDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "IN_OUT_DIRECTION_DICTIONARY";
+ }
+
+ @Override
+ public InOutDirectionDictionary getDictionaryObject() {
+ return new InOutDirectionDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InstrumentTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InstrumentTypeDictionaryMapStore.java
new file mode 100644
index 000000000..4bfa9dd90
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InstrumentTypeDictionaryMapStore.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.InstrumentTypeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class InstrumentTypeDictionaryMapStore extends DictionaryTMapStore {
+
+ public InstrumentTypeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_InstrumentTypeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "INSTRUMENT_TYPE_DICTIONARY";
+ }
+
+ @Override
+ public InstrumentTypeDictionary getDictionaryObject() {
+ return new InstrumentTypeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InterestStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InterestStatusDictionaryMapStore.java
new file mode 100644
index 000000000..ccde56222
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InterestStatusDictionaryMapStore.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.InterestStatusDictionary;
+//import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+//import ru.spcex.clearing.imdg.IMDGDistributedNames;
+//
+//@Component
+//public class InterestStatusDictionaryMapStore extends DictionaryTMapStore {
+//
+// public InterestStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+// super(jdbcTemplate);
+// }
+//
+// @Override
+// public String getMapName() {
+// return IMDGDistributedNames.Map_InterestStatusDictionary;
+// }
+//
+// @Override
+// public String getTableName() {
+// return "INTEREST_STATUS_DICTIONARY";
+// }
+//
+// @Override
+// public InterestStatusDictionary getDictionaryObject() {
+// return new InterestStatusDictionary();
+// }
+//
+//}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalPurposeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalPurposeDictionaryMapStore.java
new file mode 100644
index 000000000..2808d6dd4
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalPurposeDictionaryMapStore.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.ManagementJournalPurposeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ManagementJournalPurposeDictionaryMapStore extends DictionaryTMapStore {
+
+ public ManagementJournalPurposeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ManagementJournalPurposeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY";
+ }
+
+ @Override
+ public ManagementJournalPurposeDictionary getDictionaryObject() {
+ return new ManagementJournalPurposeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalStatusDictionaryMapStore.java
new file mode 100644
index 000000000..bec897e29
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalStatusDictionaryMapStore.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.ManagementJournalStatusDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ManagementJournalStatusDictionaryMapStore extends DictionaryTMapStore {
+
+ public ManagementJournalStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ManagementJournalStatusDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "MANAGEMENT_JOURNAL_STATUS_DICTIONARY";
+ }
+
+ @Override
+ public ManagementJournalStatusDictionary getDictionaryObject() {
+ return new ManagementJournalStatusDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalTypeDictionaryMapStore.java
new file mode 100644
index 000000000..005c46aba
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ManagementJournalTypeDictionaryMapStore.java
@@ -0,0 +1,32 @@
+package ru.spcex.clearing.imdg.dictionary;
+
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.platform.dictionary.ManagementJournalTypeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ManagementJournalTypeDictionaryMapStore extends DictionaryTMapStore {
+
+ public ManagementJournalTypeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ManagementJournalTypeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "MANAGEMENT_JOURNAL_TYPE_DICTIONARY";
+ }
+
+ @Override
+ public ManagementJournalTypeDictionary getDictionaryObject() {
+ return new ManagementJournalTypeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/MoneyFlowSideDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/MoneyFlowSideDictionaryMapStore.java
new file mode 100644
index 000000000..cf1772aa5
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/MoneyFlowSideDictionaryMapStore.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.MoneyFlowSideDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class MoneyFlowSideDictionaryMapStore extends DictionaryTMapStore {
+
+ public MoneyFlowSideDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_MoneyFlowSideDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "MONEY_FLOW_SIDE_DICTIONARY";
+ }
+
+ @Override
+ public MoneyFlowSideDictionary getDictionaryObject() {
+ return new MoneyFlowSideDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OperationStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OperationStatusDictionaryMapStore.java
new file mode 100644
index 000000000..9ef4c30b4
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OperationStatusDictionaryMapStore.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.OperationStatusDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class OperationStatusDictionaryMapStore extends DictionaryTMapStore {
+
+ public OperationStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_OperationStatusDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "OPERATION_STATUS_DICTIONARY";
+ }
+
+ @Override
+ public OperationStatusDictionary getDictionaryObject() {
+ return new OperationStatusDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OperationTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OperationTypeDictionaryMapStore.java
new file mode 100644
index 000000000..0b568fd1d
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OperationTypeDictionaryMapStore.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.OperationTypeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class OperationTypeDictionaryMapStore extends DictionaryTMapStore {
+
+ public OperationTypeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_OperationTypeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "OPERATION_TYPE_DICTIONARY";
+ }
+
+ @Override
+ public OperationTypeDictionary getDictionaryObject() {
+ return new OperationTypeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ResultStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ResultStatusDictionaryMapStore.java
new file mode 100644
index 000000000..4d6425916
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ResultStatusDictionaryMapStore.java
@@ -0,0 +1,32 @@
+package ru.spcex.clearing.imdg.dictionary;
+
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.platform.dictionary.ResultStatusDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ResultStatusDictionaryMapStore extends DictionaryTMapStore {
+
+ public ResultStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ResultStatusDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "RESULT_STATUS_DICTIONARY";
+ }
+
+ @Override
+ public ResultStatusDictionary getDictionaryObject() {
+ return new ResultStatusDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SectorDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SectorDictionaryMapStore.java
new file mode 100644
index 000000000..9b3859afc
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SectorDictionaryMapStore.java
@@ -0,0 +1,32 @@
+package ru.spcex.clearing.imdg.dictionary;
+
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.platform.dictionary.SectorDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class SectorDictionaryMapStore extends DictionaryTMapStore {
+
+ public SectorDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_SectorDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "SECTOR_DICTIONARY";
+ }
+
+ @Override
+ public SectorDictionary getDictionaryObject() {
+ return new SectorDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceDictionaryMapStore.java
new file mode 100644
index 000000000..29f98f82e
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceDictionaryMapStore.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.ServiceDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ServiceDictionaryMapStore extends DictionaryTMapStore {
+
+ public ServiceDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ServiceDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "SERVICE_DICTIONARY";
+ }
+
+ @Override
+ public ServiceDictionary getDictionaryObject() {
+ return new ServiceDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceProductDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceProductDictionaryMapStore.java
new file mode 100644
index 000000000..063cf1b86
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceProductDictionaryMapStore.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.ServiceProductDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ServiceProductDictionaryMapStore extends DictionaryTMapStore {
+
+ public ServiceProductDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ServiceProductDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "SERVICE_PRODUCT_DICTIONARY";
+ }
+
+ @Override
+ public ServiceProductDictionary getDictionaryObject() {
+ return new ServiceProductDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceStatusDictionaryMapStore.java
new file mode 100644
index 000000000..4459f878e
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ServiceStatusDictionaryMapStore.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.ServiceStatusDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class ServiceStatusDictionaryMapStore extends DictionaryTMapStore {
+
+ public ServiceStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_ServiceStatusDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "SERVICE_STATUS_DICTIONARY";
+ }
+
+ @Override
+ public ServiceStatusDictionary getDictionaryObject() {
+ return new ServiceStatusDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/StatementTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/StatementTypeDictionaryMapStore.java
new file mode 100644
index 000000000..c274eef61
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/StatementTypeDictionaryMapStore.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.StatementTypeDictionary;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+@Component
+public class StatementTypeDictionaryMapStore extends DictionaryTMapStore {
+
+ public StatementTypeDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ }
+
+ @Override
+ public String getMapName() {
+ return IMDGDistributedNames.Map_StatementTypeDictionary;
+ }
+
+ @Override
+ public String getTableName() {
+ return "STATEMENT_TYPE_DICTIONARY";
+ }
+
+ @Override
+ public StatementTypeDictionary getDictionaryObject() {
+ return new StatementTypeDictionary();
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/utils/DbUtilsHelperTest.java b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/utils/DbUtilsHelperTest.java
index 1d3c23bb6..94692143e 100644
--- a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/utils/DbUtilsHelperTest.java
+++ b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/utils/DbUtilsHelperTest.java
@@ -9,7 +9,7 @@ public class DbUtilsHelperTest {
String sql = DbUtilsHelper.createUpdateOrInsert("ENERGY",
new String[]{"id", "power", "circle", "of", "fantasy", "prime"}, "id");
assertEquals(sql,
- "INSERT INTO ENERGY (\"ID\", \"POWER\", \"CIRCLE\", \"OF\", \"FANTASY\", \"PRIME\") values (?, ?, ?, ?, ?, ?) ON CONFLICT (ID) DO UPDATE SET \"POWER\"=EXCLUDED.\"POWER\", \"CIRCLE\"=EXCLUDED.\"CIRCLE\", \"OF\"=EXCLUDED.\"OF\", \"FANTASY\"=EXCLUDED.\"FANTASY\", \"PRIME\"=EXCLUDED.\"PRIME\""
+ "INSERT INTO ENERGY (ID, POWER, CIRCLE, OF, FANTASY, PRIME) values (?, ?, ?, ?, ?, ?) ON CONFLICT (ID) DO UPDATE SET POWER=EXCLUDED.POWER, CIRCLE=EXCLUDED.CIRCLE, OF=EXCLUDED.OF, FANTASY=EXCLUDED.FANTASY, PRIME=EXCLUDED.PRIME"
);
}
}
\ No newline at end of file
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 8bd146b94..b6eee8392 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
@@ -11,12 +11,13 @@ public final class IMDGDistributedNames {
public static final String Map_CompanyUpdate = "Map_CompanyUpdate";
public static final String Map_CompanyRoleSet = "Map_CompanyRoleSet";
public static final String Map_CompanySymbols = "Map_CompanySymbols";
-// public static final String Map_CompanyInfo = "Map_CompanyInfo"; интегрировано в Map_Company
+ // public static final String Map_CompanyInfo = "Map_CompanyInfo"; интегрировано в Map_Company
public static final String Map_Contact = "Map_Contact";
public static final String Map_ProfileDocument = "Map_ProfileDocument";
+// public static final String Map_InterestStatusDictionary = "Map_InterestStatusDictionary"; future
public static final String Map_AllowedDictionary = "Map_AllowedDictionary";
- public static final String Map_ClearingMemberCategoryDictionary = "Map_ClearingMemberCategoryDictionary";
+// public static final String Map_ClearingMemberCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; future
public static final String Map_CompanyRoleDictionary = "Map_CompanyRoleDictionary";
public static final String Map_CompanySymbolDictionary = "Map_CompanySymbolDictionary";
public static final String Map_ContactTypeDictionary = "Map_ContactTypeDictionary";
@@ -26,6 +27,26 @@ public final class IMDGDistributedNames {
public static final String Map_LegalKindDictionary = "Map_LegalKindDictionary";
public static final String Map_OrganizationTypeDictionary = "Map_OrganizationTypeDictionary";
public static final String Map_WorkflowStatusDictionary = "Map_WorkflowStatusDictionary";
+ public static final String Map_AccountTypeDictionary = "Map_AccountTypeDictionary";
+ public static final String Map_BalanceAccountTypeDictionary = "Map_BalanceAccountTypeDictionary";
+ public static final String Map_ClearingCategoryDictionary = "Map_ClearingCategoryDictionary";
+ public static final String Map_ClearingStatusDictionary = "Map_ClearingStatusDictionary";
+ public static final String Map_CurrencyCodeDictionary = "Map_CurrencyCodeDictionary";
+ public static final String Map_ExtErrorDictionary = "Map_ExtErrorDictionary";
+ public static final String Map_InOutDirectionDictionary = "Map_InOutDirectionDictionary";
+ public static final String Map_InstrumentTypeDictionary = "Map_InstrumentTypeDictionary";
+ public static final String Map_ManagementJournalPurposeDictionary = "Map_ManagementJournalPurposeDictionary";
+ public static final String Map_ManagementJournalStatusDictionary = "Map_ManagementJournalStatusDictionary";
+ public static final String Map_ManagementJournalTypeDictionary = "Map_ManagementJournalTypeDictionary";
+ public static final String Map_MoneyFlowSideDictionary = "Map_MoneyFlowSideDictionary";
+ public static final String Map_OperationStatusDictionary = "Map_OperationStatusDictionary";
+ public static final String Map_OperationTypeDictionary = "Map_OperationTypeDictionary";
+ public static final String Map_ResultStatusDictionary = "Map_ResultStatusDictionary";
+ public static final String Map_SectorDictionary = "Map_SectorDictionary";
+ public static final String Map_ServiceDictionary = "Map_ServiceDictionary";
+ public static final String Map_ServiceProductDictionary = "Map_ServiceProductDictionary";
+ public static final String Map_ServiceStatusDictionary = "Map_ServiceStatusDictionary";
+ public static final String Map_StatementTypeDictionary = "Map_StatementTypeDictionary";
public static final String Map_KeyRate = "Map_KeyRate";
public static final String Map_MoneyMarketSecurity = "Map_MoneyMarketSecurity";