http://jira.mfd.msk:8088/browse/CLS-293 DDL meta 4.2
This commit is contained in:
AKurakin
parent
6fdfcb041f
commit
4e37cf7757
23 changed files with 433 additions and 135 deletions
|
|
@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.http.MediaType;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
|
||||
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
|
||||
import ru.spcex.clearing.backendapi.controller.request.cud.securities.MoneyMarketSecurityNewAction;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
{
|
||||
"version": "3.5.0.21",
|
||||
"version": "3.5.0.22",
|
||||
|
||||
"enums": {
|
||||
|
||||
|
|
@ -2411,7 +2411,7 @@
|
|||
|
||||
"destination": "securities/money-securities",
|
||||
|
||||
"class": "ru.clearing.classes.statics.data.misc.MoneyMarketSecurity",
|
||||
"class": "ru.clearing.classes.statics.data.security.MoneyMarketSecurity",
|
||||
|
||||
"logUpdates": "true",
|
||||
|
||||
|
|
@ -2453,6 +2453,10 @@
|
|||
{"code": "fullName",
|
||||
"type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование","searchable": true,"sortable": true,"visible": true,"extends": "security"
|
||||
}
|
||||
,
|
||||
{"code": "convention",
|
||||
"type": 2,"length": 255,"name": "Нотация наименования инструмента","shortname": "Маска","visible": true
|
||||
}
|
||||
,
|
||||
{"code": "securitySymbol",
|
||||
"type": 2,"length": 255,"name": "Код инструмента","shortname": "Код","searchable": true,"sortable": true,"visible": true,"extends": "security"
|
||||
|
|
@ -2509,6 +2513,10 @@
|
|||
{"code": "fullName",
|
||||
"type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование"
|
||||
}
|
||||
,
|
||||
{"code": "convention",
|
||||
"type": 2,"length": 255,"name": "Нотация наименования инструмента","shortname": "Маска"
|
||||
}
|
||||
,
|
||||
{"code": "lotSize",
|
||||
"type": 11,"name": "Размер лота","shortname": "Лот","required": true
|
||||
|
|
@ -2586,6 +2594,10 @@
|
|||
{"code": "fullName",
|
||||
"type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование"
|
||||
}
|
||||
,
|
||||
{"code": "convention",
|
||||
"type": 2,"length": 255,"name": "Нотация наименования инструмента","shortname": "Маска"
|
||||
}
|
||||
,
|
||||
{"code": "lotSize",
|
||||
"type": 11,"name": "Размер лота","shortname": "Лот"
|
||||
|
|
@ -2654,6 +2666,36 @@
|
|||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
"tradedMoneyMarketSecurity": {
|
||||
|
||||
"name": "Инструменты денежного рынка, учавствующие в сделках",
|
||||
|
||||
"destination": "securities/traded-money-securities",
|
||||
|
||||
"class": "ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity",
|
||||
|
||||
"table": "traded_money_market_security",
|
||||
|
||||
"fields": [
|
||||
{"code": "securityId",
|
||||
"type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": true,"sortable": true,"link": "security","linkCode": "shortName"
|
||||
}
|
||||
,
|
||||
{"code": "shortName",
|
||||
"type": 2,"length": 255,"name": "Краткое наименование инструмента","shortname": "Краткое наименование","searchable": true,"sortable": true,"visible": true,"extends": "security"
|
||||
}
|
||||
,
|
||||
{"code": "securityCode",
|
||||
"type": 2,"length": 255,"name": "Полный код инструмента со сроком","shortname": "Код инструмента","searchable": true,"sortable": true,"visible": true
|
||||
}
|
||||
,
|
||||
{"code": "id",
|
||||
"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
|
||||
}
|
||||
]
|
||||
|
||||
}
|
||||
,
|
||||
"equitySecurity": {
|
||||
|
|
@ -3783,7 +3825,38 @@
|
|||
"field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true
|
||||
}
|
||||
]
|
||||
|
||||
,"actions":[
|
||||
{"method":"post",
|
||||
|
||||
"name": "Досрочное изъятие части денежных средств по депозиту МКР",
|
||||
|
||||
"destination": "registries/splitDeposit",
|
||||
|
||||
"confirmation": "contract,outboundAmount,refundDate",
|
||||
|
||||
"fields": [
|
||||
{"code": "contract",
|
||||
"type": 2,"length": 255,"name": "Договор","shortname": "Договор","required": true
|
||||
}
|
||||
,
|
||||
{"code": "outboundAmount",
|
||||
"type": 10,"name": "Сумма изъятия","shortname": "Сумма","required": true
|
||||
}
|
||||
,
|
||||
{"code": "refundDate",
|
||||
"type": 6,"name": "Дата возврата","shortname": "Дата","required": true
|
||||
}
|
||||
,
|
||||
{"code": "comment",
|
||||
"type": 2,"length": 255,"name": "Основание для вывода","shortname": "Основание"
|
||||
}
|
||||
,
|
||||
{"code": "direction",
|
||||
"type": 1,"name": "Направление","shortname": "Направление","link": "inOutDirection"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
"account": {
|
||||
|
|
@ -4046,6 +4119,10 @@
|
|||
{"code": "companyId",
|
||||
"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
|
||||
}
|
||||
,
|
||||
{"code": "status",
|
||||
"type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "serviceStatus","extends": "account"
|
||||
}
|
||||
,
|
||||
{"code": "id",
|
||||
"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
|
||||
|
|
@ -4966,7 +5043,11 @@
|
|||
|
||||
"name": "Формирование отчетности",
|
||||
|
||||
"fields": []
|
||||
"fields": [
|
||||
{"code": "sessionId",
|
||||
"type": 1,"name": "Клиринговая сессия","shortname": "Сессия","link": "session"
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
{"method":"post",
|
||||
|
|
@ -4975,18 +5056,18 @@
|
|||
|
||||
"group": "Обмен с Торговой системой",
|
||||
|
||||
"name": "Выгрузка в торговую систему остатков секции МКР",
|
||||
"name": "Выгрузка в торговую систему остатков по деньгам",
|
||||
|
||||
"fields": []
|
||||
}
|
||||
,
|
||||
{"method":"post",
|
||||
|
||||
"destination": "LIMF",
|
||||
"destination": "LIMS",
|
||||
|
||||
"group": "Обмен с Торговой системой",
|
||||
|
||||
"name": "Выгрузка в торговую систему остатков Фондовой секции",
|
||||
"name": "Выгрузка в торговую систему остатков по бумагам",
|
||||
|
||||
"fields": []
|
||||
}
|
||||
|
|
@ -6465,7 +6546,40 @@
|
|||
"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
|
||||
}
|
||||
]
|
||||
|
||||
,"actions":[
|
||||
{"method":"post",
|
||||
|
||||
"name": "Вывод денежных средств c регистра инициатора",
|
||||
|
||||
"destination": "payment-instructions/clearing-outbound",
|
||||
|
||||
"fields": [
|
||||
{"code": "senderId",
|
||||
"type": 1,"name": "Участник отправитель","shortname": "Отправитель","link": "company","required": true
|
||||
}
|
||||
,
|
||||
{"code": "addresseeId",
|
||||
"type": 1,"name": "Участник получатель","shortname": "Получатель","link": "company","required": true
|
||||
}
|
||||
,
|
||||
{"code": "paymentPurpose",
|
||||
"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение","searchable": true,"sortable": true,"visible": true
|
||||
}
|
||||
,
|
||||
{"code": "creditLeg_amount",
|
||||
"type": 10,"name": "Сумма отправителя","shortname": "Сумма отправителя","searchable": true,"sortable": true,"visible": true
|
||||
}
|
||||
,
|
||||
{"code": "creditLeg_accountId",
|
||||
"type": 1,"name": "Наименование счета отправителя","shortname": "Счет отправителя","searchable": true,"sortable": true,"link": "account","ignore": true
|
||||
}
|
||||
,
|
||||
{"code": "debitLeg_accountId",
|
||||
"type": 1,"name": "Наименование счета получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"link": "account","ignore": true
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
"notification": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
|
||||
<meta version="3.5.0.21">
|
||||
<meta version="3.5.0.22">
|
||||
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
|
||||
<!--Здесь словари-->
|
||||
<enums>
|
||||
|
|
@ -557,7 +557,7 @@
|
|||
<currencyCode type="12" dbname="Код валюты" name="Код валюты" shortname="Валюта" searchable="true" sortable="true" visible="true" link="currencyCode" linkCode="code"/>
|
||||
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
|
||||
</currency>
|
||||
<moneyMarketSecurity name="Инструменты Денежного рынка" destination="securities/money-securities" class="ru.clearing.classes.statics.data.misc.MoneyMarketSecurity" logUpdates="true" table="money_market_security">
|
||||
<moneyMarketSecurity name="Инструменты Денежного рынка" destination="securities/money-securities" class="ru.clearing.classes.statics.data.security.MoneyMarketSecurity" logUpdates="true" table="money_market_security">
|
||||
<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
|
||||
<description type="2" length="255" name="Описание" shortname="Описание" searchable="true" sortable="false"/>
|
||||
<startDate type="6" name="Дата начала действия" shortname="Дата начала" searchable="true" sortable="true"/>
|
||||
|
|
@ -567,6 +567,7 @@
|
|||
<instrumentType type="12" dbname="Код типа инструмента" name="Наименование типа инструмента" shortname="Тип инструмента" searchable="true" sortable="true" visible="true" link="instrumentType" extends="security"/>
|
||||
<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" searchable="true" sortable="true" visible="true" extends="security"/>
|
||||
<fullName type="2" length="255" name="Полное наименование инструмента" shortname="Наименование" searchable="true" sortable="true" visible="true" extends="security"/>
|
||||
<convention type="2" length="255" name="Нотация наименования инструмента" shortname="Маска" visible="true"/>
|
||||
<securitySymbol type="2" length="255" name="Код инструмента" shortname="Код" searchable="true" sortable="true" visible="true" extends="security"/>
|
||||
<termType type="12" dbname="Код вида инструмента" name="Наименование вида инструмента" shortname="Вид инструмента" searchable="true" sortable="true" visible="false" link="termType"/>
|
||||
<lotSize field="securityId" type="11" name="Размер лота" shortname="Лот" searchable="true" sortable="true" visible="true" linkKeyCode="securityId" linkCode="lotSize" link="listing" extends="listing"/>
|
||||
|
|
@ -581,6 +582,7 @@
|
|||
<securitySymbol type="2" length="255" name="Код инструмента" shortname="Код" required="true"/>
|
||||
<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" required="true"/>
|
||||
<fullName type="2" length="255" name="Полное наименование инструмента" shortname="Наименование"/>
|
||||
<convention type="2" length="255" name="Нотация наименования инструмента" shortname="Маска"/>
|
||||
<lotSize type="11" name="Размер лота" shortname="Лот" required="true"/>
|
||||
<nominalValue type="10" name="Номинал" shortname="Номинал" required="true"/>
|
||||
<nominalCurrency type="12" name="Наименование валюты номинала" shortname="Валюта номинала" link="currencyCode" linkCode="code" required="true"/>
|
||||
|
|
@ -600,6 +602,7 @@
|
|||
<securitySymbol type="2" length="255" name="Код инструмента" shortname="Код" enabled="false"/>
|
||||
<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование"/>
|
||||
<fullName type="2" length="255" name="Полное наименование инструмента" shortname="Наименование"/>
|
||||
<convention type="2" length="255" name="Нотация наименования инструмента" shortname="Маска"/>
|
||||
<lotSize type="11" name="Размер лота" shortname="Лот"/>
|
||||
<nominalValue type="10" name="Номинал" shortname="Номинал"/>
|
||||
<nominalCurrency type="12" name="Наименование валюты номинала" shortname="Валюта номинала" link="currencyCode" linkCode="code"/>
|
||||
|
|
@ -619,6 +622,12 @@
|
|||
</delete>
|
||||
</actions>
|
||||
</moneyMarketSecurity>
|
||||
<tradedMoneyMarketSecurity name="Инструменты денежного рынка, учавствующие в сделках" destination="securities/traded-money-securities" class="ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity" table="traded_money_market_security">
|
||||
<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
|
||||
<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" searchable="true" sortable="true" visible="true" extends="security"/>
|
||||
<securityCode type="2" length="255" name="Полный код инструмента со сроком" shortname="Код инструмента" searchable="true" sortable="true" visible="true"/>
|
||||
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
|
||||
</tradedMoneyMarketSecurity>
|
||||
<equitySecurity name="Акции" destination="securities/equity-securities" class="ru.clearing.classes.statics.data.instrument.issue.EquitySecurity" logUpdates="true" table="equity_security">
|
||||
<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
|
||||
<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" searchable="true" sortable="true" visible="true" extends="security"/>
|
||||
|
|
@ -887,6 +896,15 @@
|
|||
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
|
||||
<createdAt field="created" type="4" name="Дата и время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
|
||||
<updatedAt field="updated" type="4" name="Дата и время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
|
||||
<actions>
|
||||
<post name="Досрочное изъятие части денежных средств по депозиту МКР" destination="registries/splitDeposit" confirmation="contract,outboundAmount,refundDate">
|
||||
<contract type="2" length="255" name="Договор" shortname="Договор" required="true"/>
|
||||
<outboundAmount type="10" name="Сумма изъятия" shortname="Сумма" required="true"/>
|
||||
<refundDate type="6" name="Дата возврата" shortname="Дата" required="true"/>
|
||||
<comment type="2" length="255" name="Основание для вывода" shortname="Основание"/>
|
||||
<direction type="1" name="Направление" shortname="Направление" link="inOutDirection"/>
|
||||
</post>
|
||||
</actions>
|
||||
</registry>
|
||||
<account name="Счета" destination="accounting/accounts" class="ru.clearing.classes.statics.data.account.Account" logUpdates="true" table="account">
|
||||
<account type="2" length="50" name="Номер счета" shortname="Счет" searchable="true" sortable="true" visible="true"/>
|
||||
|
|
@ -950,6 +968,7 @@
|
|||
<taxRegistrationReasonCode type="2" length="255" name="Код причины постановки (КПП)" shortname="КПП" searchable="true" sortable="true" visible="true"/>
|
||||
<account type="2" length="50" name="Номер счета" shortname="Счет" searchable="true" sortable="true" visible="true"/>
|
||||
<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="true" sortable="true" visible="true" link="company" linkCode="shortName"/>
|
||||
<status type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" link="serviceStatus" extends="account"/>
|
||||
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
|
||||
<actions>
|
||||
<post name="Добавление счета вывода средств из ПРЦ" confirmation="currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination">
|
||||
|
|
@ -1160,10 +1179,11 @@
|
|||
<post destination="GSRR" group="Клиринг" name="Формирование реестра отправленных отчетов">
|
||||
</post>
|
||||
<post destination="GREP" group="Клиринг" name="Формирование отчетности">
|
||||
<sessionId type="1" name="Клиринговая сессия" shortname="Сессия" link="session"/>
|
||||
</post>
|
||||
<post destination="LIMM" group="Обмен с Торговой системой" name="Выгрузка в торговую систему остатков секции МКР">
|
||||
<post destination="LIMM" group="Обмен с Торговой системой" name="Выгрузка в торговую систему остатков по деньгам">
|
||||
</post>
|
||||
<post destination="LIMF" group="Обмен с Торговой системой" name="Выгрузка в торговую систему остатков Фондовой секции">
|
||||
<post destination="LIMS" group="Обмен с Торговой системой" name="Выгрузка в торговую систему остатков по бумагам">
|
||||
</post>
|
||||
<post destination="LIQU" group="Клиринг" name="иквидационная сессия по обязательтсвам участника">
|
||||
</post>
|
||||
|
|
@ -1505,6 +1525,16 @@
|
|||
<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
|
||||
<clearingDate type="6" name="Дата расчета" shortname="Дата расчета" searchable="true" sortable="true" ignore="true"/>
|
||||
<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
|
||||
<actions>
|
||||
<post name="Вывод денежных средств c регистра инициатора" destination="payment-instructions/clearing-outbound">
|
||||
<senderId type="1" name="Участник отправитель" shortname="Отправитель" link="company" required="true"/>
|
||||
<addresseeId type="1" name="Участник получатель" shortname="Получатель" link="company" required="true"/>
|
||||
<paymentPurpose type="2" length="255" name="Назначение платежа" shortname="Назначение" searchable="true" sortable="true" visible="true"/>
|
||||
<creditLeg_amount type="10" name="Сумма отправителя" shortname="Сумма отправителя" searchable="true" sortable="true" visible="true"/>
|
||||
<creditLeg_accountId type="1" name="Наименование счета отправителя" shortname="Счет отправителя" searchable="true" sortable="true" link="account" ignore="true"/>
|
||||
<debitLeg_accountId type="1" name="Наименование счета получателя" shortname="Счет получателя" searchable="true" sortable="true" link="account" ignore="true"/>
|
||||
</post>
|
||||
</actions>
|
||||
</paymentInstruction>
|
||||
<notification name="Сообщения" destination="notifications" class="ru.clearing.classes.statics.data.misc.Notification" logUpdates="true" table="notification">
|
||||
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package ru.spcex.clearing.backendapi.controller.queue.securities;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
|
||||
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
|
||||
import ru.spcex.clearing.backendapi.controller.request.cud.securities.MoneyMarketSecurityNewAction;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
{
|
||||
"version": "3.5.0.21",
|
||||
"version": "3.5.0.22",
|
||||
|
||||
"enums": {
|
||||
|
||||
|
|
@ -2411,7 +2411,7 @@
|
|||
|
||||
"destination": "securities/money-securities",
|
||||
|
||||
"class": "ru.clearing.classes.statics.data.misc.MoneyMarketSecurity",
|
||||
"class": "ru.clearing.classes.statics.data.security.MoneyMarketSecurity",
|
||||
|
||||
"logUpdates": "true",
|
||||
|
||||
|
|
@ -2453,6 +2453,10 @@
|
|||
{"code": "fullName",
|
||||
"type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование","searchable": true,"sortable": true,"visible": true,"extends": "security"
|
||||
}
|
||||
,
|
||||
{"code": "convention",
|
||||
"type": 2,"length": 255,"name": "Нотация наименования инструмента","shortname": "Маска","visible": true
|
||||
}
|
||||
,
|
||||
{"code": "securitySymbol",
|
||||
"type": 2,"length": 255,"name": "Код инструмента","shortname": "Код","searchable": true,"sortable": true,"visible": true,"extends": "security"
|
||||
|
|
@ -2509,6 +2513,10 @@
|
|||
{"code": "fullName",
|
||||
"type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование"
|
||||
}
|
||||
,
|
||||
{"code": "convention",
|
||||
"type": 2,"length": 255,"name": "Нотация наименования инструмента","shortname": "Маска"
|
||||
}
|
||||
,
|
||||
{"code": "lotSize",
|
||||
"type": 11,"name": "Размер лота","shortname": "Лот","required": true
|
||||
|
|
@ -2586,6 +2594,10 @@
|
|||
{"code": "fullName",
|
||||
"type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование"
|
||||
}
|
||||
,
|
||||
{"code": "convention",
|
||||
"type": 2,"length": 255,"name": "Нотация наименования инструмента","shortname": "Маска"
|
||||
}
|
||||
,
|
||||
{"code": "lotSize",
|
||||
"type": 11,"name": "Размер лота","shortname": "Лот"
|
||||
|
|
@ -2654,6 +2666,36 @@
|
|||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
"tradedMoneyMarketSecurity": {
|
||||
|
||||
"name": "Инструменты денежного рынка, учавствующие в сделках",
|
||||
|
||||
"destination": "securities/traded-money-securities",
|
||||
|
||||
"class": "ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity",
|
||||
|
||||
"table": "traded_money_market_security",
|
||||
|
||||
"fields": [
|
||||
{"code": "securityId",
|
||||
"type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": true,"sortable": true,"link": "security","linkCode": "shortName"
|
||||
}
|
||||
,
|
||||
{"code": "shortName",
|
||||
"type": 2,"length": 255,"name": "Краткое наименование инструмента","shortname": "Краткое наименование","searchable": true,"sortable": true,"visible": true,"extends": "security"
|
||||
}
|
||||
,
|
||||
{"code": "securityCode",
|
||||
"type": 2,"length": 255,"name": "Полный код инструмента со сроком","shortname": "Код инструмента","searchable": true,"sortable": true,"visible": true
|
||||
}
|
||||
,
|
||||
{"code": "id",
|
||||
"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
|
||||
}
|
||||
]
|
||||
|
||||
}
|
||||
,
|
||||
"equitySecurity": {
|
||||
|
|
@ -3783,7 +3825,38 @@
|
|||
"field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true
|
||||
}
|
||||
]
|
||||
|
||||
,"actions":[
|
||||
{"method":"post",
|
||||
|
||||
"name": "Досрочное изъятие части денежных средств по депозиту МКР",
|
||||
|
||||
"destination": "registries/splitDeposit",
|
||||
|
||||
"confirmation": "contract,outboundAmount,refundDate",
|
||||
|
||||
"fields": [
|
||||
{"code": "contract",
|
||||
"type": 2,"length": 255,"name": "Договор","shortname": "Договор","required": true
|
||||
}
|
||||
,
|
||||
{"code": "outboundAmount",
|
||||
"type": 10,"name": "Сумма изъятия","shortname": "Сумма","required": true
|
||||
}
|
||||
,
|
||||
{"code": "refundDate",
|
||||
"type": 6,"name": "Дата возврата","shortname": "Дата","required": true
|
||||
}
|
||||
,
|
||||
{"code": "comment",
|
||||
"type": 2,"length": 255,"name": "Основание для вывода","shortname": "Основание"
|
||||
}
|
||||
,
|
||||
{"code": "direction",
|
||||
"type": 1,"name": "Направление","shortname": "Направление","link": "inOutDirection"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
"account": {
|
||||
|
|
@ -4046,6 +4119,10 @@
|
|||
{"code": "companyId",
|
||||
"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
|
||||
}
|
||||
,
|
||||
{"code": "status",
|
||||
"type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "serviceStatus","extends": "account"
|
||||
}
|
||||
,
|
||||
{"code": "id",
|
||||
"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
|
||||
|
|
@ -4966,7 +5043,11 @@
|
|||
|
||||
"name": "Формирование отчетности",
|
||||
|
||||
"fields": []
|
||||
"fields": [
|
||||
{"code": "sessionId",
|
||||
"type": 1,"name": "Клиринговая сессия","shortname": "Сессия","link": "session"
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
{"method":"post",
|
||||
|
|
@ -4975,18 +5056,18 @@
|
|||
|
||||
"group": "Обмен с Торговой системой",
|
||||
|
||||
"name": "Выгрузка в торговую систему остатков секции МКР",
|
||||
"name": "Выгрузка в торговую систему остатков по деньгам",
|
||||
|
||||
"fields": []
|
||||
}
|
||||
,
|
||||
{"method":"post",
|
||||
|
||||
"destination": "LIMF",
|
||||
"destination": "LIMS",
|
||||
|
||||
"group": "Обмен с Торговой системой",
|
||||
|
||||
"name": "Выгрузка в торговую систему остатков Фондовой секции",
|
||||
"name": "Выгрузка в торговую систему остатков по бумагам",
|
||||
|
||||
"fields": []
|
||||
}
|
||||
|
|
@ -6465,7 +6546,40 @@
|
|||
"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
|
||||
}
|
||||
]
|
||||
|
||||
,"actions":[
|
||||
{"method":"post",
|
||||
|
||||
"name": "Вывод денежных средств c регистра инициатора",
|
||||
|
||||
"destination": "payment-instructions/clearing-outbound",
|
||||
|
||||
"fields": [
|
||||
{"code": "senderId",
|
||||
"type": 1,"name": "Участник отправитель","shortname": "Отправитель","link": "company","required": true
|
||||
}
|
||||
,
|
||||
{"code": "addresseeId",
|
||||
"type": 1,"name": "Участник получатель","shortname": "Получатель","link": "company","required": true
|
||||
}
|
||||
,
|
||||
{"code": "paymentPurpose",
|
||||
"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение","searchable": true,"sortable": true,"visible": true
|
||||
}
|
||||
,
|
||||
{"code": "creditLeg_amount",
|
||||
"type": 10,"name": "Сумма отправителя","shortname": "Сумма отправителя","searchable": true,"sortable": true,"visible": true
|
||||
}
|
||||
,
|
||||
{"code": "creditLeg_accountId",
|
||||
"type": 1,"name": "Наименование счета отправителя","shortname": "Счет отправителя","searchable": true,"sortable": true,"link": "account","ignore": true
|
||||
}
|
||||
,
|
||||
{"code": "debitLeg_accountId",
|
||||
"type": 1,"name": "Наименование счета получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"link": "account","ignore": true
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
,
|
||||
"notification": {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package ru.clearing.classes.statics.data.misc;
|
||||
package ru.clearing.classes.statics.data.security;
|
||||
|
||||
import ru.clearing.classes.statics.data.security.Security;
|
||||
|
||||
|
|
@ -11,12 +11,13 @@ import java.time.LocalDate;
|
|||
* DB table: MONEY_MARKET_SECURITY
|
||||
**/
|
||||
public class MoneyMarketSecurity extends Security {
|
||||
private Long securityId;// (linked to security)
|
||||
private Long securityId;
|
||||
private String description;
|
||||
private LocalDate startDate;
|
||||
private LocalDate endDate;
|
||||
private BigDecimal nominalValue;
|
||||
private String nominalCurrency; // (linked to currencyCode)
|
||||
private String nominalCurrency;
|
||||
private String convention;
|
||||
private String termType;
|
||||
private BigDecimal lotSize;
|
||||
|
||||
|
|
@ -68,6 +69,14 @@ public class MoneyMarketSecurity extends Security {
|
|||
this.nominalCurrency = nominalCurrency;
|
||||
}
|
||||
|
||||
public String getConvention() {
|
||||
return convention;
|
||||
}
|
||||
|
||||
public void setConvention(String convention) {
|
||||
this.convention = convention;
|
||||
}
|
||||
|
||||
public String getTermType() {
|
||||
return termType;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ru.clearing.classes.statics.data.misc;
|
||||
package ru.clearing.classes.statics.data.security;
|
||||
|
||||
import ru.clearing.classes.ConstSerializable;
|
||||
import ru.clearing.classes.objects.BusinessEvent;
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package ru.clearing.classes.statics.data.security;
|
||||
|
||||
import ru.clearing.classes.ConstSerializable;
|
||||
import ru.spcex.platform.classes.base.SpcexObjectBase;
|
||||
|
||||
/**
|
||||
* Инструменты денежного рынка, учавствующие в сделках
|
||||
* <p>
|
||||
* DB table: TRADED_MONEY_MARKET_SECURITY
|
||||
**/
|
||||
public class TradedMoneyMarketSecurity extends SpcexObjectBase {
|
||||
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
||||
|
||||
private Long securityId;
|
||||
private String shortName;
|
||||
private String securityCode;
|
||||
|
||||
public Long getSecurityId() {
|
||||
return securityId;
|
||||
}
|
||||
|
||||
public void setSecurityId(Long value) {
|
||||
this.securityId = value;
|
||||
}
|
||||
|
||||
public String getShortName() {
|
||||
return shortName;
|
||||
}
|
||||
|
||||
public void setShortName(String value) {
|
||||
this.shortName = value;
|
||||
}
|
||||
|
||||
public String getSecurityCode() {
|
||||
return securityCode;
|
||||
}
|
||||
|
||||
public void setSecurityCode(String value) {
|
||||
this.securityCode = value;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
-- DB version: 3.5.0.21
|
||||
-- DB version: 3.5.0.22
|
||||
/* Dictionaries */
|
||||
|
||||
-- allowed - Справочник признаков допустимости использования объектов
|
||||
|
|
@ -1164,7 +1164,7 @@ COMMENT ON COLUMN CURRENCY_HISTORY.ID IS 'Идентификатор запис
|
|||
|
||||
-- moneyMarketSecurity - Инструменты Денежного рынка
|
||||
DROP TABLE IF EXISTS MONEY_MARKET_SECURITY;
|
||||
CREATE TABLE MONEY_MARKET_SECURITY(SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,18), NOMINAL_CURRENCY varchar(4), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
|
||||
CREATE TABLE MONEY_MARKET_SECURITY(SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,18), NOMINAL_CURRENCY varchar(4), CONVENTION varchar(255), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
|
||||
COMMENT ON TABLE MONEY_MARKET_SECURITY IS 'Инструменты Денежного рынка';
|
||||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY.SECURITY_ID IS 'Идентификатор инструмента (linked to security)';
|
||||
|
|
@ -1179,6 +1179,8 @@ COMMENT ON COLUMN MONEY_MARKET_SECURITY.NOMINAL_VALUE IS 'Номинал';
|
|||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY.NOMINAL_CURRENCY IS 'Код валюты номинала (linked to currencyCode)';
|
||||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY.CONVENTION IS 'Нотация наименования инструмента';
|
||||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY.TERM_TYPE IS 'Код вида инструмента (linked to termType)';
|
||||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY.ID IS 'Идентификатор записи';
|
||||
|
|
@ -1186,7 +1188,7 @@ COMMENT ON COLUMN MONEY_MARKET_SECURITY.ID IS 'Идентификатор зап
|
|||
|
||||
-- History log of moneyMarketSecurity - Инструменты Денежного рынка
|
||||
DROP TABLE IF EXISTS MONEY_MARKET_SECURITY_HISTORY;
|
||||
CREATE TABLE MONEY_MARKET_SECURITY_HISTORY(MONEY_MARKET_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,18), NOMINAL_CURRENCY varchar(4), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
|
||||
CREATE TABLE MONEY_MARKET_SECURITY_HISTORY(MONEY_MARKET_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,18), NOMINAL_CURRENCY varchar(4), CONVENTION varchar(255), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
|
||||
COMMENT ON TABLE MONEY_MARKET_SECURITY_HISTORY IS 'История изменений таблицы moneyMarketSecurity';
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.MONEY_MARKET_SECURITY_ID IS 'Идентификатор записи в таблице MONEY_MARKET_SECURITY';
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.EVENT_TIME IS 'Дата и время изменения';
|
||||
|
|
@ -1205,10 +1207,23 @@ COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.NOMINAL_VALUE IS 'Номинал
|
|||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.NOMINAL_CURRENCY IS 'Код валюты номинала (linked to currencyCode)';
|
||||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.CONVENTION IS 'Нотация наименования инструмента';
|
||||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.TERM_TYPE IS 'Код вида инструмента (linked to termType)';
|
||||
|
||||
COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.ID IS 'Идентификатор записи';
|
||||
|
||||
-- tradedMoneyMarketSecurity - Инструменты денежного рынка, учавствующие в сделках
|
||||
DROP TABLE IF EXISTS TRADED_MONEY_MARKET_SECURITY;
|
||||
CREATE TABLE TRADED_MONEY_MARKET_SECURITY(SECURITY_ID bigint, SECURITY_CODE varchar(255), ID bigint PRIMARY KEY);
|
||||
COMMENT ON TABLE TRADED_MONEY_MARKET_SECURITY IS 'Инструменты денежного рынка, учавствующие в сделках';
|
||||
|
||||
COMMENT ON COLUMN TRADED_MONEY_MARKET_SECURITY.SECURITY_ID IS 'Идентификатор инструмента (linked to security)';
|
||||
|
||||
COMMENT ON COLUMN TRADED_MONEY_MARKET_SECURITY.SECURITY_CODE IS 'Полный код инструмента со сроком';
|
||||
|
||||
COMMENT ON COLUMN TRADED_MONEY_MARKET_SECURITY.ID IS 'Идентификатор записи';
|
||||
|
||||
-- equitySecurity - Акции
|
||||
DROP TABLE IF EXISTS EQUITY_SECURITY;
|
||||
CREATE TABLE EQUITY_SECURITY(SECURITY_ID bigint, SHARE_TYPE varchar(4), ID bigint PRIMARY KEY);
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
package ru.spcex.clearing.imdg.businessevent;
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.clearing.classes.statics.data.account.AccountBalance;
|
||||
import ru.clearing.classes.statics.data.account.AccountBalanceHistory;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.spcex.clearing.imdg.base.TemplateEventMapStore;
|
||||
import ru.spcex.platform.utils.time.TimeUtil;
|
||||
|
||||
@Deprecated
|
||||
//@Component
|
||||
public class AccountBalanceHistoryMapStore extends TemplateEventMapStore<AccountBalanceHistory> {
|
||||
|
||||
public AccountBalanceHistoryMapStore(JdbcTemplate jdbcTemplate) {
|
||||
super(jdbcTemplate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMapName() {
|
||||
return IMDGDistributedNames.Map_AccountBalanceHistory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTableName() {
|
||||
return "ACCOUNT_BALANCE_HISTORY";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getFields() {
|
||||
return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
|
||||
"ACCOUNT_BALANCE_ID", "COMPANY_ID", "CREATED_AT", "UPDATED_AT", "ACCOUNT_ID", "ACCOUNT_TYPE",
|
||||
"ACCOUNT", "OPEN_BALANCE_AMOUNT", "START_BALANCE_AMOUNT", "CLOSE_BALANCE_AMOUNT",
|
||||
"TRADE_BALANCE_AMOUNT", "FREE_BALANCE_AMOUNT", "CHANGE_BALANCE_AMOUNT",
|
||||
"CREDIT_AMOUNT", "DEBIT_AMOUNT", "BALANCE_AMOUNT", "BALANCE_ACCOUNT_TYPE",
|
||||
"CLEARING_DATE", "CURRENCY_CODE", "TRADING_CODE", "SHORT_NAME", "FULL_NAME"
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object[] objectToField(AccountBalanceHistory updateLog) {
|
||||
AccountBalance object = updateLog.getObject();
|
||||
Object[] args = new Object[]{
|
||||
updateLog.getId(),
|
||||
TimeUtil.toDateFromInstant(updateLog.getEventTime()),
|
||||
updateLog.getEventType(),
|
||||
updateLog.getUserId(),
|
||||
|
||||
object.getId(),
|
||||
object.getCompanyId(),
|
||||
TimeUtil.toDateFromInstant(object.getCreated()),
|
||||
TimeUtil.toDateFromInstant(object.getUpdated()),
|
||||
object.getAccountId(),
|
||||
object.getAccountType(),
|
||||
object.getAccount(),
|
||||
object.getOpenBalanceAmount(),
|
||||
object.getStartBalanceAmount(),
|
||||
object.getCloseBalanceAmount(),
|
||||
object.getTradeBalanceAmount(),
|
||||
object.getFreeBalanceAmount(),
|
||||
object.getChangeBalanceAmount(),
|
||||
object.getCreditAmount(),
|
||||
object.getDebitAmount(),
|
||||
object.getBalanceAmount(),
|
||||
object.getBalanceAccountType(),
|
||||
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
|
||||
object.getCurrencyCode(),
|
||||
object.getTradingCode(),
|
||||
object.getShortName(),
|
||||
object.getFullName()
|
||||
};
|
||||
return args;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -3,15 +3,10 @@ package ru.spcex.clearing.imdg.businessevent;
|
|||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurityHistory;
|
||||
import ru.spcex.clearing.imdg.base.TemplateEventMapStore;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurityHistory;
|
||||
import ru.spcex.platform.utils.time.TimeUtil;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
public class MoneyMarketSecurityHistoryMapStore extends ASecurityHistoryMapStore<MoneyMarketSecurityHistory> {
|
||||
|
||||
|
|
@ -34,7 +29,7 @@ public class MoneyMarketSecurityHistoryMapStore extends ASecurityHistoryMapStore
|
|||
public String[] getFields() {
|
||||
return new String[]{
|
||||
"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE",
|
||||
"MONEY_MARKET_SECURITY_ID", "SECURITY_ID", "DESCRIPTION", "START_DATE", "END_DATE", "NOMINAL_VALUE", "NOMINAL_CURRENCY", "TERM_TYPE"};
|
||||
"MONEY_MARKET_SECURITY_ID", "SECURITY_ID", "DESCRIPTION", "START_DATE", "END_DATE", "NOMINAL_VALUE", "NOMINAL_CURRENCY", "TERM_TYPE", "CONVENTION"};
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -54,7 +49,8 @@ public class MoneyMarketSecurityHistoryMapStore extends ASecurityHistoryMapStore
|
|||
TimeUtil.toDateFromLocalDate(moneyMarketSecurity.getEndDate()),
|
||||
moneyMarketSecurity.getNominalValue(),
|
||||
moneyMarketSecurity.getNominalCurrency(),
|
||||
moneyMarketSecurity.getTermType()
|
||||
moneyMarketSecurity.getTermType(),
|
||||
moneyMarketSecurity.getConvention()
|
||||
};
|
||||
return args;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,17 +2,13 @@ package ru.spcex.clearing.imdg.businessobject;
|
|||
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.spcex.clearing.imdg.base.TemplateMapStore;
|
||||
import ru.spcex.platform.utils.time.TimeUtil;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
public class MoneyMarketSecurityMapStore extends ASecurityMapStore<MoneyMarketSecurity> {
|
||||
|
|
@ -41,7 +37,7 @@ public class MoneyMarketSecurityMapStore extends ASecurityMapStore<MoneyMarketSe
|
|||
|
||||
@Override
|
||||
public String[] getFields() {
|
||||
return new String[]{"ID", "SECURITY_ID", "DESCRIPTION", "START_DATE", "END_DATE", "NOMINAL_VALUE", "NOMINAL_CURRENCY", "TERM_TYPE"};
|
||||
return new String[]{"ID", "SECURITY_ID", "DESCRIPTION", "START_DATE", "END_DATE", "NOMINAL_VALUE", "NOMINAL_CURRENCY", "TERM_TYPE", "CONVENTION"};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -68,6 +64,7 @@ public class MoneyMarketSecurityMapStore extends ASecurityMapStore<MoneyMarketSe
|
|||
object.setNominalValue(resultSet.getObject("NOMINAL_VALUE", BigDecimal.class));
|
||||
object.setNominalCurrency(resultSet.getObject("NOMINAL_CURRENCY", String.class));
|
||||
object.setTermType(resultSet.getObject("TERM_TYPE", String.class));
|
||||
object.setConvention(resultSet.getObject("CONVENTION", String.class));
|
||||
fillBySecurity(object, object.getSecurityId());
|
||||
return object;
|
||||
}
|
||||
|
|
@ -83,7 +80,8 @@ public class MoneyMarketSecurityMapStore extends ASecurityMapStore<MoneyMarketSe
|
|||
TimeUtil.toDateFromLocalDate(moneyMarketSecurity.getEndDate()),
|
||||
moneyMarketSecurity.getNominalValue(),
|
||||
moneyMarketSecurity.getNominalCurrency(),
|
||||
moneyMarketSecurity.getTermType()
|
||||
moneyMarketSecurity.getTermType(),
|
||||
moneyMarketSecurity.getConvention()
|
||||
};
|
||||
return args;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
package ru.spcex.clearing.imdg.object;
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.clearing.classes.statics.data.security.TradedMoneyMarketSecurity;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.spcex.clearing.imdg.base.TemplateMapStore;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@Component
|
||||
public class TradedMoneyMarketSecurityMapStore extends TemplateMapStore<TradedMoneyMarketSecurity> {
|
||||
|
||||
public TradedMoneyMarketSecurityMapStore(JdbcTemplate jdbcTemplate) {
|
||||
super(jdbcTemplate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMapName() {
|
||||
return IMDGDistributedNames.Map_TradedMoneyMarketSecurity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTableName() {
|
||||
return "TRADED_MONEY_MARKET_SECURITY";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getFields() {
|
||||
return new String[]{
|
||||
"SECURITY_ID", "SHORT_NAME", "SECURITY_CODE", "ID"
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public TradedMoneyMarketSecurity objectReader(ResultSet resultSet) throws SQLException {
|
||||
TradedMoneyMarketSecurity object = new TradedMoneyMarketSecurity();
|
||||
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
|
||||
object.setShortName(resultSet.getObject("SHORT_NAME", String.class));
|
||||
object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class));
|
||||
object.setId(resultSet.getObject("ID", Long.class));
|
||||
return object;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object[] objectToField(TradedMoneyMarketSecurity object) {
|
||||
Object[] args = new Object[]{
|
||||
object.getSecurityId(),
|
||||
object.getShortName(),
|
||||
object.getSecurityCode(),
|
||||
object.getId()
|
||||
};
|
||||
return args;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -15,6 +15,8 @@ import ru.clearing.classes.statics.data.instrument.issue.*;
|
|||
import ru.clearing.classes.statics.data.misc.*;
|
||||
import ru.clearing.classes.statics.data.profile.ProfileDocument;
|
||||
import ru.clearing.classes.statics.data.profile.ProfileDocumentHistory;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurityHistory;
|
||||
import ru.clearing.classes.statics.data.security.Security;
|
||||
import ru.clearing.classes.statics.data.security.SecurityHistory;
|
||||
import ru.clearing.classes.statics.data.user.User;
|
||||
|
|
@ -61,12 +63,7 @@ public class UpdateMapService extends AbstractUpdateMapService {
|
|||
protected void entryModified(EntryEvent<Long, Object> event, String eventType) {
|
||||
log.debug("{} {}", event, eventType);
|
||||
Object value = (EVENT_DELETE.equals(eventType) ? event.getOldValue() : event.getValue());
|
||||
if (value instanceof AccountBalance) {
|
||||
AccountBalanceHistory accountBalanceHistory = new AccountBalanceHistory();
|
||||
createBusinessEvent(accountBalanceHistory, eventType);
|
||||
accountBalanceHistory.setObject((AccountBalance) value);
|
||||
hazelcastServerInstance.getMap(IMDGDistributedNames.Map_AccountBalanceHistory).put(accountBalanceHistory.getId(), accountBalanceHistory);
|
||||
} else if (value instanceof Account) {
|
||||
if (value instanceof Account) {
|
||||
AccountHistory accountHistory = new AccountHistory();
|
||||
createBusinessEvent(accountHistory, eventType);
|
||||
accountHistory.setObject((Account) value);
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ import ru.clearing.classes.statics.data.profile.ProfileDocumentHistory;
|
|||
import ru.clearing.classes.statics.data.register.*;
|
||||
import ru.clearing.classes.statics.data.scheduler.*;
|
||||
import ru.clearing.classes.statics.data.sdf.*;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurityHistory;
|
||||
import ru.clearing.classes.statics.data.statement.Statement;
|
||||
import ru.clearing.classes.statics.data.user.*;
|
||||
import ru.clearing.platform.dictionary.*;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package ru.spcex.clearing.securities.component;
|
|||
import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity;
|
||||
import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
|
||||
import ru.clearing.classes.statics.data.misc.Listing;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.EquitySecurityNewRequest;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeSecurityNewRequest;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityNewRequest;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import org.springframework.beans.factory.InitializingBean;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.clearing.classes.statics.data.misc.Listing;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
|
||||
import ru.spcex.clearing.platform.messaging.domain.Consts;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.spcex.clearing.securities.validation.rule;
|
||||
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityUpdateRequest;
|
||||
import ru.spcex.clearing.securities.errors.SecuritiesError;
|
||||
import ru.spcex.platform.enumeration.Status;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.spcex.clearing.securities.validation.rule;
|
||||
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityUpdateRequest;
|
||||
import ru.spcex.clearing.securities.errors.SecuritiesError;
|
||||
import ru.spcex.platform.enumeration.Status;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity;
|
|||
import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
|
||||
import ru.clearing.classes.statics.data.misc.Currency;
|
||||
import ru.clearing.classes.statics.data.misc.Listing;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.clearing.platform.dictionary.*;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.spcex.clearing.securities.config.ErrorResolverConfig;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.spcex.clearing.securities.service;
|
||||
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityNewRequest;
|
||||
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityUpdateRequest;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import org.apache.kafka.clients.consumer.MockConsumer;
|
|||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import ru.clearing.classes.statics.data.misc.Listing;
|
||||
import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
|
||||
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
|
||||
import ru.spcex.clearing.platform.messaging.domain.Consts;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ public final class IMDGDistributedNames {
|
|||
@Deprecated
|
||||
public static final String Map_AccountBalance = "Map_AccountBalance";
|
||||
public static final String Map_AccountHistory = "Map_AccountHistory";
|
||||
public static final String Map_AccountBalanceHistory = "Map_AccountBalanceHistory";
|
||||
public static final String Map_Relation = "Map_Relation";
|
||||
public static final String Map_ClearingAccount = "Map_ClearingAccount";
|
||||
public static final String Map_ClearingAccountHistory = "Map_ClearingAccountHistory";
|
||||
|
|
@ -32,7 +31,6 @@ public final class IMDGDistributedNames {
|
|||
public static final String Map_RelationHistory = "Map_RelationHistory";
|
||||
public static final String Map_ErrorText = "Map_ErrorText";
|
||||
public static final String Map_Statement = "Map_Statement";
|
||||
public static final String Map_MarketAccess = "Map_MarketAccess"; // todo unused?
|
||||
public static final String Map_MarketTypeDictionary = "Map_MarketTypeDictionary";
|
||||
public static final String Map_MarketDataLiquidation = "Map_MarketDataLiquidation";
|
||||
public static final String Map_UserConnect = "Map_UserConnect";
|
||||
|
|
@ -109,6 +107,7 @@ public final class IMDGDistributedNames {
|
|||
public static final String Map_StatementTypeDictionary = "Map_StatementTypeDictionary";
|
||||
public static final String Map_TermTypeDictionary = "Map_TermTypeDictionary";
|
||||
public static final String Map_TransactionStatusDictionary = "Map_TransactionStatusDictionary";
|
||||
public static final String Map_TradedMoneyMarketSecurity = "Map_TradedMoneyMarketSecurity";
|
||||
public static final String Map_CourierTypeDictionary = "Map_CourierTypeDictionary";
|
||||
public static final String Map_TaskDictionary = "Map_TaskDictionary";
|
||||
public static final String Map_TaskStatusDictionary = "Map_TaskStatusDictionary";
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue