diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml index d21d3564b..ba9762b31 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/data.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml @@ -96,9 +96,9 @@ - - - + + + diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index a671dc066..590401157 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1407,11 +1407,11 @@ "name": "Код","shortname": "Код","type": 2,"length": 25 } , - {"code": "baseCurrencyId", + {"code": "baseCurrency", "name": "Код валюты лота","shortname": "Валюта лота","link": "currencyCode","type": 12 } , - {"code": "quoteCurrencyId", + {"code": "quoteCurrency", "name": "Код сопряженной валюты","shortname": "Сопряженная валюта","link": "currencyCode","type": 12 } , @@ -7326,7 +7326,7 @@ , "gatewayResult": { - "name": "Результат запроса к gateway", + "name": "Результаты запросов к ТС", "destination": "gateway-result", diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index cf3650a59..43d9be490 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -310,8 +310,8 @@ - - + + @@ -1686,7 +1686,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index a671dc066..590401157 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1407,11 +1407,11 @@ "name": "Код","shortname": "Код","type": 2,"length": 25 } , - {"code": "baseCurrencyId", + {"code": "baseCurrency", "name": "Код валюты лота","shortname": "Валюта лота","link": "currencyCode","type": 12 } , - {"code": "quoteCurrencyId", + {"code": "quoteCurrency", "name": "Код сопряженной валюты","shortname": "Сопряженная валюта","link": "currencyCode","type": 12 } , @@ -7326,7 +7326,7 @@ , "gatewayResult": { - "name": "Результат запроса к gateway", + "name": "Результаты запросов к ТС", "destination": "gateway-result", diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java index a8a2cc6d5..27c80f440 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java @@ -13,11 +13,11 @@ public class CurrencyPairSecurity extends Security { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private BigDecimal baseUnitSize; - private Long currencyPairId; +// private Long currencyPairId; private String code; private String settlementType; private String clearingOrganization; - private String settlementOrganization; +// private String settlementOrganization; private Long securityId; // extend: private String securitySymbol; // extend: private String shortName; @@ -34,14 +34,6 @@ public class CurrencyPairSecurity extends Security { this.baseUnitSize = value; } - public Long getCurrencyPairId() { - return currencyPairId; - } - - public void setCurrencyPairId(Long value) { - this.currencyPairId = value; - } - public String getCode() { return code; } @@ -66,14 +58,6 @@ public class CurrencyPairSecurity extends Security { this.clearingOrganization = value; } - public String getSettlementOrganization() { - return settlementOrganization; - } - - public void setSettlementOrganization(String value) { - this.settlementOrganization = value; - } - public Long getSecurityId() { return securityId; } diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql index f25c9be35..5e2953cf5 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql @@ -1,4 +1,4 @@ --- DB version: 3.11.0.81 +-- DB version: 3.11.0.83 -- DATA version: 3.11.0.78 @@ -194,11 +194,11 @@ INSERT INTO CURRENCY_CODE_DICTIONARY(ID, CODE, NAME) values (978, 'EUR', 'Евр INSERT INTO CURRENCY_CODE_DICTIONARY(ID, CODE, NAME) values (156, 'CNY', 'Китайский Юань') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY_ID, QUOTE_CURRENCY_ID, MAJOR_SIGN) values (1, 'EUR/RUB', 'EUR', 'RUB', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY_ID = EXCLUDED.BASE_CURRENCY_ID, QUOTE_CURRENCY_ID = EXCLUDED.QUOTE_CURRENCY_ID, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; +INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY, QUOTE_CURRENCY, MAJOR_SIGN) values (1, 'EUR/RUB', 'EUR', 'RUB', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY = EXCLUDED.BASE_CURRENCY, QUOTE_CURRENCY = EXCLUDED.QUOTE_CURRENCY, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; -INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY_ID, QUOTE_CURRENCY_ID, MAJOR_SIGN) values (2, 'USD/RUB', 'USD', 'RUB', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY_ID = EXCLUDED.BASE_CURRENCY_ID, QUOTE_CURRENCY_ID = EXCLUDED.QUOTE_CURRENCY_ID, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; +INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY, QUOTE_CURRENCY, MAJOR_SIGN) values (2, 'USD/RUB', 'USD', 'RUB', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY = EXCLUDED.BASE_CURRENCY, QUOTE_CURRENCY = EXCLUDED.QUOTE_CURRENCY, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; -INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY_ID, QUOTE_CURRENCY_ID, MAJOR_SIGN) values (3, 'CNY/RUВ', 'CNY', 'RUВ', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY_ID = EXCLUDED.BASE_CURRENCY_ID, QUOTE_CURRENCY_ID = EXCLUDED.QUOTE_CURRENCY_ID, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; +INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY, QUOTE_CURRENCY, MAJOR_SIGN) values (3, 'CNY/RUВ', 'CNY', 'RUВ', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY = EXCLUDED.BASE_CURRENCY, QUOTE_CURRENCY = EXCLUDED.QUOTE_CURRENCY, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; INSERT INTO INSTRUMENT_TYPE_DICTIONARY(ID, CODE, NAME) values (1, 'RATE', 'Инструмент Денежного рынка') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; 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 3f7d702e8..cc8fef6d0 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -1,4 +1,4 @@ --- DB version: 3.11.0.81 +-- DB version: 3.11.0.83 /* Dictionaries */ -- allowed - Справочник признаков допустимости использования объектов @@ -785,16 +785,16 @@ GRANT ALL PRIVILEGES ON TABLE CURRENCY_SETTLEMENT_TYPE_DICTIONARY TO clearing; -- currencyPair - Справочник валютных пар DROP TABLE IF EXISTS CURRENCY_PAIR_DICTIONARY; -CREATE TABLE CURRENCY_PAIR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(25), BASE_CURRENCY_ID varchar(4), QUOTE_CURRENCY_ID varchar(4), MAJOR_SIGN varchar(4)); +CREATE TABLE CURRENCY_PAIR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(25), BASE_CURRENCY varchar(4), QUOTE_CURRENCY varchar(4), MAJOR_SIGN varchar(4)); COMMENT ON TABLE CURRENCY_PAIR_DICTIONARY IS 'Справочник валютных пар'; COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.ID IS 'Идентификатор'; COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.CODE IS 'Код'; -COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.BASE_CURRENCY_ID IS 'Код валюты лота (linked to currencyCode)'; +COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.BASE_CURRENCY IS 'Код валюты лота (linked to currencyCode)'; -COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.QUOTE_CURRENCY_ID IS 'Код сопряженной валюты (linked to currencyCode)'; +COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.QUOTE_CURRENCY IS 'Код сопряженной валюты (linked to currencyCode)'; COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.MAJOR_SIGN IS 'Код признака конвертируемости валюты (linked to majorSign)'; @@ -1748,23 +1748,21 @@ COMMENT ON COLUMN LISTING_HISTORY.UPDATED_AT IS 'Дата-время измен GRANT ALL PRIVILEGES ON TABLE LISTING_HISTORY TO clearing; --- currencyPairSecurity - Валютные пары +-- currencyPairSecurity - Инструменты валютного рынка DROP TABLE IF EXISTS CURRENCY_PAIR_SECURITY; -CREATE TABLE CURRENCY_PAIR_SECURITY(BASE_UNIT_SIZE numeric(72,2), CURRENCY_PAIR_ID bigint, CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SETTLEMENT_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); -COMMENT ON TABLE CURRENCY_PAIR_SECURITY IS 'Валютные пары'; +CREATE TABLE CURRENCY_PAIR_SECURITY(, CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +COMMENT ON TABLE CURRENCY_PAIR_SECURITY IS 'Инструменты валютного рынка'; + +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CURRENCY_PAIR_ID IS 'Валютная пара (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.BASE_UNIT_SIZE IS 'Количество валюты лота'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CURRENCY_PAIR_ID IS 'Идентификатор валютной пары (linked to currencyPair)'; - COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_TYPE IS 'Тип расчета (linked to currencySettlementType)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_ORGANIZATION IS 'Наименование расчетной организации'; - COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SECURITY_ID IS 'Наименование инструмента (linked to security)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.ID IS 'Идентификатор записи'; @@ -1776,18 +1774,18 @@ COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.UPDATED_AT IS 'Время измене GRANT ALL PRIVILEGES ON TABLE CURRENCY_PAIR_SECURITY TO clearing; --- History log of currencyPairSecurity - Валютные пары +-- History log of currencyPairSecurity - Инструменты валютного рынка DROP TABLE IF EXISTS CURRENCY_PAIR_SECURITY_HISTORY; -CREATE TABLE CURRENCY_PAIR_SECURITY_HISTORY(CURRENCY_PAIR_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), BASE_UNIT_SIZE numeric(72,2), CURRENCY_PAIR_ID bigint, CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SETTLEMENT_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +CREATE TABLE CURRENCY_PAIR_SECURITY_HISTORY(CURRENCY_PAIR_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), , CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); COMMENT ON TABLE CURRENCY_PAIR_SECURITY_HISTORY IS 'История изменений таблицы currencyPairSecurity'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_SECURITY_ID IS 'Идентификатор записи в таблице CURRENCY_PAIR_SECURITY'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_TIME IS 'Дата и время изменения'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_USER_ID IS 'Инициатор изменения'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_TYPE IS 'Тип изменения'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.BASE_UNIT_SIZE IS 'Количество валюты лота'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_ID IS 'Валютная пара (linked to currencyPair)'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_ID IS 'Идентификатор валютной пары (linked to currencyPair)'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.BASE_UNIT_SIZE IS 'Количество валюты лота'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; @@ -1795,8 +1793,6 @@ COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_TYPE IS 'Тип ра COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_ORGANIZATION IS 'Наименование расчетной организации'; - COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SECURITY_ID IS 'Наименование инструмента (linked to security)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.ID IS 'Идентификатор записи'; @@ -3564,10 +3560,10 @@ COMMENT ON COLUMN PAIR_SDF.OUT_S_DF IS 'Исходящий файл'; GRANT ALL PRIVILEGES ON TABLE PAIR_SDF TO clearing; --- gatewayResult - Результат запроса к gateway +-- gatewayResult - Результаты запросов к ТС DROP TABLE IF EXISTS GATEWAY_RESULT; CREATE TABLE GATEWAY_RESULT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, REQUEST_ID varchar(255), NAME_REQUEST varchar(255), REQUEST varchar(1023), RESULT varchar(1023), GATEWAY_RESULT_STATUS varchar(4)); -COMMENT ON TABLE GATEWAY_RESULT IS 'Результат запроса к gateway'; +COMMENT ON TABLE GATEWAY_RESULT IS 'Результаты запросов к ТС'; COMMENT ON COLUMN GATEWAY_RESULT.ID IS 'Идентификатор записи'; diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql index a606d1208..c4ee35c3e 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql @@ -63,16 +63,15 @@ COMMENT ON COLUMN SETTLEMENT_HOUSE_PROPERTIES_HISTORY.CURRENCY_CODE IS 'Код COMMENT ON COLUMN SETTLEMENT_HOUSE_PROPERTIES_HISTORY.ID IS 'Идентификатор записи'; GRANT ALL PRIVILEGES ON TABLE SETTLEMENT_HOUSE_PROPERTIES_HISTORY TO clearing; --- currencyPairSecurity - Валютные пары +-- currencyPairSecurity - Инструменты валютного рынка DROP TABLE IF EXISTS CURRENCY_PAIR_SECURITY; -CREATE TABLE CURRENCY_PAIR_SECURITY(BASE_UNIT_SIZE numeric(72,2), CURRENCY_PAIR_ID bigint, CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SETTLEMENT_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); -COMMENT ON TABLE CURRENCY_PAIR_SECURITY IS 'Валютные пары'; +CREATE TABLE CURRENCY_PAIR_SECURITY(, CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +COMMENT ON TABLE CURRENCY_PAIR_SECURITY IS 'Инструменты валютного рынка'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CURRENCY_PAIR_ID IS 'Валютная пара (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.BASE_UNIT_SIZE IS 'Количество валюты лота'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CURRENCY_PAIR_ID IS 'Идентификатор валютной пары (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_TYPE IS 'Тип расчета (linked to currencySettlementType)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_ORGANIZATION IS 'Наименование расчетной организации'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SECURITY_ID IS 'Наименование инструмента (linked to security)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.ID IS 'Идентификатор записи'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CREATED_AT IS 'Время создания записи'; @@ -80,20 +79,19 @@ COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.UPDATED_AT IS 'Время измене GRANT ALL PRIVILEGES ON TABLE CURRENCY_PAIR_SECURITY TO clearing; --- History log of currencyPairSecurity - Валютные пары +-- History log of currencyPairSecurity - Инструменты валютного рынка DROP TABLE IF EXISTS CURRENCY_PAIR_SECURITY_HISTORY; -CREATE TABLE CURRENCY_PAIR_SECURITY_HISTORY(CURRENCY_PAIR_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), BASE_UNIT_SIZE numeric(72,2), CURRENCY_PAIR_ID bigint, CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SETTLEMENT_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +CREATE TABLE CURRENCY_PAIR_SECURITY_HISTORY(CURRENCY_PAIR_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), , CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); COMMENT ON TABLE CURRENCY_PAIR_SECURITY_HISTORY IS 'История изменений таблицы currencyPairSecurity'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_SECURITY_ID IS 'Идентификатор записи в таблице CURRENCY_PAIR_SECURITY'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_TIME IS 'Дата и время изменения'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_USER_ID IS 'Инициатор изменения'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_TYPE IS 'Тип изменения'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_ID IS 'Валютная пара (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.BASE_UNIT_SIZE IS 'Количество валюты лота'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_ID IS 'Идентификатор валютной пары (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_TYPE IS 'Тип расчета (linked to currencySettlementType)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_ORGANIZATION IS 'Наименование расчетной организации'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SECURITY_ID IS 'Наименование инструмента (linked to security)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.ID IS 'Идентификатор записи'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CREATED_AT IS 'Время создания записи'; @@ -219,10 +217,10 @@ COMMENT ON COLUMN PAIR_SDF.OUT_S_DF_ID IS 'Идентификатор исход COMMENT ON COLUMN PAIR_SDF.OUT_S_DF IS 'Исходящий файл'; GRANT ALL PRIVILEGES ON TABLE PAIR_SDF TO clearing; --- gatewayResult - Результат запроса к gateway +-- gatewayResult - Результаты запросов к ТС DROP TABLE IF EXISTS GATEWAY_RESULT; CREATE TABLE GATEWAY_RESULT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, REQUEST_ID varchar(255), NAME_REQUEST varchar(255), REQUEST varchar(1023), RESULT varchar(1023), GATEWAY_RESULT_STATUS varchar(4)); -COMMENT ON TABLE GATEWAY_RESULT IS 'Результат запроса к gateway'; +COMMENT ON TABLE GATEWAY_RESULT IS 'Результаты запросов к ТС'; COMMENT ON COLUMN GATEWAY_RESULT.ID IS 'Идентификатор записи'; COMMENT ON COLUMN GATEWAY_RESULT.CREATED_AT IS 'Время создания записи'; COMMENT ON COLUMN GATEWAY_RESULT.UPDATED_AT IS 'Время изменения записи'; diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyPairDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyPairDictionary.java index e8bff5084..b31ed025d 100644 --- a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyPairDictionary.java +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyPairDictionary.java @@ -9,8 +9,8 @@ package ru.clearing.platform.dictionary; public class CurrencyPairDictionary extends AbstractDictionary { private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; - private String baseCurrencyId; - private String quoteCurrencyId; + private String baseCurrency; + private String quoteCurrency; private String majorSign; @Deprecated @@ -25,20 +25,20 @@ public class CurrencyPairDictionary extends AbstractDictionary { super.setName(name); } - public String getBaseCurrencyId() { - return baseCurrencyId; + public String getBaseCurrency() { + return baseCurrency; } - public void setBaseCurrencyId(String value) { - this.baseCurrencyId = value; + public void setBaseCurrency(String value) { + this.baseCurrency = value; } - public String getQuoteCurrencyId() { - return quoteCurrencyId; + public String getQuoteCurrency() { + return quoteCurrency; } - public void setQuoteCurrencyId(String value) { - this.quoteCurrencyId = value; + public void setQuoteCurrency(String value) { + this.quoteCurrency = value; } public String getMajorSign() { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java index 5c005f3e6..d869ddbc7 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java @@ -28,7 +28,7 @@ public class CurrencyPairSecurityHistoryMapStore extends ASecurityHistoryMapStor @Override public String[] getFields() { return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", - "CURRENCY_PAIR_SECURITY_ID", "BASE_UNIT_SIZE", "CURRENCY_PAIR_ID", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SETTLEMENT_ORGANIZATION", "SECURITY_ID", "CREATED_AT", "UPDATED_AT" + "CURRENCY_PAIR_SECURITY_ID", "BASE_UNIT_SIZE", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SECURITY_ID", "CREATED_AT", "UPDATED_AT" }; } @@ -43,11 +43,9 @@ public class CurrencyPairSecurityHistoryMapStore extends ASecurityHistoryMapStor object.getId(), object.getBaseUnitSize(), - object.getCurrencyPairId(), object.getCode(), object.getSettlementType(), object.getClearingOrganization(), - object.getSettlementOrganization(), object.getSecurityId(), TimeUtil.toDateFromInstant(object.getCreated()), TimeUtil.toDateFromInstant(object.getUpdated()) diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyPairDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyPairDictionaryMapStore.java index 9182b0975..b8cc48d33 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyPairDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyPairDictionaryMapStore.java @@ -39,8 +39,8 @@ public class CurrencyPairDictionaryMapStore extends DictionaryTMapStore