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

http://jira.mfd.msk:8088/browse/CLS-1027

Browse source
This commit is contained in:
etreschenkov 2026-05-21 13:40:55 +03:00
parent 4b44df76ca
commit 801a35027c
5 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/OrderCurrency.java
View file

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

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

@ -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 */

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

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

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/OrderCurrencyHistoryMapStore.java
View file

@ -54,6 +54,7 @@ public class OrderCurrencyHistoryMapStore extends TemplateEventMapStore<OrderCur
"COMMENT",
"INITIAL_ORDER_ID",
"REGISTRY_ID",
"EXCHANGE_ORDER_ID",
"CREATED_AT",
"UPDATED_AT"
};
@ -94,6 +95,7 @@ public class OrderCurrencyHistoryMapStore extends TemplateEventMapStore<OrderCur
object.getComment(),
object.getInitialOrderId(),
object.getRegistryId(),
object.getExchangeOrderId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated())
};

3
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OrderCurrencyMapStore.java
View file

@ -58,6 +58,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore<OrderCurrency> {
"COMMENT",
"INITIAL_ORDER_ID",
"REGISTRY_ID",
"EXCHANGE_ORDER_ID",
"CREATED_AT",
"UPDATED_AT"
};
@ -113,6 +114,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore<OrderCurrency> {
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<OrderCurrency> {
object.getComment(),
object.getInitialOrderId(),
object.getRegistryId(),
object.getExchangeOrderId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated())
};