From 634e6200f9ac7f656f66304c71aa8df42276bcb8 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 15 Mar 2024 17:14:09 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-613=20DDL?= =?UTF-8?q?=20classes=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=203.1=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?fileName=20=D0=B2=20SDF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/meta/meta.json | 22 ++++++++++++++- .../src/main/resources/meta/meta.xml | 7 ++++- .../backend-api/src/test/resources/meta.json | 22 ++++++++++++++- .../classes/statics/data/sdf/SDf02.java | 9 ++++++ .../classes/statics/data/sdf/SDf03.java | 9 ++++++ .../classes/statics/data/sdf/SDf07.java | 9 ++++++ .../classes/statics/data/sdf/SDf12.java | 9 ++++++ .../classes/statics/data/sdf/SDf53.java | 9 ++++++ .../db-scripts/src/main/resources/db/DDL.sql | 28 +++++++++++++------ .../src/main/resources/db/updateDDL_3.11.sql | 18 +++++++++--- .../clearing/imdg/object/SDf02MapStore.java | 4 ++- .../clearing/imdg/object/SDf03MapStore.java | 4 ++- .../clearing/imdg/object/SDf07MapStore.java | 4 ++- .../clearing/imdg/object/SDf12MapStore.java | 4 ++- .../clearing/imdg/object/SDf53MapStore.java | 10 ++++--- 15 files changed, 144 insertions(+), 24 deletions(-) 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 39b1d5a09..c6f1e6ea5 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -6762,7 +6762,7 @@ "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","visible": true,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , - {"code": "partytradingClearingRegistryId", + {"code": "partyTradingClearingRegistryId", "type": 1,"dbname": "Идентификатор торгово-клирингового регистра","name": "Торгово-клиринговый регистр","shortname": "ТКР","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code" } , @@ -8119,6 +8119,10 @@ {"code": "generationId", "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "inSDfId", "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true,"visible": true @@ -8225,6 +8229,10 @@ {"code": "imp_result", "type": 2,"length": 3,"name": "Результат приема","shortname": "Результат приема","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true @@ -8537,6 +8545,10 @@ {"code": "result", "type": 10,"name": "Код завершения операции","shortname": "Код завершения операции","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true @@ -8823,6 +8835,10 @@ {"code": "result", "type": 2,"length": 255,"name": "Результат операции","shortname": "Результат операции","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true @@ -9213,6 +9229,10 @@ {"code": "result", "type": 2,"length": 255,"name": "Код завершения операции","shortname": "Код завершения операции","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true 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 7b2c1cf59..eb8b67bd8 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1615,7 +1615,7 @@ - + @@ -1927,6 +1927,7 @@ + @@ -1952,6 +1953,7 @@ + @@ -2024,6 +2026,7 @@ + @@ -2088,6 +2091,7 @@ + @@ -2175,6 +2179,7 @@ + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 39b1d5a09..c6f1e6ea5 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -6762,7 +6762,7 @@ "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","visible": true,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , - {"code": "partytradingClearingRegistryId", + {"code": "partyTradingClearingRegistryId", "type": 1,"dbname": "Идентификатор торгово-клирингового регистра","name": "Торгово-клиринговый регистр","shortname": "ТКР","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code" } , @@ -8119,6 +8119,10 @@ {"code": "generationId", "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "inSDfId", "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true,"visible": true @@ -8225,6 +8229,10 @@ {"code": "imp_result", "type": 2,"length": 3,"name": "Результат приема","shortname": "Результат приема","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true @@ -8537,6 +8545,10 @@ {"code": "result", "type": 10,"name": "Код завершения операции","shortname": "Код завершения операции","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true @@ -8823,6 +8835,10 @@ {"code": "result", "type": 2,"length": 255,"name": "Результат операции","shortname": "Результат операции","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true @@ -9213,6 +9229,10 @@ {"code": "result", "type": 2,"length": 255,"name": "Код завершения операции","shortname": "Код завершения операции","searchable": true,"sortable": true,"visible": true } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true + } , {"code": "generationTime", "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java index 3d2608149..2b18ac01f 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java @@ -27,6 +27,7 @@ public class SDf02 extends SpcexObjectBase implements WithAccount { private String sumunblock; private String file_type; private String result; + private String fileName; private Instant generationTime; private Long generationId; private Long inSDfId; @@ -136,6 +137,14 @@ public class SDf02 extends SpcexObjectBase implements WithAccount { this.result = value; } + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + public Instant getGenerationTime() { return generationTime; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java index fd41ea0ea..aa4040012 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java @@ -34,6 +34,7 @@ public class SDf03 extends SpcexObjectBase { private String sum_deb; private String specif_1; private String imp_result; + private String fileName; private Instant generationTime; private Long generationId; private Long paymentInstructionId; @@ -206,6 +207,14 @@ public class SDf03 extends SpcexObjectBase { this.imp_result = imp_result; } + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + public Instant getGenerationTime() { return generationTime; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java index 614790558..31fecc229 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java @@ -26,6 +26,7 @@ public class SDf07 extends SpcexObjectBase { private String spec; private BigDecimal number; private BigDecimal result; + private String fileName; private Instant generationTime; private Long generationId; private Long inSDfId; @@ -121,6 +122,14 @@ public class SDf07 extends SpcexObjectBase { this.result = value; } + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + public Instant getGenerationTime() { return generationTime; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java index fbd878a88..ad112ef7d 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java @@ -23,6 +23,7 @@ public class SDf12 extends SpcexObjectBase { private String transactionNumber; private String transactionQuantity; private String result; + private String fileName; private Instant generationTime; private Long generationId; @@ -98,6 +99,14 @@ public class SDf12 extends SpcexObjectBase { this.result = result; } + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + public Instant getGenerationTime() { return generationTime; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java index 16c208415..ed1038eaa 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java @@ -22,6 +22,7 @@ public class SDf53 extends SpcexObjectBase { private String result; private Instant generationTime; private Long generationId; + private String fileName; private Long inSDfId; private String accName; @@ -81,6 +82,14 @@ public class SDf53 extends SpcexObjectBase { this.generationId = value; } + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + public Long getInSDfId() { return inSDfId; } 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 d3c02b642..1ccd91085 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -3191,7 +3191,7 @@ GRANT ALL PRIVILEGES ON TABLE EXECUTION_FOND_HISTORY TO clearing; -- executionCurrency - Сделки с валютными инструментами DROP TABLE IF EXISTS EXECUTION_CURRENCY; -CREATE TABLE EXECUTION_CURRENCY(EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTYTRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +CREATE TABLE EXECUTION_CURRENCY(EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); COMMENT ON TABLE EXECUTION_CURRENCY IS 'Сделки с валютными инструментами'; COMMENT ON COLUMN EXECUTION_CURRENCY.EXCHANGE_EXECUTION_ID IS 'Идентификационный номер сделки в Торговой системе'; @@ -3214,7 +3214,7 @@ COMMENT ON COLUMN EXECUTION_CURRENCY.SECURITY_NAME IS 'Краткое наиме COMMENT ON COLUMN EXECUTION_CURRENCY.COMPANY_ID IS 'Идентификатор компании (linked to company)'; -COMMENT ON COLUMN EXECUTION_CURRENCY.PARTYTRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; +COMMENT ON COLUMN EXECUTION_CURRENCY.PARTY_TRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; COMMENT ON COLUMN EXECUTION_CURRENCY.PARTY_TRADING_CLEARING_REGISTRY IS 'Торгово-клиринговый регистр '; @@ -3257,7 +3257,7 @@ GRANT ALL PRIVILEGES ON TABLE EXECUTION_CURRENCY TO clearing; -- History log of executionCurrency - Сделки с валютными инструментами DROP TABLE IF EXISTS EXECUTION_CURRENCY_HISTORY; -CREATE TABLE EXECUTION_CURRENCY_HISTORY(EXECUTION_CURRENCY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTYTRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +CREATE TABLE EXECUTION_CURRENCY_HISTORY(EXECUTION_CURRENCY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); COMMENT ON TABLE EXECUTION_CURRENCY_HISTORY IS 'История изменений таблицы executionCurrency'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.EXECUTION_CURRENCY_ID IS 'Идентификатор записи в таблице EXECUTION_CURRENCY'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.EVENT_TIME IS 'Дата и время изменения'; @@ -3284,7 +3284,7 @@ COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.SECURITY_NAME IS 'Краткое н COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.COMPANY_ID IS 'Идентификатор компании (linked to company)'; -COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.PARTYTRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; +COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.PARTY_TRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.PARTY_TRADING_CLEARING_REGISTRY IS 'Торгово-клиринговый регистр '; @@ -3924,7 +3924,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF01 TO clearing; -- sDf02 - ДФ-02 Уведомление об исполнении операции загрузки денежных средств или уведомление об ошибке DROP TABLE IF EXISTS S_DF02; -CREATE TABLE S_DF02(ID bigint PRIMARY KEY, CURR_CODE varchar(12), ACCOUNT varchar(35), REMAINDER varchar(22), DEAL varchar(10), ACC_CODE varchar(5), DAT varchar(8), MARKET varchar(1), ACC_NAME varchar(30), ACC_TYPE varchar(2), SUMENGAGE varchar(22), SUMUNBLOCK varchar(22), FILE_TYPE varchar(1), RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint); +CREATE TABLE S_DF02(ID bigint PRIMARY KEY, CURR_CODE varchar(12), ACCOUNT varchar(35), REMAINDER varchar(22), DEAL varchar(10), ACC_CODE varchar(5), DAT varchar(8), MARKET varchar(1), ACC_NAME varchar(30), ACC_TYPE varchar(2), SUMENGAGE varchar(22), SUMUNBLOCK varchar(22), FILE_TYPE varchar(1), RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, FILE_NAME varchar(255), IN_S_DF_ID bigint); COMMENT ON TABLE S_DF02 IS 'ДФ-02 Уведомление об исполнении операции загрузки денежных средств или уведомление об ошибке'; COMMENT ON COLUMN S_DF02.ID IS 'Идентификатор записи'; @@ -3959,13 +3959,15 @@ COMMENT ON COLUMN S_DF02.GENERATION_TIME IS 'Дата и время создан COMMENT ON COLUMN S_DF02.GENERATION_ID IS 'Идентификатор взаимодействия'; +COMMENT ON COLUMN S_DF02.FILE_NAME IS 'Наименование входящего файла'; + COMMENT ON COLUMN S_DF02.IN_S_DF_ID IS 'Идентификатор соответствующей записи из таблицы-источника'; GRANT ALL PRIVILEGES ON TABLE S_DF02 TO clearing; -- sDf03 - ДФ-03 Реестр платежных поручений DROP TABLE IF EXISTS S_DF03; -CREATE TABLE S_DF03(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SPECIF_1 varchar(255), IMP_RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, PAYMENT_INSTRUCTION_ID bigint); +CREATE TABLE S_DF03(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SPECIF_1 varchar(255), IMP_RESULT varchar(3), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, PAYMENT_INSTRUCTION_ID bigint); COMMENT ON TABLE S_DF03 IS 'ДФ-03 Реестр платежных поручений'; COMMENT ON COLUMN S_DF03.ID IS 'Идентификатор записи'; @@ -4012,6 +4014,8 @@ COMMENT ON COLUMN S_DF03.SPECIF_1 IS 'Назначение платежа'; COMMENT ON COLUMN S_DF03.IMP_RESULT IS 'Результат приема'; +COMMENT ON COLUMN S_DF03.FILE_NAME IS 'Наименование входящего файла'; + COMMENT ON COLUMN S_DF03.GENERATION_TIME IS 'Дата и время создания записи'; COMMENT ON COLUMN S_DF03.GENERATION_ID IS 'Идентификатор взаимодействия'; @@ -4141,7 +4145,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF06 TO clearing; -- sDf07 - ДФ-07 Ответ на запрос по зачислению/списанию денежных средств DROP TABLE IF EXISTS S_DF07; -CREATE TABLE S_DF07(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint, _DOC__NUM varchar(3), _DOC__DATE date, PAY_VAL varchar(12)); +CREATE TABLE S_DF07(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint, _DOC__NUM varchar(3), _DOC__DATE date, PAY_VAL varchar(12)); COMMENT ON TABLE S_DF07 IS 'ДФ-07 Ответ на запрос по зачислению/списанию денежных средств'; COMMENT ON COLUMN S_DF07.ID IS 'Идентификатор записи'; @@ -4168,6 +4172,8 @@ COMMENT ON COLUMN S_DF07.NUMBER IS 'Номер платежного докуме COMMENT ON COLUMN S_DF07.RESULT IS 'Код завершения операции'; +COMMENT ON COLUMN S_DF07.FILE_NAME IS 'Наименование входящего файла'; + COMMENT ON COLUMN S_DF07.GENERATION_TIME IS 'Дата и время создания записи'; COMMENT ON COLUMN S_DF07.GENERATION_ID IS 'Идентификатор взаимодействия'; @@ -4288,7 +4294,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF11 TO clearing; -- sDf12 - ДФ-12 Распоряжение на проведение операций по итогам клиринга DROP TABLE IF EXISTS S_DF12; -CREATE TABLE S_DF12(ID bigint PRIMARY KEY, OUT_DOCUMENT varchar, DIRECTION varchar(255), QUANTITY varchar, SECURITY_CODE varchar, DEPO_CODE_SENDER varchar, DEPO_CODE_ADRESSEE varchar, TRANSACTION_NUMBER varchar(255), TRANSACTION_QUANTITY varchar(255), RESULT varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint); +CREATE TABLE S_DF12(ID bigint PRIMARY KEY, OUT_DOCUMENT varchar, DIRECTION varchar(255), QUANTITY varchar, SECURITY_CODE varchar, DEPO_CODE_SENDER varchar, DEPO_CODE_ADRESSEE varchar, TRANSACTION_NUMBER varchar(255), TRANSACTION_QUANTITY varchar(255), RESULT varchar(255), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint); COMMENT ON TABLE S_DF12 IS 'ДФ-12 Распоряжение на проведение операций по итогам клиринга'; COMMENT ON COLUMN S_DF12.ID IS 'Идентификатор записи'; @@ -4311,6 +4317,8 @@ COMMENT ON COLUMN S_DF12.TRANSACTION_QUANTITY IS 'Количество тран COMMENT ON COLUMN S_DF12.RESULT IS 'Результат операции'; +COMMENT ON COLUMN S_DF12.FILE_NAME IS 'Наименование входящего файла'; + COMMENT ON COLUMN S_DF12.GENERATION_TIME IS 'Дата и время создания записи'; COMMENT ON COLUMN S_DF12.GENERATION_ID IS 'Идентификатор взаимодействия'; @@ -4489,7 +4497,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF52 TO clearing; -- sDf53 - ДФ-53 Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие/открытие) DROP TABLE IF EXISTS S_DF53; -CREATE TABLE S_DF53(ID bigint PRIMARY KEY, ACC_NAME varchar(30), ACCOUNT varchar(25), DEAL varchar(4), DATE varchar(8), STATUS bigint, RESULT varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint); +CREATE TABLE S_DF53(ID bigint PRIMARY KEY, ACC_NAME varchar(30), ACCOUNT varchar(25), DEAL varchar(4), DATE varchar(8), STATUS bigint, RESULT varchar(255), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint); COMMENT ON TABLE S_DF53 IS 'ДФ-53 Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие/открытие)'; COMMENT ON COLUMN S_DF53.ID IS 'Идентификатор записи'; @@ -4506,6 +4514,8 @@ COMMENT ON COLUMN S_DF53.STATUS IS 'Статус счета'; COMMENT ON COLUMN S_DF53.RESULT IS 'Код завершения операции'; +COMMENT ON COLUMN S_DF53.FILE_NAME IS 'Наименование входящего файла'; + COMMENT ON COLUMN S_DF53.GENERATION_TIME IS 'Дата и время создания записи'; COMMENT ON COLUMN S_DF53.GENERATION_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 b15e7b1fc..12ca0afd4 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 @@ -133,7 +133,7 @@ GRANT ALL PRIVILEGES ON TABLE TRADING_CLEARING_REGISTRY_LIST_HISTORY TO clearing -- executionCurrency - Сделки с валютными инструментами DROP TABLE IF EXISTS EXECUTION_CURRENCY; -CREATE TABLE EXECUTION_CURRENCY(EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTYTRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +CREATE TABLE EXECUTION_CURRENCY(EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); COMMENT ON TABLE EXECUTION_CURRENCY IS 'Сделки с валютными инструментами'; COMMENT ON COLUMN EXECUTION_CURRENCY.EXCHANGE_EXECUTION_ID IS 'Идентификационный номер сделки в Торговой системе'; COMMENT ON COLUMN EXECUTION_CURRENCY.EXCHANGE_EXECUTION_TIME IS 'Время заключения сделки в Торговой системе'; @@ -145,7 +145,7 @@ COMMENT ON COLUMN EXECUTION_CURRENCY.SECURITY_ID IS 'Идентификатор COMMENT ON COLUMN EXECUTION_CURRENCY.SECURITY_SYMBOL IS 'Код инструмента в Торговой Системе'; COMMENT ON COLUMN EXECUTION_CURRENCY.SECURITY_NAME IS 'Краткое наименование инструмента'; COMMENT ON COLUMN EXECUTION_CURRENCY.COMPANY_ID IS 'Идентификатор компании (linked to company)'; -COMMENT ON COLUMN EXECUTION_CURRENCY.PARTYTRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; +COMMENT ON COLUMN EXECUTION_CURRENCY.PARTY_TRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; COMMENT ON COLUMN EXECUTION_CURRENCY.PARTY_TRADING_CLEARING_REGISTRY IS 'Торгово-клиринговый регистр '; COMMENT ON COLUMN EXECUTION_CURRENCY.COUNTER_PARTY_ID IS 'Идентификатор компании-партнера, с которой заключена сделка (linked to company)'; COMMENT ON COLUMN EXECUTION_CURRENCY.COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра партнера (linked to tradingClearingRegistry)'; @@ -169,7 +169,7 @@ GRANT ALL PRIVILEGES ON TABLE EXECUTION_CURRENCY TO clearing; -- History log of executionCurrency - Сделки с валютными инструментами DROP TABLE IF EXISTS EXECUTION_CURRENCY_HISTORY; -CREATE TABLE EXECUTION_CURRENCY_HISTORY(EXECUTION_CURRENCY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTYTRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +CREATE TABLE EXECUTION_CURRENCY_HISTORY(EXECUTION_CURRENCY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, EXCHANGE_EXECUTION_MICROSECONDS timestamp, TRADING_DATE date, SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), SECURITY_NAME varchar(255), COMPANY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY_ID bigint, PARTY_TRADING_CLEARING_REGISTRY varchar(20), COUNTER_PARTY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID bigint, COUNTER_PARTY_TRADING_CLEARING_REGISTRY varchar(20), MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), SETTLEMENT_AMOUNT numeric(72,2), QUANTITY numeric(72,2), SIDE varchar(4), _сURRENCY_CODE varchar(4), SETTLEMENT_ORGANIZATION varchar(255), COVERAGE_STATUS varchar(4), SESSION_ID bigint, CLEARING_DATE date, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); COMMENT ON TABLE EXECUTION_CURRENCY_HISTORY IS 'История изменений таблицы executionCurrency'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.EXECUTION_CURRENCY_ID IS 'Идентификатор записи в таблице EXECUTION_CURRENCY'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.EVENT_TIME IS 'Дата и время изменения'; @@ -185,7 +185,7 @@ COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.SECURITY_ID IS 'Идентифик COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.SECURITY_SYMBOL IS 'Код инструмента в Торговой Системе'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.SECURITY_NAME IS 'Краткое наименование инструмента'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.COMPANY_ID IS 'Идентификатор компании (linked to company)'; -COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.PARTYTRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; +COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.PARTY_TRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра (linked to tradingClearingRegistry)'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.PARTY_TRADING_CLEARING_REGISTRY IS 'Торгово-клиринговый регистр '; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.COUNTER_PARTY_ID IS 'Идентификатор компании-партнера, с которой заключена сделка (linked to company)'; COMMENT ON COLUMN EXECUTION_CURRENCY_HISTORY.COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID IS 'Идентификатор торгово-клирингового регистра партнера (linked to tradingClearingRegistry)'; @@ -319,6 +319,16 @@ COMMENT ON COLUMN S_DF57.KT_IN IS 'Входящий кредитовый ост COMMENT ON COLUMN S_DF57.DT_OUT IS 'Исходящий дебетовый остаток'; COMMENT ON COLUMN S_DF57.KT_OUT IS 'Исходящий кредитовый остаток'; +ALTER TABLE S_DF02 ADD COLUMN IF NOT EXISTS FILE_NAME varchar(255); +ALTER TABLE S_DF03 ADD COLUMN IF NOT EXISTS FILE_NAME varchar(255); +ALTER TABLE S_DF07 ADD COLUMN IF NOT EXISTS FILE_NAME varchar(255); +ALTER TABLE S_DF12 ADD COLUMN IF NOT EXISTS FILE_NAME varchar(255); +ALTER TABLE S_DF53 ADD COLUMN IF NOT EXISTS FILE_NAME varchar(255); +COMMENT ON COLUMN S_DF02.FILE_NAME IS 'Наименование входящего файла'; +COMMENT ON COLUMN S_DF03.FILE_NAME IS 'Наименование входящего файла'; +COMMENT ON COLUMN S_DF07.FILE_NAME IS 'Наименование входящего файла'; +COMMENT ON COLUMN S_DF12.FILE_NAME IS 'Наименование входящего файла'; +COMMENT ON COLUMN S_DF53.FILE_NAME IS 'Наименование входящего файла'; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java index 2b911dd37..7645c4d88 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java @@ -33,7 +33,7 @@ public class SDf02MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CURR_CODE", "ACCOUNT", "REMAINDER", "DEAL", "ACC_CODE", "DAT", "MARKET", "ACC_NAME", "ACC_TYPE", "SUMENGAGE", "SUMUNBLOCK", "FILE_TYPE", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID" + "ID", "CURR_CODE", "ACCOUNT", "REMAINDER", "DEAL", "ACC_CODE", "DAT", "MARKET", "ACC_NAME", "ACC_TYPE", "SUMENGAGE", "SUMUNBLOCK", "FILE_TYPE", "RESULT", "GENERATION_TIME", "GENERATION_ID", "FILE_NAME", "IN_S_DF_ID" }; } @@ -71,6 +71,7 @@ public class SDf02MapStore extends TemplateMapStore { object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); return object; } @@ -94,6 +95,7 @@ public class SDf02MapStore extends TemplateMapStore { object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), + object.getFileName(), object.getInSDfId() }; return args; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java index 94ba1aded..d0877b2f9 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java @@ -33,7 +33,7 @@ public class SDf03MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SPECIF_1", "IMP_RESULT", "GENERATION_TIME", "GENERATION_ID", "PAYMENT_INSTRUCTION_ID" + "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SPECIF_1", "IMP_RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "PAYMENT_INSTRUCTION_ID" }; } @@ -77,6 +77,7 @@ public class SDf03MapStore extends TemplateMapStore { object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); object.setSpecif_1(resultSet.getObject("SPECIF_1", String.class)); object.setImp_result(resultSet.getObject("IMP_RESULT", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setPaymentInstructionId(resultSet.getObject("PAYMENT_INSTRUCTION_ID", Long.class)); @@ -108,6 +109,7 @@ public class SDf03MapStore extends TemplateMapStore { object.getSum_deb(), object.getSpecif_1(), object.getImp_result(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), object.getPaymentInstructionId() diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java index 3a31dda91..a974e196a 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java @@ -35,7 +35,7 @@ public class SDf07MapStore extends TemplateMapStore { public String[] getFields() { return new String[]{ "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "DEAL", "CLIENT_N", "INN", "BIC", "SPEC", "NUMBER", "RESULT", - "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID", "_DOC__NUM", "_DOC__DATE", "PAY_VAL" + "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID", "_DOC__NUM", "_DOC__DATE", "PAY_VAL" }; } @@ -69,6 +69,7 @@ public class SDf07MapStore extends TemplateMapStore { object.setSpec(resultSet.getObject("SPEC", String.class)); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); @@ -93,6 +94,7 @@ public class SDf07MapStore extends TemplateMapStore { object.getSpec(), object.getNumber(), object.getResult(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), object.getInSDfId(), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java index e30e85a57..93ab07d88 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java @@ -34,7 +34,7 @@ public class SDf12MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "OUT_DOCUMENT", "DIRECTION", "QUANTITY", "SECURITY_CODE", "DEPO_CODE_SENDER", "DEPO_CODE_ADRESSEE", "TRANSACTION_NUMBER", "TRANSACTION_QUANTITY", "RESULT", "GENERATION_TIME", "GENERATION_ID" + "ID", "OUT_DOCUMENT", "DIRECTION", "QUANTITY", "SECURITY_CODE", "DEPO_CODE_SENDER", "DEPO_CODE_ADRESSEE", "TRANSACTION_NUMBER", "TRANSACTION_QUANTITY", "RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -66,6 +66,7 @@ public class SDf12MapStore extends TemplateMapStore { object.setTransactionNumber(resultSet.getObject("TRANSACTION_NUMBER", String.class)); object.setTransactionQuantity(resultSet.getObject("TRANSACTION_QUANTITY", String.class)); object.setResult(resultSet.getObject("RESULT", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -84,6 +85,7 @@ public class SDf12MapStore extends TemplateMapStore { object.getTransactionNumber(), object.getTransactionQuantity(), object.getResult(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java index a2abf5190..6a5617434 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java @@ -33,7 +33,7 @@ public class SDf53MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "DEAL", "DATE", "STATUS", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID", "ACC_NAME" + "ID", "ACC_NAME", "ACCOUNT", "DEAL", "DATE", "STATUS", "RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID" }; } @@ -56,15 +56,16 @@ public class SDf53MapStore extends TemplateMapStore { public SDf53 objectReader(ResultSet resultSet) throws SQLException { SDf53 object = new SDf53(); object.setId(resultSet.getObject("ID", Long.class)); + object.setAccName(resultSet.getObject("ACC_NAME", String.class)); object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setDeal(resultSet.getObject("DEAL", String.class)); object.setDate(resultSet.getObject("DATE", String.class)); object.setStatus(resultSet.getObject("STATUS", Long.class)); object.setResult(resultSet.getObject("RESULT", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); - object.setAccName(resultSet.getObject("ACC_NAME", String.class)); return object; } @@ -72,15 +73,16 @@ public class SDf53MapStore extends TemplateMapStore { public Object[] objectToField(SDf53 object) { Object[] args = new Object[]{ object.getId(), + object.getAccName(), object.getAccount(), object.getDeal(), object.getDate(), object.getStatus(), object.getResult(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getInSDfId(), - object.getAccName() + object.getInSDfId() }; return args; }