From 801a35027c83cf8b39e3dbfcef54c4c200a7e5f6 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Thu, 21 May 2026 13:40:55 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1027 --- .../classes/statics/data/misc/OrderCurrency.java | 9 +++++++++ .../db-scripts/src/main/resources/db/DDL.sql | 10 +++++++--- .../src/main/resources/db/updateDDL_3.26.sql | 11 +++++++++++ .../businessevent/OrderCurrencyHistoryMapStore.java | 2 ++ .../imdg/businessobject/OrderCurrencyMapStore.java | 3 +++ 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.26.sql diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java index 15d024d65..a154c1cc2 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java @@ -31,6 +31,7 @@ public class OrderCurrency extends BusinessObject { private String comment; private Long initialOrderId; private Long registryId; + private Long exchangeOrderId; public Long getSecurityId() { return securityId; @@ -231,4 +232,12 @@ public class OrderCurrency extends BusinessObject { public void setRegistryId(Long registryId) { this.registryId = registryId; } + + public Long getExchangeOrderId() { + return exchangeOrderId; + } + + public void setExchangeOrderId(Long exchangeOrderId) { + this.exchangeOrderId = exchangeOrderId; + } } 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 9b6887605..8f036ef53 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -5585,7 +5585,8 @@ CREATE TABLE ORDER_CURRENCY INITIAL_ORDER_ID BIGINT, CREATED_AT TIMESTAMP, UPDATED_AT TIMESTAMP, - REGISTRY_ID BIGINT + REGISTRY_ID BIGINT, + EXCHANGE_ORDER_ID BIGINT ); COMMENT ON TABLE ORDER_CURRENCY IS 'Заявки для заключения сделок переноса на валютном рынке'; @@ -5617,6 +5618,7 @@ COMMENT ON COLUMN ORDER_CURRENCY.INITIAL_ORDER_ID is 'Номер исходно COMMENT ON COLUMN ORDER_CURRENCY.CREATED_AT is 'Создано'; COMMENT ON COLUMN ORDER_CURRENCY.UPDATED_AT is 'Обновлено'; COMMENT ON COLUMN ORDER_CURRENCY.REGISTRY_ID IS 'Идентификатор регистра'; +COMMENT ON COLUMN ORDER_CURRENCY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс'; GRANT ALL PRIVILEGES ON TABLE ORDER_CURRENCY TO clearing; DROP TABLE IF EXISTS OVERNIGHT_SETTINGS; @@ -5775,6 +5777,7 @@ COMMENT ON COLUMN COMMENT_DICTIONARY.ID IS 'Идентификатор'; COMMENT ON COLUMN COMMENT_DICTIONARY.CODE IS 'Код'; COMMENT ON COLUMN COMMENT_DICTIONARY.NAME IS 'Наименование'; +DROP TABLE IF EXISTS ORDER_CURRENCY_HISTORY; CREATE TABLE ORDER_CURRENCY_HISTORY ( ID bigint PRIMARY KEY, @@ -5806,9 +5809,9 @@ CREATE TABLE ORDER_CURRENCY_HISTORY COMMENT VARCHAR(255), INITIAL_ORDER_ID BIGINT, CREATED_AT TIMESTAMP, - UPDATED_AT TIMESTAMP + UPDATED_AT TIMESTAMP, + EXCHANGE_ORDER_ID BIGINT ); -DROP TABLE IF EXISTS ORDER_CURRENCY_HISTORY; COMMENT ON TABLE ORDER_CURRENCY_HISTORY IS 'История изменений таблицы ORDER_CURRENCY'; COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.ID is 'Идентификатор записи'; @@ -5841,6 +5844,7 @@ COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.COMMENT is 'Комментарий'; COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.INITIAL_ORDER_ID is 'Номер исходной заявки'; COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.CREATED_AT is 'Создано'; COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.UPDATED_AT is 'Обновлено'; +COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс'; GRANT ALL PRIVILEGES ON TABLE ORDER_CURRENCY_HISTORY TO clearing; /* views */ diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.26.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.26.sql new file mode 100644 index 000000000..e43b6a850 --- /dev/null +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.26.sql @@ -0,0 +1,11 @@ +-- DB version: 3.24 -> 3.25 + + +ALTER TABLE ORDER_CURRENCY ADD COLUMN IF NOT EXISTS EXCHANGE_ORDER_ID BIGINT; +COMMENT ON COLUMN ORDER_CURRENCY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс'; + +ALTER TABLE ORDER_CURRENCY_HISTORY ADD COLUMN IF NOT EXISTS EXCHANGE_ORDER_ID BIGINT; +COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс'; + + +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.25') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION; \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/OrderCurrencyHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/OrderCurrencyHistoryMapStore.java index eced19ec0..5524cfca9 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/OrderCurrencyHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/OrderCurrencyHistoryMapStore.java @@ -54,6 +54,7 @@ public class OrderCurrencyHistoryMapStore extends TemplateEventMapStore { "COMMENT", "INITIAL_ORDER_ID", "REGISTRY_ID", + "EXCHANGE_ORDER_ID", "CREATED_AT", "UPDATED_AT" }; @@ -113,6 +114,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore { object.setComment(resultSet.getString("COMMENT")); object.setInitialOrderId(resultSet.getObject("INITIAL_ORDER_ID", Long.class)); object.setRegistryId(resultSet.getObject("REGISTRY_ID", Long.class)); + object.setExchangeOrderId(resultSet.getObject("EXCHANGE_ORDER_ID", Long.class)); object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); return object; @@ -146,6 +148,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore { object.getComment(), object.getInitialOrderId(), object.getRegistryId(), + object.getExchangeOrderId(), TimeUtil.toDateFromInstant(object.getCreated()), TimeUtil.toDateFromInstant(object.getUpdated()) };