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

http://jira.mfd.msk:8088/browse/CLS-957 // http://jira.mfd.msk:8088/browse/CLS-951 // http://jira.mfd.msk:8088/browse/CLS-949 // http://jira.mfd.msk:8088/browse/CLS-910

Browse source
This commit is contained in:
etreschenkov 2026-04-07 14:21:39 +03:00
parent 7614aa88ed
commit cf9c333b53
15 changed files with 170 additions and 15 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

@ -29,6 +29,7 @@ public class OrderCurrency extends BusinessObject {
private String status;
private String comment;
private Long initialOrderId;
private Long registryId;
public Long getSecurityId() {
return securityId;
@ -213,4 +214,12 @@ public class OrderCurrency extends BusinessObject {
public void setInitialOrderId(Long initialOrderId) {
this.initialOrderId = initialOrderId;
}
public Long getRegistryId() {
return registryId;
}
public void setRegistryId(Long registryId) {
this.registryId = registryId;
}
}

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/RiskParameter.java
View file

@ -9,6 +9,7 @@ public class RiskParameter extends BusinessObject {
private String currencyPair;
private Long currencyPairId;
private String workflowStatus;
private BigDecimal quoteValue;
public BigDecimal getValue() {
return value;
@ -49,4 +50,12 @@ public class RiskParameter extends BusinessObject {
public void setWorkflowStatus(String workflowStatus) {
this.workflowStatus = workflowStatus;
}
public BigDecimal getQuoteValue() {
return quoteValue;
}
public void setQuoteValue(BigDecimal quoteValue) {
this.quoteValue = quoteValue;
}
}

29
clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
View file

@ -743,6 +743,9 @@ INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (34, 'CX84', 'Формиро
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (35, 'GVTF', 'Проведение сверки по регистрам AMAT и AMAF') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (36, 'LORT', 'Загрузка курсов валют') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (37, 'CROR', 'Создание заявок') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (38, 'SDOR', 'Отправка заявок в Торговую систему') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (39, 'ORST', 'Получение статуса заявок из Торговой системы') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_STATUS_DICTIONARY(ID, CODE, NAME) values (1, 'ACTV', 'Активна') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@ -842,6 +845,8 @@ INSERT INTO MARKET_TYPE_DICTIONARY(ID, CODE, NAME) values (2, 'SCND', 'Втор
INSERT INTO MARKET_TYPE_DICTIONARY(ID, CODE, NAME) values (3, 'SCSW ', 'Вторичные торги СВОП') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO MARKET_TYPE_DICTIONARY(ID, CODE, NAME) values (4, 'SCSP ', 'Вторичные торги СПОТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO STATEMENT_TYPE_DICTIONARY(ID, CODE, NAME) values (1, 'FULL', 'Установка суммы') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO STATEMENT_TYPE_DICTIONARY(ID, CODE, NAME) values (2, 'INCR', 'Изменение суммы') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@ -1322,12 +1327,34 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (10000, 'TRDI', 'Общ
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (10001, 'TRDI', 'Сделка с номером в ТС = %s некорректна.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (11000, 'DFLT', 'Общая ошибка модуля default-management') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (11001, 'DFLT', 'Запись не найдена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (11002, 'DFLT', 'Запись уже существует') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (11003, 'DFLT', 'Добавление ДУК возможно только для балансирующих сделок ПЛ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (11004, 'DFLT', 'Изменение ДУК возможно только для балансирующих сделок ПЛ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO RESIDENCE_DICTIONARY(ID, CODE, NAME) values (1, 'RUS', 'Резидент РФ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO RESIDENCE_DICTIONARY(ID, CODE, NAME) values (2, 'XTRN', 'Нерезидент РФ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO RESIDENCE_DICTIONARY(ID, CODE, NAME) values (3, 'WRLD', 'Международная организация') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO OVERNIGHT_TYPE_DICTIONARY(ID, CODE, NAME) values (1, 'SWAP', 'СВОП') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO OVERNIGHT_TYPE_DICTIONARY(ID, CODE, NAME) values (2, 'SPOT', 'СПОТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (1, 'CMOV', 'УК – сделки переноса') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (2, 'CMBL', 'УК – балансирующие сделки') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (3, 'PLOV', 'ПЛ – сделки переноса') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (4, 'PLBL', 'ПЛ – балансирующие сделки') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (1, 'CRET', 'Создана') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (2, 'HOLD', 'Отложена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (3, 'NEW', 'Выставлена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (4, 'PTFL', 'Частично исполнена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (5, 'FILL', 'Полностью исполнена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (6, 'CNCL', 'Снята') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (7, 'REPL', 'Заменена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (8, 'RJCT', 'Отклонена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
/* Business objects */
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.22.0.104') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.23.0.105') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION

6
clearing-parent/db-scripts/src/main/resources/db/MARKET_LCC.sql
View file

@ -1,5 +1,5 @@
-- DB version: 3.21
-- MARKET LCC version: 3.21.0.0
-- DB version: 3.23
-- MARKET LCC version: 3.23.0.0
/* Dictionaries */
@ -7,5 +7,5 @@
/* Business objects */
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (1000, 'SCND', 'CURR', 'RUB', 'UVAK', 'Режим непрерывных торгов (торги иностранной валютой с Провайдером ликвидности)', 1, 'Continuous trading mode (foreign currency trading with a Liquidity Provider)') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (1001, 'SCND', 'CURR', 'RUB', 'TVAK', 'Технический режим переговорных сделок для сделок урегулирования', 1, 'Technical negotiated deals mode for settlement') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (1001, 'SCSP', 'CURR', 'RUB', 'TVAK', 'Технический режим переговорных сделок для сделок урегулирования', 1, 'Technical negotiated deals mode for settlement') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (1002, 'SCSW', 'CURR', 'RUB', 'TVWK', 'Технический режим витринных переговорных сделок для сделок урегулирования', 1, 'Technical negotiated showcase deals mode for settlement') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;

6
clearing-parent/db-scripts/src/main/resources/db/MARKET_efis.sql
View file

@ -1,5 +1,5 @@
-- DB version: 3.19
-- MARKET LCC version: 3.19.0.1
-- DB version: 3.23
-- MARKET LCC version: 3.23.0.0
/* Dictionaries */
@ -7,5 +7,5 @@
/* Business objects */
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (2000, 'SCND', 'CURR', 'RUB', 'UVAF', 'Режим непрерывных торгов (торги иностранной валютой с Провайдером ликвидности)', 1, 'Continuous trading mode (foreign currency trading with a Liquidity Provider)') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (2001, 'SCND', 'CURR', 'RUB', 'TVAF', 'Технический режим переговорных сделок для сделок урегулирования', 1, 'Technical negotiated deals mode for settlement') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (2001, 'SCSP', 'CURR', 'RUB', 'TVAF', 'Технический режим переговорных сделок для сделок урегулирования', 1, 'Technical negotiated deals mode for settlement') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;
INSERT INTO MARKET(ID, MARKET_TYPE, SECTION, SETTLEMENT_CURRENCY, CODE, NAME, EXCHANGE_ID, DESCRIPTION) values (2002, 'SCSW', 'CURR', 'RUB', 'TVWF', 'Технический режим витринных переговорных сделок для сделок урегулирования', 1, 'Technical negotiated showcase deals mode for settlement') ON CONFLICT (ID) DO UPDATE SET MARKET_TYPE = EXCLUDED.MARKET_TYPE, SECTION = EXCLUDED.SECTION, SETTLEMENT_CURRENCY = EXCLUDED.SETTLEMENT_CURRENCY, CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, EXCHANGE_ID = EXCLUDED.EXCHANGE_ID, DESCRIPTION = EXCLUDED.DESCRIPTION;

6
clearing-parent/db-scripts/src/main/resources/db/SECTION_DICTIONARY.sql
View file

@ -1,12 +1,12 @@
-- DB version: 3.22
-- SECTION_DICTIONARY LCC version: 3.22.0.0
-- DB version: 3.23
-- SECTION_DICTIONARY LCC version: 3.23.0.0
/* Dictionaries */
/* Business objects */
INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (1, 'MKR', 'Секция Валютного рынка') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (1, 'MKR', 'Секция Денежного и Валютного рынков') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (2, 'FOND', 'Фондовая секция') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;

6
clearing-parent/db-scripts/src/main/resources/db/SECTION_DICTIONARY_LCC.sql
View file

@ -1,12 +1,12 @@
-- DB version: 3.22
-- SECTION_DICTIONARY LCC version: 3.22.0.0
-- DB version: 3.23
-- SECTION_DICTIONARY LCC version: 3.23.0.0
/* Dictionaries */
/* Business objects */
INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (1, 'MKR', 'Секция Денежного и Валютного рынков') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (1, 'MKR', 'Секция Валютного рынка') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (2, 'FOND', 'Фондовая секция') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;

24
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.23.sql Normal file
View file

@ -0,0 +1,24 @@
-- DB version: 3.22 -> 3.23
ALTER TABLE RISK_PARAMETER ADD COLUMN IF NOT EXISTS QUOTE_VALUE NUMERIC(72, 18);
COMMENT ON COLUMN RISK_PARAMETER.QUOTE_VALUE IS 'Ставка переноса сопряженной валюты';
ALTER TABLE ORDER_CURRENCY ADD COLUMN IF NOT EXISTS REGISTRY_ID BIGINT;
COMMENT ON COLUMN ORDER_CURRENCY.REGISTRY_ID IS 'Идентификатор регистра';
DROP TABLE IF EXISTS ORDER_AFFIL_DICTIONARY;
CREATE TABLE ORDER_AFFIL_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
COMMENT ON TABLE ORDER_AFFIL_DICTIONARY IS 'Справочник принадлежности заявки';
COMMENT ON COLUMN ORDER_AFFIL_DICTIONARY.ID IS 'Идентификатор';
COMMENT ON COLUMN ORDER_AFFIL_DICTIONARY.CODE IS 'Код';
COMMENT ON COLUMN ORDER_AFFIL_DICTIONARY.NAME IS 'Тип расчета';
DROP TABLE IF EXISTS ORDER_STATUS_DICTIONARY;
CREATE TABLE ORDER_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
COMMENT ON TABLE ORDER_STATUS_DICTIONARY IS 'Справочник статусов заявки';
COMMENT ON COLUMN ORDER_STATUS_DICTIONARY.ID IS 'Идентификатор';
COMMENT ON COLUMN ORDER_STATUS_DICTIONARY.CODE IS 'Код';
COMMENT ON COLUMN ORDER_STATUS_DICTIONARY.NAME IS 'Тип расчета';
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.23') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION;

8
clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OrderAffilDictionary.java Normal file
View file

@ -0,0 +1,8 @@
package ru.clearing.platform.dictionary;
public class OrderAffilDictionary extends AbstractDictionary {
private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
}

8
clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OrderStatusDictionary.java Normal file
View file

@ -0,0 +1,8 @@
package ru.clearing.platform.dictionary;
public class OrderStatusDictionary extends AbstractDictionary {
private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
}

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

@ -53,6 +53,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore<OrderCurrency> {
"STATUS",
"COMMENT",
"INITIAL_ORDER_ID",
"REGISTRY_ID",
"CREATED_AT",
"UPDATED_AT"
};
@ -91,6 +92,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore<OrderCurrency> {
object.setStatus(resultSet.getString("STATUS"));
object.setComment(resultSet.getString("COMMENT"));
object.setInitialOrderId(resultSet.getObject("INITIAL_ORDER_ID", Long.class));
object.setRegistryId(resultSet.getObject("REGISTRY_ID", Long.class));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
return object;
@ -122,6 +124,7 @@ public class OrderCurrencyMapStore extends TemplateMapStore<OrderCurrency> {
object.getStatus(),
object.getComment(),
object.getInitialOrderId(),
object.getRegistryId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated())
};

31
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OrderAffilDictionaryMapStore.java Normal file
View file

@ -0,0 +1,31 @@
package ru.spcex.clearing.imdg.dictionary;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import ru.clearing.platform.dictionary.OrderAffilDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
@Component
public class OrderAffilDictionaryMapStore extends DictionaryTMapStore<OrderAffilDictionary> {
public OrderAffilDictionaryMapStore(JdbcTemplate jdbcTemplate) {
super(jdbcTemplate);
}
@Override
public String getMapName() {
return IMDGDistributedNames.Map_OrderAffilDictionary;
}
@Override
public String getTableName() {
return "ORDER_AFFIL_DICTIONARY";
}
@Override
public OrderAffilDictionary getDictionaryObject() {
return new OrderAffilDictionary();
}
}

31
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OrderStatusDictionaryMapStore.java Normal file
View file

@ -0,0 +1,31 @@
package ru.spcex.clearing.imdg.dictionary;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import ru.clearing.platform.dictionary.OrderStatusDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
@Component
public class OrderStatusDictionaryMapStore extends DictionaryTMapStore<OrderStatusDictionary> {
public OrderStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
super(jdbcTemplate);
}
@Override
public String getMapName() {
return IMDGDistributedNames.Map_OrderStatusDictionary;
}
@Override
public String getTableName() {
return "ORDER_STATUS_DICTIONARY";
}
@Override
public OrderStatusDictionary getDictionaryObject() {
return new OrderStatusDictionary();
}
}

7
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RiskParameterMapStore.java
View file

@ -30,7 +30,8 @@ public class RiskParameterMapStore extends TemplateMapStore<RiskParameter> {
@Override
public String[] getFields() {
return new String[]{
"ID", "VALUE", "SETTLEMENT_TYPE", "CURRENCY_PAIR", "CURRENCY_PAIR_ID", "CREATED_AT", "UPDATED_AT", "WORKFLOW_STATUS"
"ID", "VALUE", "SETTLEMENT_TYPE", "CURRENCY_PAIR", "CURRENCY_PAIR_ID", "CREATED_AT", "UPDATED_AT", "WORKFLOW_STATUS",
"QUOTE_VALUE"
};
}
@ -45,6 +46,7 @@ public class RiskParameterMapStore extends TemplateMapStore<RiskParameter> {
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setWorkflowStatus(resultSet.getObject("WORKFLOW_STATUS", String.class));
object.setQuoteValue(resultSet.getObject("QUOTE_VALUE", BigDecimal.class));
return object;
}
@ -58,7 +60,8 @@ public class RiskParameterMapStore extends TemplateMapStore<RiskParameter> {
object.getCurrencyPairId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()),
object.getWorkflowStatus()
object.getWorkflowStatus(),
object.getQuoteValue()
};
return args;
}

2
platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java
View file

@ -120,6 +120,8 @@ public final class IMDGDistributedNames {
public static final String Map_ConnectionStateDictionary = "Map_ConnectionStateDictionary";
public static final String Map_UserRoleDictionary = "Map_UserRoleDictionary";
public static final String Map_ResidenceDictionary = "Map_ResidenceDictionary";
public static final String Map_OrderStatusDictionary = "Map_OrderStatusDictionary";
public static final String Map_OrderAffilDictionary = "Map_OrderAffilDictionary";
public static final String Map_UserSettings = "Map_UserSettings";
public static final String Map_UserRoleSession = "Map_UserRoleSession";
@Deprecated