diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java index a4816b31b..3602257b4 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java @@ -34,7 +34,7 @@ public class UserAutoCreateService { if (username == null) { username = new User(); username.setId(userMap.nextIDSequenceFor()); - username.setName(userName); + username.setIdentifier(userName); username.setCreated(Instant.now()); userMap.insert(username); } diff --git a/clearing-parent/backend-api/src/main/resources/meta.xml b/clearing-parent/backend-api/src/main/resources/meta.xml index 5cc2c8c9e..d0ff64de3 100644 --- a/clearing-parent/backend-api/src/main/resources/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta.xml @@ -4,17 +4,17 @@ - + - + - + @@ -59,32 +59,37 @@ + + + + + - + - + - + - + - + @@ -195,22 +200,22 @@ - + - + - + - + @@ -221,17 +226,22 @@ - - + + + + + + + - + @@ -258,7 +268,7 @@ - + @@ -282,7 +292,7 @@ - + @@ -306,7 +316,7 @@ - + @@ -339,7 +349,7 @@ - + @@ -350,7 +360,7 @@ - + @@ -509,7 +519,7 @@ - + @@ -567,16 +577,10 @@ - - - - - - - - + + @@ -739,7 +743,7 @@ - + @@ -766,7 +770,7 @@ - + @@ -791,7 +795,7 @@ - + @@ -803,7 +807,7 @@ - + @@ -822,7 +826,7 @@ - + @@ -836,7 +840,7 @@ - + @@ -855,7 +859,7 @@ - + @@ -884,7 +888,7 @@ - + @@ -902,11 +906,11 @@ - - - + + + - + @@ -920,7 +924,7 @@ - + @@ -930,7 +934,7 @@ - + @@ -959,7 +963,7 @@ - + @@ -1017,7 +1021,7 @@ - + diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java index 94c5bbd86..fda71b035 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java @@ -2,37 +2,32 @@ package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; + /** * Информационные счета - * + *

* DB table: INFORMATION_ACCOUNT **/ public class InformationAccount extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private Long accountId; - private String account; private Long clearingAccountId; public Long getAccountId() { return accountId; } - public void setAccountId(Long value) { - this.accountId=value; - } - public String getAccount() { - return account; - } - public void setAccount(String value) { - this.account=value; + public void setAccountId(Long value) { + this.accountId = value; } public Long getClearingAccountId() { return clearingAccountId; } + public void setClearingAccountId(Long value) { - this.clearingAccountId=value; + this.clearingAccountId = value; } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java index 27a9de294..06818bb9d 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java @@ -12,17 +12,7 @@ import ru.clearing.classes.objects.BusinessObject; public class User extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private Long companyId; private String identifier; - private String name; - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long value) { - this.companyId = value; - } public String getIdentifier() { return identifier; @@ -31,13 +21,4 @@ public class User extends BusinessObject { public void setIdentifier(String value) { this.identifier = value; } - - public String getName() { - return name; - } - - public void setName(String value) { - this.name = value; - } - } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserRoleSession.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserRoleSession.java index 4abccecb5..7180e89ba 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserRoleSession.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserRoleSession.java @@ -14,6 +14,7 @@ public class UserRoleSession extends SpcexObjectBase { private Long userId; private String userRole; private Long companyId; + private String status; public Long getUserId() { return userId; @@ -39,4 +40,11 @@ public class UserRoleSession extends SpcexObjectBase { this.companyId = value; } + public String getStatus() { + return status; + } + + public void setStatus(String value) { + this.status = value; + } } 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 ef29f19b0..24c27681f 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -111,6 +111,16 @@ COMMENT ON COLUMN WORKFLOW_STATUS_DICTIONARY.CODE IS 'Код'; COMMENT ON COLUMN WORKFLOW_STATUS_DICTIONARY.NAME IS 'Наименование'; +-- accountStatus - Справочник статусов счетов +CREATE TABLE IF NOT EXISTS ACCOUNT_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE char(4), NAME varchar(50)); +COMMENT ON TABLE ACCOUNT_STATUS_DICTIONARY IS 'Справочник статусов счетов'; + +COMMENT ON COLUMN ACCOUNT_STATUS_DICTIONARY.ID IS 'Идентификатор записи'; + +COMMENT ON COLUMN ACCOUNT_STATUS_DICTIONARY.CODE IS 'Код'; + +COMMENT ON COLUMN ACCOUNT_STATUS_DICTIONARY.NAME IS 'Наименование'; + -- allowed - Справочник признаков допустимости использования объектов CREATE TABLE IF NOT EXISTS ALLOWED_DICTIONARY(ID bigint PRIMARY KEY, CODE char(4), NAME varchar(50)); COMMENT ON TABLE ALLOWED_DICTIONARY IS 'Справочник признаков допустимости использования объектов'; @@ -424,8 +434,9 @@ COMMENT ON COLUMN IN_OUT_S_DF_TYPE_DICTIONARY.CODE IS 'Код'; COMMENT ON COLUMN IN_OUT_S_DF_TYPE_DICTIONARY.NAME IS 'Тип записи'; /* Business objects */ + -- user - Пользователь -CREATE TABLE IF NOT EXISTS USER_CLR(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint, IDENTIFIER varchar(250), NAME varchar(250)); +CREATE TABLE IF NOT EXISTS USER_CLR(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250)); COMMENT ON TABLE USER_CLR IS 'Пользователь'; COMMENT ON COLUMN USER_CLR.ID IS 'Идентификатор'; @@ -434,15 +445,11 @@ COMMENT ON COLUMN USER_CLR.CREATED_AT IS 'Создано'; COMMENT ON COLUMN USER_CLR.UPDATED_AT IS 'Изменено'; -COMMENT ON COLUMN USER_CLR.COMPANY_ID IS 'Компания (linked to company)'; - COMMENT ON COLUMN USER_CLR.IDENTIFIER IS 'Внешний идентификатор'; -COMMENT ON COLUMN USER_CLR.NAME IS 'Наименование'; - -- History log of user - Пользователь -CREATE TABLE IF NOT EXISTS USER_CLR_HISTORY(USER_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint, IDENTIFIER varchar(250), NAME varchar(250)); +CREATE TABLE IF NOT EXISTS USER_CLR_HISTORY(USER_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250)); COMMENT ON TABLE USER_CLR_HISTORY IS 'История изменений таблицы user'; COMMENT ON COLUMN USER_CLR_HISTORY.USER_ID IS 'Идентификатор записи в таблице USER'; COMMENT ON COLUMN USER_CLR_HISTORY.EVENT_TIME IS 'Дата и время изменения'; @@ -454,14 +461,10 @@ COMMENT ON COLUMN USER_CLR_HISTORY.CREATED_AT IS 'Создано'; COMMENT ON COLUMN USER_CLR_HISTORY.UPDATED_AT IS 'Изменено'; -COMMENT ON COLUMN USER_CLR_HISTORY.COMPANY_ID IS 'Компания (linked to company)'; - COMMENT ON COLUMN USER_CLR_HISTORY.IDENTIFIER IS 'Внешний идентификатор'; -COMMENT ON COLUMN USER_CLR_HISTORY.NAME IS 'Наименование'; - -- userRoleSession - Набор ролей -CREATE TABLE IF NOT EXISTS USER_ROLE_SESSION(ID bigint PRIMARY KEY, USER_ID bigint, USER_ROLE char(4), COMPANY_ID bigint); +CREATE TABLE IF NOT EXISTS USER_ROLE_SESSION(ID bigint PRIMARY KEY, USER_ID bigint, USER_ROLE char(4), COMPANY_ID bigint, STATUS char(4)); COMMENT ON TABLE USER_ROLE_SESSION IS 'Набор ролей'; COMMENT ON COLUMN USER_ROLE_SESSION.ID IS 'Идентификатор записи'; @@ -472,6 +475,8 @@ COMMENT ON COLUMN USER_ROLE_SESSION.USER_ROLE IS 'Идентификатор р COMMENT ON COLUMN USER_ROLE_SESSION.COMPANY_ID IS 'Идентификатор компании (linked to company)'; +COMMENT ON COLUMN USER_ROLE_SESSION.STATUS IS 'Статус (linked to workflowStatus)'; + -- userSettings - Настройки пользователя CREATE TABLE IF NOT EXISTS USER_SETTINGS(ID bigint PRIMARY KEY, USER_ID bigint, VERSION varchar(50), JSON varchar(200000)); COMMENT ON TABLE USER_SETTINGS IS 'Настройки пользователя'; @@ -838,7 +843,7 @@ COMMENT ON COLUMN ACCOUNT.ACCOUNT_TYPE IS 'Идентификатор типа COMMENT ON COLUMN ACCOUNT.RELATION_ID IS 'Идентификатор договорных отношений (linked to relation)'; -COMMENT ON COLUMN ACCOUNT.STATUS IS 'Идентификатор статуса (linked to workflowStatus)'; +COMMENT ON COLUMN ACCOUNT.STATUS IS 'Идентификатор статуса (linked to accountStatus)'; COMMENT ON COLUMN ACCOUNT.PROCESSING_SIGN IS 'Признак обработки счета (linked to allowed)'; @@ -862,7 +867,7 @@ COMMENT ON COLUMN ACCOUNT_HISTORY.ACCOUNT_TYPE IS 'Идентификатор т COMMENT ON COLUMN ACCOUNT_HISTORY.RELATION_ID IS 'Идентификатор договорных отношений (linked to relation)'; -COMMENT ON COLUMN ACCOUNT_HISTORY.STATUS IS 'Идентификатор статуса (linked to workflowStatus)'; +COMMENT ON COLUMN ACCOUNT_HISTORY.STATUS IS 'Идентификатор статуса (linked to accountStatus)'; COMMENT ON COLUMN ACCOUNT_HISTORY.PROCESSING_SIGN IS 'Признак обработки счета (linked to allowed)'; @@ -982,45 +987,19 @@ COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.TAX_REGISTRATION_REASON_CODE IS 'Код COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.ACCOUNT IS 'Номер счета (linked to account)'; --- clearingAccount - Клиринговые счета -CREATE TABLE IF NOT EXISTS CLEARING_ACCOUNT(ID bigint PRIMARY KEY, ACCOUNT_ID bigint, ACCOUNT varchar(12)); -COMMENT ON TABLE CLEARING_ACCOUNT IS 'Клиринговые счета'; - -COMMENT ON COLUMN CLEARING_ACCOUNT.ID IS 'Идентификатор записи'; - -COMMENT ON COLUMN CLEARING_ACCOUNT.ACCOUNT_ID IS 'Идентификатор счета (linked to account)'; - -COMMENT ON COLUMN CLEARING_ACCOUNT.ACCOUNT IS 'Номер счета (linked to account)'; - - --- History log of clearingAccount - Клиринговые счета -CREATE TABLE IF NOT EXISTS CLEARING_ACCOUNT_HISTORY(CLEARING_ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, ACCOUNT_ID bigint, ACCOUNT varchar(12)); -COMMENT ON TABLE CLEARING_ACCOUNT_HISTORY IS 'История изменений таблицы clearingAccount'; -COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.CLEARING_ACCOUNT_ID IS 'Идентификатор записи в таблице CLEARING_ACCOUNT'; -COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.EVENT_TIME IS 'Дата и время изменения'; -COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.EVENT_USER_ID IS 'Инициатор изменения'; - -COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.ID IS 'Идентификатор записи'; - -COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.ACCOUNT_ID IS 'Идентификатор счета (linked to account)'; - -COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.ACCOUNT IS 'Номер счета (linked to account)'; - -- informationAccount - Информационные счета -CREATE TABLE IF NOT EXISTS INFORMATION_ACCOUNT(ID bigint PRIMARY KEY, ACCOUNT_ID bigint, ACCOUNT varchar(12), CLEARING_ACCOUNT_ID bigint); +CREATE TABLE IF NOT EXISTS INFORMATION_ACCOUNT(ID bigint PRIMARY KEY, ACCOUNT_ID bigint, CLEARING_ACCOUNT_ID bigint); COMMENT ON TABLE INFORMATION_ACCOUNT IS 'Информационные счета'; COMMENT ON COLUMN INFORMATION_ACCOUNT.ID IS 'Идентификатор записи'; COMMENT ON COLUMN INFORMATION_ACCOUNT.ACCOUNT_ID IS 'Идентификатор счета (linked to account)'; -COMMENT ON COLUMN INFORMATION_ACCOUNT.ACCOUNT IS 'Номер счета (linked to account)'; - -COMMENT ON COLUMN INFORMATION_ACCOUNT.CLEARING_ACCOUNT_ID IS 'Идентификатор клирингового счета (linked to clearingAccount)'; +COMMENT ON COLUMN INFORMATION_ACCOUNT.CLEARING_ACCOUNT_ID IS 'Идентификатор клирингового счета (linked to account)'; -- History log of informationAccount - Информационные счета -CREATE TABLE IF NOT EXISTS INFORMATION_ACCOUNT_HISTORY(INFORMATION_ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, ACCOUNT_ID bigint, ACCOUNT varchar(12), CLEARING_ACCOUNT_ID bigint); +CREATE TABLE IF NOT EXISTS INFORMATION_ACCOUNT_HISTORY(INFORMATION_ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, ACCOUNT_ID bigint, CLEARING_ACCOUNT_ID bigint); COMMENT ON TABLE INFORMATION_ACCOUNT_HISTORY IS 'История изменений таблицы informationAccount'; COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.INFORMATION_ACCOUNT_ID IS 'Идентификатор записи в таблице INFORMATION_ACCOUNT'; COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.EVENT_TIME IS 'Дата и время изменения'; @@ -1030,9 +1009,7 @@ COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.ID IS 'Идентификатор COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.ACCOUNT_ID IS 'Идентификатор счета (linked to account)'; -COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.ACCOUNT IS 'Номер счета (linked to account)'; - -COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.CLEARING_ACCOUNT_ID IS 'Идентификатор клирингового счета (linked to clearingAccount)'; +COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.CLEARING_ACCOUNT_ID IS 'Идентификатор клирингового счета (linked to account)'; -- accountRouting - Маршрутизация счета CREATE TABLE IF NOT EXISTS ACCOUNT_ROUTING(ID bigint PRIMARY KEY, DESTINATION_ID bigint, RELATION_ID bigint, SOURCE_ID bigint); diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AccountStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AccountStatusDictionary.java new file mode 100644 index 000000000..d51065424 --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AccountStatusDictionary.java @@ -0,0 +1,12 @@ +package ru.clearing.platform.dictionary; + + +/** + * Справочник статусов счетов + * + * Dictionary DB table: ACCOUNT_STATUS_DICTIONARY + **/ +public class AccountStatusDictionary 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/businessevent/InformationAccountUpdateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java similarity index 64% rename from clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountUpdateMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java index cc128e52b..bdd69ade6 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountUpdateMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java @@ -8,9 +8,9 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateEventMapStore; @Component -public class InformationAccountUpdateMapStore extends TemplateEventMapStore { +public class InformationAccountHistoryMapStore extends TemplateEventMapStore { - public InformationAccountUpdateMapStore(JdbcTemplate jdbcTemplate) { + public InformationAccountHistoryMapStore(JdbcTemplate jdbcTemplate) { super(jdbcTemplate); } @@ -27,21 +27,20 @@ public class InformationAccountUpdateMapStore extends TemplateEventMapStore { @Override public String[] getFields() { return new String[]{"ID","EVENT_TIME", "EVENT_USER_ID", - "USER_ID", "CREATED_AT", "UPDATED_AT", "COMPANY_ID", "IDENTIFIER", "NAME" + "USER_ID", "CREATED_AT", "UPDATED_AT", "IDENTIFIER" }; } @@ -43,9 +43,7 @@ public class UserHistoryMapStore extends TemplateEventMapStore { object.getId(), TimeUtil.fromInstant(object.getCreated()), TimeUtil.fromInstant(object.getUpdated()), - object.getCompanyId(), - object.getIdentifier(), - object.getName() + object.getIdentifier() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java index a2fffb3b4..636529c68 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java @@ -30,7 +30,7 @@ public class UserMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CREATED_AT", "UPDATED_AT", "COMPANY_ID", "IDENTIFIER", "NAME" + "ID", "CREATED_AT", "UPDATED_AT", "IDENTIFIER" }; } @@ -40,9 +40,7 @@ public class UserMapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); - object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); object.setIdentifier(resultSet.getObject("IDENTIFIER", String.class)); - object.setName(resultSet.getObject("NAME", String.class)); return object; } @@ -52,9 +50,7 @@ public class UserMapStore extends TemplateMapStore { object.getId(), TimeUtil.fromInstant(object.getCreated()), TimeUtil.fromInstant(object.getUpdated()), - object.getCompanyId(), - object.getIdentifier(), - object.getName() + object.getIdentifier() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AccountStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AccountStatusDictionaryMapStore.java new file mode 100644 index 000000000..558ad66eb --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AccountStatusDictionaryMapStore.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.AccountStatusDictionary; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +@Component +public class AccountStatusDictionaryMapStore extends DictionaryTMapStore { + + public AccountStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_AccountStatusDictionary; + } + + @Override + public String getTableName() { + return "ACCOUNT_STATUS_DICTIONARY"; + } + + @Override + public AccountStatusDictionary getDictionaryObject() { + return new AccountStatusDictionary(); + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java index c3cfc74d8..835d4681a 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java @@ -29,7 +29,7 @@ public class InformationAccountMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "USER_ID", "USER_ROLE", "COMPANY_ID" + "ID", "USER_ID", "USER_ROLE", "COMPANY_ID", "STATUS" }; } @@ -43,6 +43,7 @@ public class UserRoleSessionMapStore extends TemplateMapStore { object.setUserId(resultSet.getObject("USER_ID", Long.class)); object.setUserRole(resultSet.getObject("USER_ROLE", String.class)); object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); + object.setStatus(resultSet.getObject("STATUS", String.class)); return object; } @@ -52,7 +53,8 @@ public class UserRoleSessionMapStore extends TemplateMapStore { object.getId(), object.getUserId(), object.getUserRole(), - object.getCompanyId() + object.getCompanyId(), + object.getStatus() }; return args; } 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 3e0d9633e..fccab0989 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 @@ -44,9 +44,6 @@ public final class IMDGDistributedNames { public static final String Map_InDocumentJournal = "Map_InDocumentJournal"; public static final String Map_OutDocumentJournal = "Map_OutDocumentJournal"; public static final String Map_SDf16 = "Map_SDf16"; - public static final String Map_RequestDf18 = "Map_RequestDf18"; - public static final String Map_RequestDf03 = "Map_RequestDf03"; - public static final String Map_RequestDf05 = "Map_RequestDf05"; public static final String Map_SDf08 = "Map_SDf08"; public static final String Map_SDf02 = "Map_SDf02"; public static final String Map_SDf01 = "Map_SDf01"; @@ -96,6 +93,7 @@ public final class IMDGDistributedNames { public static final String Map_UserRoleDictionary = "Map_UserRoleDictionary"; public static final String Map_UserSettings = "Map_UserSettings"; public static final String Map_UserRoleSession = "Map_UserRoleSession"; + public static final String Map_AccountStatusDictionary = "Map_AccountStatusDictionary"; public static final String Map_KeyRate = "Map_KeyRate"; public static final String Map_MoneyMarketSecurity = "Map_MoneyMarketSecurity";