From ca31c7cc87db95b16db5ad876bfbac7423e59146 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 13 Oct 2022 18:25:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20ClearingMemberCate?= =?UTF-8?q?goryDictionary=20->=20ClearingCategoryDictionary=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClearingCategoryDictionary.java | 18 +++++------ .../ClearingMemberCategoryDictionary.java | 9 ------ .../ClearingCategoryDictionaryMapStore.java | 31 +++++++++++++++++++ ...aringMemberCategoryDictionaryMapStore.java | 31 ------------------- .../clearing/imdg/IMDGDistributedNames.java | 3 +- 5 files changed, 40 insertions(+), 52 deletions(-) delete mode 100644 clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java create mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingCategoryDictionaryMapStore.java delete mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingMemberCategoryDictionaryMapStore.java 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 index 5a2dadc1f..72badda0d 100644 --- 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 @@ -1,11 +1,9 @@ -package ru.clearing.platform.dictionary; - -/** - * Справочник категорий участника клиринга - * - * Dictionary DB table: CLEARING_CATEGORY_DICTIONARY - **/ -public class ClearingCategoryDictionary extends AbstractDictionary { - private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; - +package ru.clearing.platform.dictionary; + +/** + * Database 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/ClearingMemberCategoryDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java deleted file mode 100644 index 65593dd8b..000000000 --- a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java +++ /dev/null @@ -1,9 +0,0 @@ -package ru.clearing.platform.dictionary; - -/** - * Database table: CLEARING_MEMBER_CATEGORY_DICTIONARY - */ -public class ClearingMemberCategoryDictionary extends AbstractDictionary { - private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; - -} \ 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..f60b8a763 --- /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.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; + +@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/ClearingMemberCategoryDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingMemberCategoryDictionaryMapStore.java deleted file mode 100644 index c9fc60c74..000000000 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ClearingMemberCategoryDictionaryMapStore.java +++ /dev/null @@ -1,31 +0,0 @@ -package ru.spcex.clearing.imdg.dictionary; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; -import ru.clearing.platform.dictionary.ClearingMemberCategoryDictionary; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.imdg.base.DictionaryTMapStore; - -@Component -public class ClearingMemberCategoryDictionaryMapStore extends DictionaryTMapStore { - - public ClearingMemberCategoryDictionaryMapStore(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - } - - @Override - public String getMapName() { - return IMDGDistributedNames.Map_ClearingMemberCategoryDictionary; - } - - @Override - public String getTableName() { - return "CLEARING_MEMBER_CATEGORY_DICTIONARY"; - } - - @Override - public ClearingMemberCategoryDictionary getDictionaryObject() { - return new ClearingMemberCategoryDictionary(); - } - -} \ 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 ad7193c11..f5eef3852 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 @@ -57,7 +57,7 @@ public final class IMDGDistributedNames { public static final String Map_SDf18 = "Map_SDf18"; public static final String Map_InterestStatusDictionary = "Map_InterestStatusDictionary"; public static final String Map_AllowedDictionary = "Map_AllowedDictionary"; - public static final String Map_ClearingMemberCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; + public static final String Map_ClearingCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; public static final String Map_CompanyRoleDictionary = "Map_CompanyRoleDictionary"; public static final String Map_CompanySymbolDictionary = "Map_CompanySymbolDictionary"; public static final String Map_ContactTypeDictionary = "Map_ContactTypeDictionary"; @@ -69,7 +69,6 @@ public final class IMDGDistributedNames { 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_ErrorCodeDictionary = "Map_ErrorCodeDictionary";