diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrades.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrades.java index 6601452fc..cbeaa1c23 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrades.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrades.java @@ -60,6 +60,8 @@ public class STrades extends BusinessObject { private Long tradeTimeMs; private String bankAccId; private String section; + private String kind; + private Long linkedTrade; public Long getTradeNum() { return tradeNum; @@ -412,4 +414,20 @@ public class STrades extends BusinessObject { public void setSection(String section) { this.section = section; } + + public String getKind() { + return kind; + } + + public void setKind(String kind) { + this.kind = kind; + } + + public Long getLinkedTrade() { + return linkedTrade; + } + + public void setLinkedTrade(Long linkedTrade) { + this.linkedTrade = linkedTrade; + } } 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 9d1dc03b7..602ff4fca 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -2850,7 +2850,7 @@ GRANT ALL PRIVILEGES ON TABLE SESSION_HISTORY TO clearing; -- sTrades - Сделки из Торговой системы DROP TABLE IF EXISTS S_TRADES; -CREATE TABLE S_TRADES(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, TRADE_NUM bigint, OPERATION varchar(40), CLASS_CODE varchar(255), TRADE_DATE date, SEC_CODE varchar(255), ACCRUEDINT numeric(72,18), ACCRUEDINT2 numeric(72,18), LOWER_DISCOUNT numeric(72,18), ORDER_NUM bigint, PRICE numeric(72,18), PRICE2 numeric(72,18), REPO_RATE numeric(72,18), REPO_VALUE numeric(72,18), REPO2_VALUE numeric(72,18), START_DISCOUNT numeric(72,18), TS_COMMISSION numeric(72,18), UPPER_DISCOUNT numeric(72,18), VALUE numeric(72,18), YIELD numeric(72,18), QTY numeric(72,18), QTY_PCS numeric(72,18), TRADE_DATE_TIME timestamp, REPO_TERM bigint, CLEARING_COMMISSION numeric(72,18), EXCHANGE_COMMISSION numeric(72,18), TECH_CENTER_COMMISSION numeric(72,18), ACCOUNT varchar(50), BROKER_REF varchar(34), CLIENT_CODE varchar(255), SETTLE_CODE varchar(50), USER_ID varchar(32), EXCHANGE_CODE varchar(64), FIRM_ID varchar(255), FIRM_NAME varchar(255), CP_FIRM_ID varchar(255), CP_FIRM_NAME varchar(255), CLASS_NAME varchar(255), SEC_NAME varchar(255), SETTLE_DATE date, SETTLE_CURRENCY varchar(4), TRADE_CURRENCY varchar(4), TRADE_TIME_MS bigint, BANK_ACC_ID varchar(12), SECTION varchar(4)); +CREATE TABLE S_TRADES(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, TRADE_NUM bigint, OPERATION varchar(40), CLASS_CODE varchar(255), TRADE_DATE date, SEC_CODE varchar(255), ACCRUEDINT numeric(72,18), ACCRUEDINT2 numeric(72,18), LOWER_DISCOUNT numeric(72,18), ORDER_NUM bigint, PRICE numeric(72,18), PRICE2 numeric(72,18), REPO_RATE numeric(72,18), REPO_VALUE numeric(72,18), REPO2_VALUE numeric(72,18), START_DISCOUNT numeric(72,18), TS_COMMISSION numeric(72,18), UPPER_DISCOUNT numeric(72,18), VALUE numeric(72,18), YIELD numeric(72,18), QTY numeric(72,18), QTY_PCS numeric(72,18), TRADE_DATE_TIME timestamp, REPO_TERM bigint, CLEARING_COMMISSION numeric(72,18), EXCHANGE_COMMISSION numeric(72,18), TECH_CENTER_COMMISSION numeric(72,18), ACCOUNT varchar(50), BROKER_REF varchar(34), CLIENT_CODE varchar(255), SETTLE_CODE varchar(50), USER_ID varchar(32), EXCHANGE_CODE varchar(64), FIRM_ID varchar(255), FIRM_NAME varchar(255), CP_FIRM_ID varchar(255), CP_FIRM_NAME varchar(255), CLASS_NAME varchar(255), SEC_NAME varchar(255), SETTLE_DATE date, SETTLE_CURRENCY varchar(4), TRADE_CURRENCY varchar(4), TRADE_TIME_MS bigint, BANK_ACC_ID varchar(12), SECTION varchar(4), KIND varchar(64), LINKED_TRADE bigint); COMMENT ON TABLE S_TRADES IS 'Сделки из Торговой системы'; COMMENT ON COLUMN S_TRADES.ID IS 'Идентификатор записи'; @@ -2947,6 +2947,10 @@ COMMENT ON COLUMN S_TRADES.BANK_ACC_ID IS 'Идентификатор расче COMMENT ON COLUMN S_TRADES.SECTION IS 'Код наименования секции (linked to section)'; +COMMENT ON COLUMN S_TRADES.KIND IS 'Вид сделки'; + +COMMENT ON COLUMN S_TRADES.LINKED_TRADE IS 'Номер витринной сделки в торговой системе для сделок'; + GRANT ALL PRIVILEGES ON TABLE S_TRADES TO clearing; -- executionDeposit - Сделки на секции МКР diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.15.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.15.sql index d7a296b16..69c62ddb2 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.15.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.15.sql @@ -64,6 +64,12 @@ COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.PERSONAL_ACCOUNT IS ' COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.BUDGET_CLASSIFICATION_CODE IS ''; COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.OKTMO IS ' '; + +ALTER TABLE S_TRADES ADD COLUMN IF NOT EXISTS KIND varchar(64); +ALTER TABLE S_TRADES ADD COLUMN IF NOT EXISTS LINKED_TRADE bigint; +COMMENT ON COLUMN S_TRADES.KIND IS ' '; +COMMENT ON COLUMN S_TRADES.LINKED_TRADE IS ' '; + DROP TABLE IF EXISTS RISK_PARAMETER; CREATE TABLE RISK_PARAMETER ( diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java index ec3645a21..51a9b592d 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java @@ -40,7 +40,8 @@ public class STradesMapStore extends TemplateMapStore { "QTY", "QTY_PCS", "TRADE_DATE_TIME", "REPO_TERM", "CLEARING_COMMISSION", "EXCHANGE_COMMISSION", "TECH_CENTER_COMMISSION", "ACCOUNT", "BROKER_REF", "CLIENT_CODE", "SETTLE_CODE", "USER_ID", "EXCHANGE_CODE", "FIRM_ID", "FIRM_NAME", "CP_FIRM_ID", "CP_FIRM_NAME", "CLASS_NAME", "SEC_NAME", - "SETTLE_DATE", "SETTLE_CURRENCY", "TRADE_CURRENCY", "TRADE_TIME_MS", "BANK_ACC_ID", "SECTION" + "SETTLE_DATE", "SETTLE_CURRENCY", "TRADE_CURRENCY", "TRADE_TIME_MS", "BANK_ACC_ID", "SECTION", + "KIND", "LINKED_TRADE" }; } @@ -103,6 +104,8 @@ public class STradesMapStore extends TemplateMapStore { object.setTradeTimeMs(resultSet.getObject("TRADE_TIME_MS", Long.class)); object.setBankAccId(resultSet.getObject("BANK_ACC_ID", String.class)); object.setSection(resultSet.getObject("SECTION", String.class)); + object.setKind(resultSet.getObject("KIND", String.class)); + object.setLinkedTrade(resultSet.getObject("LINKED_TRADE", Long.class)); return object; } @@ -155,7 +158,9 @@ public class STradesMapStore extends TemplateMapStore { object.getTradeCurrency(), object.getTradeTimeMs(), object.getBankAccId(), - object.getSection() + object.getSection(), + object.getKind(), + object.getLinkedTrade() }; return args; }