treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meta ddl http://jira.mfd.msk:8088/browse/CLS-664 с currencyPairSecurity, мелкие правки

Browse source
This commit is contained in:
AKurakin 2024-04-25 16:54:50 +03:00
parent 5891ad4994
commit 07db668092
13 changed files with 58 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clearing-parent/backend-api/src/main/resources/meta/data.xml
View file

@ -96,9 +96,9 @@
<currencyCode id="840" code="USD" name="Доллар США"/>
<currencyCode id="978" code="EUR" name="Евро"/>
<currencyCode id="156" code="CNY" name="Китайский Юань"/>
<currencyPair id="1" code="EUR/RUB" baseCurrencyId="EUR" quoteCurrencyId="RUB" majorSign="CONV"/>
<currencyPair id="2" code="USD/RUB" baseCurrencyId="USD" quoteCurrencyId="RUB" majorSign="CONV"/>
<currencyPair id="3" code="CNY/RUВ" baseCurrencyId="CNY" quoteCurrencyId="RUВ" majorSign="CONV"/>
<currencyPair id="1" code="EUR/RUB" baseCurrency="EUR" quoteCurrency="RUB" majorSign="CONV"/>
<currencyPair id="2" code="USD/RUB" baseCurrency="USD" quoteCurrency="RUB" majorSign="CONV"/>
<currencyPair id="3" code="CNY/RUВ" baseCurrency="CNY" quoteCurrency="RUВ" majorSign="CONV"/>
<instrumentType id="1" code="RATE" name="Инструмент Денежного рынка"/>
<instrumentType id="2" code="CRNC" name="Валюта"/>
<instrumentType id="3" code="EQTY" name="Акция"/>

6
clearing-parent/backend-api/src/main/resources/meta/meta.json
View file

@ -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",

6
clearing-parent/backend-api/src/main/resources/meta/meta.xml
View file

@ -310,8 +310,8 @@
<currencyPair name="Справочник валютных пар" class="ru.clearing.platform.dictionary.CurrencyPairDictionary" table="currency_pair">
<id name="Идентификатор" shortname="ID" type="1"/>
<code name="Код" shortname="Код" type="2" length="25"/>
<baseCurrencyId name="Код валюты лота" shortname="Валюта лота" link="currencyCode" type="12"/>
<quoteCurrencyId name="Код сопряженной валюты" shortname="Сопряженная валюта" link="currencyCode" type="12"/>
<baseCurrency name="Код валюты лота" shortname="Валюта лота" link="currencyCode" type="12"/>
<quoteCurrency name="Код сопряженной валюты" shortname="Сопряженная валюта" link="currencyCode" type="12"/>
<majorSign name="Код признака конвертируемости валюты" shortname="Конвертируемость валюты" link="majorSign" type="12"/>
</currencyPair>
<gatewayResultStatus name="Справочник статусов обработки" class="ru.clearing.platform.dictionary.GatewayResultStatusDictionary" table="gateway_result_status">
@ -1686,7 +1686,7 @@
<outSDfId type="2" length="255" name="Идентификатор исходящего файла" shortname="Исходящий файл" searchable="true" sortable="true" ignore="true"/>
<outSDf type="2" length="255" name="Исходящий файл" shortname="Исходящий файл" searchable="true" sortable="true" visible="true"/>
</pairSdf>
<gatewayResult name="Результат запроса к gateway" destination="gateway-result" class="ru.clearing.classes.statics.data.register.GatewayResult" table="gateway_result">
<gatewayResult name="Результаты запросов к ТС" destination="gateway-result" class="ru.clearing.classes.statics.data.register.GatewayResult" table="gateway_result">
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
<createdAt field="created" type="4" webtype="5" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" visible="true"/>
<updatedAt field="updated" type="4" webtype="5" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" visible="true"/>

6
clearing-parent/backend-api/src/test/resources/meta.json
View file

@ -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",

20
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java
View file

@ -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;
}

8
clearing-parent/db-scripts/src/main/resources/db/DATA.sql
View file

@ -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;

34
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -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 'Идентификатор записи';

20
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql
View file

@ -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 'Время изменения записи';

20
clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CurrencyPairDictionary.java
View file

@ -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() {

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java
View file

@ -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())

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CurrencyPairDictionaryMapStore.java
View file

@ -39,8 +39,8 @@ public class CurrencyPairDictionaryMapStore extends DictionaryTMapStore<Currency
dictionary.setId(rs.getLong("id"));
dictionary.setCode(rs.getString("code"));
// dictionary.setName(rs.getString("name"));
dictionary.setBaseCurrencyId(rs.getString("base_currency_id"));
dictionary.setQuoteCurrencyId(rs.getString("quote_currency_id"));
dictionary.setBaseCurrency(rs.getString("base_currency"));
dictionary.setQuoteCurrency(rs.getString("quote_currency"));
dictionary.setMajorSign(rs.getString("major_sign"));
return dictionary;
}

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java
View file

@ -32,7 +32,7 @@ public class CurrencyPairSecurityMapStore extends ASecurityMapStore<CurrencyPair
@Override
public String[] getFields() {
return new String[]{
"BASE_UNIT_SIZE", "CURRENCY_PAIR_ID", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SETTLEMENT_ORGANIZATION", "SECURITY_ID", "ID", "CREATED_AT", "UPDATED_AT"
"BASE_UNIT_SIZE", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SECURITY_ID", "ID", "CREATED_AT", "UPDATED_AT"
};
}
@ -40,11 +40,9 @@ public class CurrencyPairSecurityMapStore extends ASecurityMapStore<CurrencyPair
public CurrencyPairSecurity objectReader(ResultSet resultSet) throws SQLException {
CurrencyPairSecurity object = new CurrencyPairSecurity();
object.setBaseUnitSize(resultSet.getObject("BASE_UNIT_SIZE", BigDecimal.class));
object.setCurrencyPairId(resultSet.getObject("CURRENCY_PAIR_ID", Long.class));
object.setCode(resultSet.getObject("CODE", String.class));
object.setSettlementType(resultSet.getObject("SETTLEMENT_TYPE", String.class));
object.setClearingOrganization(resultSet.getObject("CLEARING_ORGANIZATION", String.class));
object.setSettlementOrganization(resultSet.getObject("SETTLEMENT_ORGANIZATION", String.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
object.setId(resultSet.getObject("ID", Long.class));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
@ -58,11 +56,9 @@ public class CurrencyPairSecurityMapStore extends ASecurityMapStore<CurrencyPair
public Object[] objectToField(CurrencyPairSecurity object) {
Object[] args = new Object[]{
object.getBaseUnitSize(),
object.getCurrencyPairId(),
object.getCode(),
object.getSettlementType(),
object.getClearingOrganization(),
object.getSettlementOrganization(),
object.getSecurityId(),
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),

4
clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/AllMapStoreTest.java
View file

@ -280,8 +280,8 @@ public class AllMapStoreTest {
args = new Object[]{companySymbolDictionary.getId(), companySymbolDictionary.getCode(), companySymbolDictionary.getName(), companySymbolDictionary.getShortname()};
} else if (mapName.equals(IMDGDistributedNames.Map_CurrencyPairDictionary)) {
CurrencyPairDictionary currencyPairDictionary = (CurrencyPairDictionary) dictionaryObj;
fields = new String[]{"ID", "CODE", "BASE_CURRENCY_ID", "QUOTE_CURRENCY_ID", "MAJOR_SIGN"};
args = new Object[]{currencyPairDictionary.getId(), currencyPairDictionary.getCode(), currencyPairDictionary.getBaseCurrencyId(), currencyPairDictionary.getQuoteCurrencyId(), currencyPairDictionary.getMajorSign()};
fields = new String[]{"ID", "CODE", "BASE_CURRENCY", "QUOTE_CURRENCY", "MAJOR_SIGN"};
args = new Object[]{currencyPairDictionary.getId(), currencyPairDictionary.getCode(), currencyPairDictionary.getBaseCurrency(), currencyPairDictionary.getQuoteCurrency(), currencyPairDictionary.getMajorSign()};
} else {
fields = new String[]{"ID", "CODE", "NAME"};
args = new Object[]{dictionaryObj.getId(), dictionaryObj.getCode(), dictionaryObj.getName()};