From a6cf844c74cf323d859491fdc88393733a8ca4fe Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 26 May 2023 19:22:33 +0300 Subject: [PATCH 1/4] =?UTF-8?q?meta=20http://jira.mfd.msk:8088/browse/CLS-?= =?UTF-8?q?320=20=D0=BE=D0=BF=D1=8F=D1=82=D1=8C=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/meta/data.xml | 96 ++-- .../src/main/resources/meta/meta.json | 538 +++++++----------- .../src/main/resources/meta/meta.xml | 204 +++---- .../backend-api/src/test/resources/meta.json | 538 +++++++----------- .../db-scripts/src/main/resources/db/DATA.sql | 94 +-- .../db-scripts/src/main/resources/db/DDL.sql | 26 +- 6 files changed, 618 insertions(+), 878 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml index c085341d6..6390799cf 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/data.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml @@ -1,5 +1,5 @@ - + @@ -172,6 +172,7 @@ + @@ -193,38 +194,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -312,6 +303,13 @@ + + + + + + + @@ -436,6 +434,8 @@ + + @@ -458,11 +458,11 @@ - - + - + + @@ -471,10 +471,10 @@ - + - + @@ -482,10 +482,10 @@ - + - + @@ -493,10 +493,10 @@ - + - + @@ -504,10 +504,10 @@ - + - + @@ -515,10 +515,10 @@ - + - + @@ -526,10 +526,10 @@ - + - + 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 00716c327..e30767a8b 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.5.0.25", + "version": "3.5.0.26", "enums": { @@ -1640,11 +1640,11 @@ } , {"code": "companySymbol", - "field": "id","type": 12,"name": "Тип реквизита","shortname": "Тип реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbol","link": "companySymbols","extends": "companySymbols" + "field": "id","type": 12,"name": "Тип реквизита","shortname": "Тип реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbol","link": "companySymbols","extends": "companySymbols","ignore": true } , {"code": "companySymbolValue", - "field": "id","type": 2,"length": 255,"name": "Значение реквизита","shortname": "Значение реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbolValue","link": "companySymbols","extends": "companySymbols" + "field": "id","type": 2,"length": 255,"name": "Значение реквизита","shortname": "Значение реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbolValue","link": "companySymbols","extends": "companySymbols","ignore": true } , {"code": "workflowStatus", @@ -1699,6 +1699,8 @@ "confirmation": "shortName,tradingCode", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "company","linkCode": "id","required": true @@ -1911,6 +1913,8 @@ "name": "Удаление категории участника клиринга", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clearingCategory","linkCode": "id","required": true @@ -1990,6 +1994,8 @@ "name": "Удаление контакта компании", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "contact","linkCode": "id","required": true @@ -2189,6 +2195,8 @@ "confirmation": "documentType,number,companyId", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "profileDocument","linkCode": "id","required": true @@ -2270,6 +2278,8 @@ "name": "Удаление реквизита компании", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "profileDocument","linkCode": "id","required": true @@ -2327,7 +2337,7 @@ } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , {"code": "shortName", @@ -2471,7 +2481,7 @@ } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2553,7 +2563,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2636,7 +2646,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2663,6 +2673,8 @@ "confirmation": "securitySymbol,shortName", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "moneyMarketSecurity","linkCode": "id","required": true @@ -2744,11 +2756,11 @@ } , {"code": "lotSize", - "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing" + "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing","ignore": true } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","extends": "security" } , {"code": "shortNameEng", @@ -2806,7 +2818,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2865,7 +2877,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2888,6 +2900,8 @@ "confirmation": "securitySymbol,shortName", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "equitySecurity","linkCode": "id","required": true @@ -2959,11 +2973,11 @@ } , {"code": "lotSize", - "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing" + "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing","ignore": true } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","extends": "security" } , {"code": "shortNameEng", @@ -3041,7 +3055,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -3120,7 +3134,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -3248,15 +3262,15 @@ "fields": [ {"code": "securityId", - "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": true,"sortable": true,"link": "security","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": true,"sortable": true,"visible": true,"link": "security","linkCode": "shortName" } , {"code": "market", - "type": 12,"dbname": "Код торговой секции","name": "Наименование режима","shortname": "Режим","searchable": true,"sortable": true,"link": "market","linkCode": "description" + "type": 12,"dbname": "Код торговой секции","name": "Наименование режима","shortname": "Режим","searchable": true,"sortable": true,"visible": true,"link": "market","linkCode": "description" } , {"code": "lotSize", - "type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true + "type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true } , {"code": "symbolCode", @@ -3300,7 +3314,7 @@ } , {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","required": true,"linkCode": "code" + "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkCode": "description","required": true } , {"code": "lotSize", @@ -3333,7 +3347,7 @@ } , {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkCode": "code","required": true,"enabled": false + "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkCode": "description","required": true,"enabled": false } , {"code": "lotSize", @@ -3356,6 +3370,8 @@ "confirmation": "securityId,market", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "listing","linkCode": "id","required": true @@ -3593,6 +3609,8 @@ "confirmation": "companyId,code", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3628,11 +3646,11 @@ } , {"code": "moneyAccountId", - "type": 1,"dbname": "Идентификатор денежного счета","name": "Номер денежного счета","shortname": "Денежный счет","searchable": true,"sortable": true,"link": "account" + "type": 1,"dbname": "Идентификатор денежного счета","name": "Номер денежного счета","shortname": "Денежный счет","searchable": true,"sortable": true,"link": "account","linkCode": "account" } , {"code": "depoAccountId", - "type": 1,"dbname": "Идентификатор депозитарного счета","name": "Номер депозитарного счета","shortname": "Депозитарный счет","searchable": true,"sortable": true,"link": "account" + "type": 1,"dbname": "Идентификатор депозитарного счета","name": "Номер депозитарного счета","shortname": "Депозитарный счет","searchable": true,"sortable": true,"link": "account","linkCode": "account" } , {"code": "tradingClearingRegistryType", @@ -3728,6 +3746,8 @@ "confirmation": "companyId,code", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3751,7 +3771,7 @@ "fields": [ {"code": "companyId", - "type": 1,"dbname": "Идентификатор участника","name": "Наименование участника","shortname": "Участник","searchable": true,"sortable": true,"visible": true,"link": "company" + "type": 1,"dbname": "Идентификатор участника","name": "Наименование участника","shortname": "Участник","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" } , {"code": "tradingCode", @@ -4242,7 +4262,7 @@ } , {"code": "status", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "serviceStatus","extends": "account" + "field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account" } , {"code": "id", @@ -4254,7 +4274,7 @@ "name": "Добавление счета вывода средств из ПРЦ", - "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account", "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNewAction", @@ -4296,7 +4316,7 @@ } , {"code": "companyId", - "type": 1,"name": "Компания","shortname": "Компания","link": "company","linkCode": "shortName","required": true + "type": 1,"name": "Компания","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } ] } @@ -4305,7 +4325,7 @@ "name": "Изменение счета вывода средств из ПРЦ", - "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account", "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction", @@ -4358,6 +4378,8 @@ "confirmation": "currency,bankIdentificationCode,correspondentAccount,taxpayerIdentificationNumber,taxRegistrationReasonCode,account", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "bankAccount","linkCode": "id","required": true @@ -4499,11 +4521,11 @@ } , {"code": "companyId", - "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"visible": true,"link": "company","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"link": "company","linkCode": "shortName" } , {"code": "securityId", - "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"visible": true,"link": "security","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"link": "security","linkCode": "shortName" } , {"code": "id", @@ -4533,6 +4555,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4541,17 +4567,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4574,6 +4596,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4582,17 +4608,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4601,7 +4623,9 @@ "name": "Блокировка шаблона расписания операционного дня", - "confirmation": "task,taskTime,taskStatus,companyId,securityId", + "confirmation": "task,taskTime,taskStatus,section,sessionType", + + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", "fields": [ {"code": "id", @@ -4664,7 +4688,7 @@ } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } ] } @@ -4689,7 +4713,7 @@ } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } ] } @@ -4698,7 +4722,9 @@ "name": "Блокировка записи в календаре", - "confirmation": "clearingDate,dayStatus,companyId", + "confirmation": "clearingDate,dayStatus", + + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", "fields": [ {"code": "id", @@ -4749,11 +4775,11 @@ } , {"code": "companyId", - "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"visible": true,"link": "company","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"link": "company","linkCode": "shortName" } , {"code": "securityId", - "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"visible": true,"link": "security","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"link": "security","linkCode": "shortName" } , {"code": "id", @@ -4787,6 +4813,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4795,17 +4825,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4832,6 +4858,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4840,17 +4870,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4859,7 +4885,9 @@ "name": "Блокировка расписания", - "confirmation": "task,taskTime,clearingDate,market,taskStatus,companyId,securityId", + "confirmation": "task,clearingDate,taskTime,taskStatus,section,sessionType", + + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", "fields": [ {"code": "id", @@ -4964,79 +4992,24 @@ } ] ,"actions":[ - {"method":"post", - - "destination": "GBAL", - - "group": "Обмен с расчетной организацией", - - "name": "Зачисление остатков (загрузка ДФ-57 и ДФ-01)", - - "fields": [] - } - , - {"method":"post", - - "destination": "ABLK", - - "group": "Обмен с расчетной организацией", - - "name": "Блокировка счета (загрузка ДФ-12)", - - "fields": [] - } - , {"method":"post", "destination": "GALB", "group": "Обмен с расчетной организацией", - "name": "Запрос остатков по всем счетам (экспорт ДФ-08)", + "name": "Запрос остатков по всем счетам (отправка ДФ-51, ДФ-56 для получения ответа ДФ-01, ДФ-57)", "fields": [] } , {"method":"post", - "destination": "ADBL", + "destination": "OUTV", "group": "Обмен с расчетной организацией", - "name": "Дозачисление/списание остатков (загрузка ДФ-16)", - - "fields": [] - } - , - {"method":"post", - - "destination": "CORD", - - "group": "Обмен с расчетной организацией", - - "name": "Формирование сводного платежного поручения (экспорт ДФ-03/ДФ-11)", - - "fields": [] - } - , - {"method":"post", - - "destination": "CORC", - - "group": "Обмен с расчетной организацией", - - "name": "Получение подтверждения переводов (загрузка ДФ-04)", - - "fields": [] - } - , - {"method":"post", - - "destination": "CMBA", - - "group": "Обмен с расчетной организацией", - - "name": "Формирование распоряжения на перевод с ТБС (экспорт ДФ-11)", + "name": "Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)", "fields": [] } @@ -5054,22 +5027,66 @@ , {"method":"post", - "destination": "GACA", + "destination": "LIMM", "group": "Обмен с Торговой системой", - "name": "Создание файла остатков CSV по клиринговым счетам", + "name": "Выгрузка в Торговую систему остатков по деньгам (отправка lim)", "fields": [] } , {"method":"post", - "destination": "GAIA", + "destination": "LIMS", "group": "Обмен с Торговой системой", - "name": "Создание файла остатков CSV по внутренним информационным счетам", + "name": "Выгрузка в Торговую систему остатков по бумагам (отправка lim)", + + "fields": [] + } + , + {"method":"post", + + "destination": "LOCM", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка участников", + + "fields": [] + } + , + {"method":"post", + + "destination": "LOSC", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка инструментов", + + "fields": [] + } + , + {"method":"post", + + "destination": "GVER", + + "group": "Общее", + + "name": "Запуск сверки", + + "fields": [] + } + , + {"method":"post", + + "destination": "GRYT", + + "group": "Общее", + + "name": "Подготовка КС к клиринговому дню", "fields": [] } @@ -5082,59 +5099,34 @@ "name": "Запуск клиринговой сессии", - "confirmation": "companyId,securityId", + "confirmation": "section,sessionType", "fields": [ + {"code": "section", + "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" + } + , + {"code": "sessionType", + "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" + } + , {"code": "companyId", - "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } , {"method":"post", - "destination": "SPRC", + "destination": "GRRT", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", - "name": "Запуск преклиринга", - - "fields": [] - } - , - {"method":"post", - - "destination": "SPOC", - - "group": "Клиринг", - - "name": "Запуск постклиринга", - - "fields": [] - } - , - {"method":"post", - - "destination": "GVER", - - "group": "Клиринг", - - "name": "Запуск сверки", - - "fields": [] - } - , - {"method":"post", - - "destination": "GCMR", - - "group": "Клиринг", - - "name": "Формирование реестра участников клиринга", + "name": "Формирование реестра остатков ценных бумаг", "fields": [] } @@ -5143,187 +5135,51 @@ "destination": "GBRR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", "name": "Формирование реестра остатков денежных средств", "fields": [] } , + {"method":"post", + + "destination": "ADLR", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование реестра обязательств, допущенных к клирингу", + + "fields": [] + } + , + {"method":"post", + + "destination": "CDLR", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование реестра обязательств, прошедших процедуру контроля обеспечения", + + "fields": [] + } + , {"method":"post", "destination": "GORR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", "name": "Формирование реестра распоряжений, направленных расчетной организации", "fields": [] } , - {"method":"post", - - "destination": "GSRR", - - "group": "Клиринг", - - "name": "Формирование реестра отправленных отчетов", - - "fields": [] - } - , - {"method":"post", - - "destination": "GREP", - - "group": "Клиринг", - - "name": "Формирование отчетности", - - "fields": [ - {"code": "sessionId", - "type": 1,"name": "Клиринговая сессия","shortname": "Сессия","link": "session" - } - ] - } - , - {"method":"post", - - "destination": "LIMM", - - "group": "Обмен с Торговой системой", - - "name": "Выгрузка в торговую систему остатков по деньгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "LIMS", - - "group": "Обмен с Торговой системой", - - "name": "Выгрузка в торговую систему остатков по бумагам", - - "fields": [] - } - , - {"method":"post", - - "destination": "LIQU", - - "group": "Клиринг", - - "name": "иквидационная сессия по обязательтсвам участника", - - "fields": [] - } - , - {"method":"post", - - "destination": "STRM", - - "group": "Клиринг", - - "name": "Начало торговой сессии секции МКР", - - "fields": [] - } - , - {"method":"post", - - "destination": "ETRM", - - "group": "Клиринг", - - "name": "Завершение торговой сессии секции МКР", - - "fields": [] - } - , - {"method":"post", - - "destination": "SIPO", - - "group": "Клиринг", - - "name": "Начало торговой сессии по первичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "EIPO", - - "group": "Клиринг", - - "name": "Завершение торговой сессии по первичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "STRF", - - "group": "Клиринг", - - "name": "Начало торговой сессии по вторичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "ETRF", - - "group": "Клиринг", - - "name": "Завершение торговой сессии по вторичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "RCHK", - - "group": "Клиринг", - - "name": "Запрос на сверку активов", - - "fields": [] - } - , - {"method":"post", - - "destination": "GRYT", - - "group": "Клиринг", - - "name": "Сформировать регистр на текущий день", - - "fields": [] - } - , - {"method":"post", - - "destination": "GRRT", - - "group": "Клиринг", - - "name": "Сформировать реестр на текущий день", - - "fields": [] - } - , {"method":"post", "destination": "GORD", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", "name": "Формирование реестра распоряжений, направленных расчетному депозитарию", @@ -5332,25 +5188,51 @@ , {"method":"post", - "destination": "LOSC", + "destination": "EXLR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", - "name": "Загрузить инструменты", + "name": "Формирование реестра обязательств, исключенных из клирингового пула", "fields": [] } , {"method":"post", - "destination": "LOCM", + "destination": "LBSR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", - "name": "Загрузить участников", + "name": "Формирование реестра учета обязательств", "fields": [] } + , + {"method":"post", + + "destination": "ECNR", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование реестра сделок", + + "fields": [] + } + , + {"method":"post", + + "destination": "GREP", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование отчетности", + + "fields": [ + {"code": "sessionId", + "type": 1,"name": "Клиринговая сессия","shortname": "Сессия","link": "session" + } + ] + } ] } , 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 a7999061e..8cdbfd236 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -367,8 +367,8 @@ - - + + @@ -381,7 +381,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -456,7 +456,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -526,7 +526,7 @@ - + @@ -539,7 +539,7 @@ - + @@ -571,7 +571,7 @@ - + @@ -591,7 +591,7 @@ - + @@ -611,13 +611,13 @@ - + - + @@ -636,8 +636,8 @@ - - + + @@ -651,7 +651,7 @@ - + @@ -665,12 +665,12 @@ - + - + @@ -688,8 +688,8 @@ - - + + @@ -708,7 +708,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -754,9 +754,9 @@ - - - + + + @@ -767,7 +767,7 @@ - + @@ -775,12 +775,12 @@ - + - + @@ -835,7 +835,7 @@ - + @@ -844,8 +844,8 @@ - - + + @@ -867,13 +867,13 @@ - + - + @@ -921,7 +921,7 @@ - + @@ -992,10 +992,10 @@ - + - + @@ -1005,9 +1005,9 @@ - + - + @@ -1019,7 +1019,7 @@ - + @@ -1049,8 +1049,8 @@
- - + + @@ -1058,23 +1058,23 @@ +
- - - + + +
- - - + + - + @@ -1090,15 +1090,15 @@ - + - + - + @@ -1111,8 +1111,8 @@
- - + + @@ -1121,24 +1121,24 @@ +
- - - + + +
- - - + + - + @@ -1164,77 +1164,51 @@ - + - - - - - - - - - - - + - + - + - - - + + + - + - + - + +
+ + + - + - + - + - + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 00716c327..e30767a8b 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.5.0.25", + "version": "3.5.0.26", "enums": { @@ -1640,11 +1640,11 @@ } , {"code": "companySymbol", - "field": "id","type": 12,"name": "Тип реквизита","shortname": "Тип реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbol","link": "companySymbols","extends": "companySymbols" + "field": "id","type": 12,"name": "Тип реквизита","shortname": "Тип реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbol","link": "companySymbols","extends": "companySymbols","ignore": true } , {"code": "companySymbolValue", - "field": "id","type": 2,"length": 255,"name": "Значение реквизита","shortname": "Значение реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbolValue","link": "companySymbols","extends": "companySymbols" + "field": "id","type": 2,"length": 255,"name": "Значение реквизита","shortname": "Значение реквизита","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "companyId","linkCode": "companySymbolValue","link": "companySymbols","extends": "companySymbols","ignore": true } , {"code": "workflowStatus", @@ -1699,6 +1699,8 @@ "confirmation": "shortName,tradingCode", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "company","linkCode": "id","required": true @@ -1911,6 +1913,8 @@ "name": "Удаление категории участника клиринга", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clearingCategory","linkCode": "id","required": true @@ -1990,6 +1994,8 @@ "name": "Удаление контакта компании", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "contact","linkCode": "id","required": true @@ -2189,6 +2195,8 @@ "confirmation": "documentType,number,companyId", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "profileDocument","linkCode": "id","required": true @@ -2270,6 +2278,8 @@ "name": "Удаление реквизита компании", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "profileDocument","linkCode": "id","required": true @@ -2327,7 +2337,7 @@ } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , {"code": "shortName", @@ -2471,7 +2481,7 @@ } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2553,7 +2563,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2636,7 +2646,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2663,6 +2673,8 @@ "confirmation": "securitySymbol,shortName", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "moneyMarketSecurity","linkCode": "id","required": true @@ -2744,11 +2756,11 @@ } , {"code": "lotSize", - "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing" + "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing","ignore": true } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","extends": "security" } , {"code": "shortNameEng", @@ -2806,7 +2818,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2865,7 +2877,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -2888,6 +2900,8 @@ "confirmation": "securitySymbol,shortName", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "equitySecurity","linkCode": "id","required": true @@ -2959,11 +2973,11 @@ } , {"code": "lotSize", - "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing" + "field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","extends": "listing","ignore": true } , {"code": "issuerId", - "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","extends": "security" + "type": 1,"dbname": "Идентификатор эмитента","name": "Наименование эмитента","shortname": "Эмитент","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","extends": "security" } , {"code": "shortNameEng", @@ -3041,7 +3055,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -3120,7 +3134,7 @@ } , {"code": "issuerId", - "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company" + "type": 1,"name": "Наименование эмитента","shortname": "Эмитент","link": "company","linkCode": "shortName" } , {"code": "shortNameEng", @@ -3248,15 +3262,15 @@ "fields": [ {"code": "securityId", - "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": true,"sortable": true,"link": "security","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": true,"sortable": true,"visible": true,"link": "security","linkCode": "shortName" } , {"code": "market", - "type": 12,"dbname": "Код торговой секции","name": "Наименование режима","shortname": "Режим","searchable": true,"sortable": true,"link": "market","linkCode": "description" + "type": 12,"dbname": "Код торговой секции","name": "Наименование режима","shortname": "Режим","searchable": true,"sortable": true,"visible": true,"link": "market","linkCode": "description" } , {"code": "lotSize", - "type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true + "type": 11,"name": "Размер лота","shortname": "Лот","searchable": true,"sortable": true,"visible": true } , {"code": "symbolCode", @@ -3300,7 +3314,7 @@ } , {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","required": true,"linkCode": "code" + "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkCode": "description","required": true } , {"code": "lotSize", @@ -3333,7 +3347,7 @@ } , {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkCode": "code","required": true,"enabled": false + "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkCode": "description","required": true,"enabled": false } , {"code": "lotSize", @@ -3356,6 +3370,8 @@ "confirmation": "securityId,market", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "listing","linkCode": "id","required": true @@ -3593,6 +3609,8 @@ "confirmation": "companyId,code", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3628,11 +3646,11 @@ } , {"code": "moneyAccountId", - "type": 1,"dbname": "Идентификатор денежного счета","name": "Номер денежного счета","shortname": "Денежный счет","searchable": true,"sortable": true,"link": "account" + "type": 1,"dbname": "Идентификатор денежного счета","name": "Номер денежного счета","shortname": "Денежный счет","searchable": true,"sortable": true,"link": "account","linkCode": "account" } , {"code": "depoAccountId", - "type": 1,"dbname": "Идентификатор депозитарного счета","name": "Номер депозитарного счета","shortname": "Депозитарный счет","searchable": true,"sortable": true,"link": "account" + "type": 1,"dbname": "Идентификатор депозитарного счета","name": "Номер депозитарного счета","shortname": "Депозитарный счет","searchable": true,"sortable": true,"link": "account","linkCode": "account" } , {"code": "tradingClearingRegistryType", @@ -3728,6 +3746,8 @@ "confirmation": "companyId,code", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3751,7 +3771,7 @@ "fields": [ {"code": "companyId", - "type": 1,"dbname": "Идентификатор участника","name": "Наименование участника","shortname": "Участник","searchable": true,"sortable": true,"visible": true,"link": "company" + "type": 1,"dbname": "Идентификатор участника","name": "Наименование участника","shortname": "Участник","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" } , {"code": "tradingCode", @@ -4242,7 +4262,7 @@ } , {"code": "status", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "serviceStatus","extends": "account" + "field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account" } , {"code": "id", @@ -4254,7 +4274,7 @@ "name": "Добавление счета вывода средств из ПРЦ", - "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account", "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNewAction", @@ -4296,7 +4316,7 @@ } , {"code": "companyId", - "type": 1,"name": "Компания","shortname": "Компания","link": "company","linkCode": "shortName","required": true + "type": 1,"name": "Компания","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } ] } @@ -4305,7 +4325,7 @@ "name": "Изменение счета вывода средств из ПРЦ", - "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account", "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction", @@ -4358,6 +4378,8 @@ "confirmation": "currency,bankIdentificationCode,correspondentAccount,taxpayerIdentificationNumber,taxRegistrationReasonCode,account", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "bankAccount","linkCode": "id","required": true @@ -4499,11 +4521,11 @@ } , {"code": "companyId", - "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"visible": true,"link": "company","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"link": "company","linkCode": "shortName" } , {"code": "securityId", - "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"visible": true,"link": "security","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"link": "security","linkCode": "shortName" } , {"code": "id", @@ -4533,6 +4555,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4541,17 +4567,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4574,6 +4596,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4582,17 +4608,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4601,7 +4623,9 @@ "name": "Блокировка шаблона расписания операционного дня", - "confirmation": "task,taskTime,taskStatus,companyId,securityId", + "confirmation": "task,taskTime,taskStatus,section,sessionType", + + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", "fields": [ {"code": "id", @@ -4664,7 +4688,7 @@ } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } ] } @@ -4689,7 +4713,7 @@ } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } ] } @@ -4698,7 +4722,9 @@ "name": "Блокировка записи в календаре", - "confirmation": "clearingDate,dayStatus,companyId", + "confirmation": "clearingDate,dayStatus", + + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", "fields": [ {"code": "id", @@ -4749,11 +4775,11 @@ } , {"code": "companyId", - "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"visible": true,"link": "company","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": false,"sortable": false,"link": "company","linkCode": "shortName" } , {"code": "securityId", - "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"visible": true,"link": "security","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"link": "security","linkCode": "shortName" } , {"code": "id", @@ -4787,6 +4813,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4795,17 +4825,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4832,6 +4858,10 @@ {"code": "taskTime", "type": 5,"name": "Время задачи","shortname": "Время задачи","required": true } + , + {"code": "taskStatus", + "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true + } , {"code": "section", "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" @@ -4840,17 +4870,13 @@ {"code": "sessionType", "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" } - , - {"code": "taskStatus", - "type": 12,"name": "Наименование статуса","shortname": "Статус","link": "taskStatus","required": true - } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } @@ -4859,7 +4885,9 @@ "name": "Блокировка расписания", - "confirmation": "task,taskTime,clearingDate,market,taskStatus,companyId,securityId", + "confirmation": "task,clearingDate,taskTime,taskStatus,section,sessionType", + + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", "fields": [ {"code": "id", @@ -4964,79 +4992,24 @@ } ] ,"actions":[ - {"method":"post", - - "destination": "GBAL", - - "group": "Обмен с расчетной организацией", - - "name": "Зачисление остатков (загрузка ДФ-57 и ДФ-01)", - - "fields": [] - } - , - {"method":"post", - - "destination": "ABLK", - - "group": "Обмен с расчетной организацией", - - "name": "Блокировка счета (загрузка ДФ-12)", - - "fields": [] - } - , {"method":"post", "destination": "GALB", "group": "Обмен с расчетной организацией", - "name": "Запрос остатков по всем счетам (экспорт ДФ-08)", + "name": "Запрос остатков по всем счетам (отправка ДФ-51, ДФ-56 для получения ответа ДФ-01, ДФ-57)", "fields": [] } , {"method":"post", - "destination": "ADBL", + "destination": "OUTV", "group": "Обмен с расчетной организацией", - "name": "Дозачисление/списание остатков (загрузка ДФ-16)", - - "fields": [] - } - , - {"method":"post", - - "destination": "CORD", - - "group": "Обмен с расчетной организацией", - - "name": "Формирование сводного платежного поручения (экспорт ДФ-03/ДФ-11)", - - "fields": [] - } - , - {"method":"post", - - "destination": "CORC", - - "group": "Обмен с расчетной организацией", - - "name": "Получение подтверждения переводов (загрузка ДФ-04)", - - "fields": [] - } - , - {"method":"post", - - "destination": "CMBA", - - "group": "Обмен с расчетной организацией", - - "name": "Формирование распоряжения на перевод с ТБС (экспорт ДФ-11)", + "name": "Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)", "fields": [] } @@ -5054,22 +5027,66 @@ , {"method":"post", - "destination": "GACA", + "destination": "LIMM", "group": "Обмен с Торговой системой", - "name": "Создание файла остатков CSV по клиринговым счетам", + "name": "Выгрузка в Торговую систему остатков по деньгам (отправка lim)", "fields": [] } , {"method":"post", - "destination": "GAIA", + "destination": "LIMS", "group": "Обмен с Торговой системой", - "name": "Создание файла остатков CSV по внутренним информационным счетам", + "name": "Выгрузка в Торговую систему остатков по бумагам (отправка lim)", + + "fields": [] + } + , + {"method":"post", + + "destination": "LOCM", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка участников", + + "fields": [] + } + , + {"method":"post", + + "destination": "LOSC", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка инструментов", + + "fields": [] + } + , + {"method":"post", + + "destination": "GVER", + + "group": "Общее", + + "name": "Запуск сверки", + + "fields": [] + } + , + {"method":"post", + + "destination": "GRYT", + + "group": "Общее", + + "name": "Подготовка КС к клиринговому дню", "fields": [] } @@ -5082,59 +5099,34 @@ "name": "Запуск клиринговой сессии", - "confirmation": "companyId,securityId", + "confirmation": "section,sessionType", "fields": [ + {"code": "section", + "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" + } + , + {"code": "sessionType", + "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" + } + , {"code": "companyId", - "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName","visible": false } , {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName" + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false } ] } , {"method":"post", - "destination": "SPRC", + "destination": "GRRT", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", - "name": "Запуск преклиринга", - - "fields": [] - } - , - {"method":"post", - - "destination": "SPOC", - - "group": "Клиринг", - - "name": "Запуск постклиринга", - - "fields": [] - } - , - {"method":"post", - - "destination": "GVER", - - "group": "Клиринг", - - "name": "Запуск сверки", - - "fields": [] - } - , - {"method":"post", - - "destination": "GCMR", - - "group": "Клиринг", - - "name": "Формирование реестра участников клиринга", + "name": "Формирование реестра остатков ценных бумаг", "fields": [] } @@ -5143,187 +5135,51 @@ "destination": "GBRR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", "name": "Формирование реестра остатков денежных средств", "fields": [] } , + {"method":"post", + + "destination": "ADLR", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование реестра обязательств, допущенных к клирингу", + + "fields": [] + } + , + {"method":"post", + + "destination": "CDLR", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование реестра обязательств, прошедших процедуру контроля обеспечения", + + "fields": [] + } + , {"method":"post", "destination": "GORR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", "name": "Формирование реестра распоряжений, направленных расчетной организации", "fields": [] } , - {"method":"post", - - "destination": "GSRR", - - "group": "Клиринг", - - "name": "Формирование реестра отправленных отчетов", - - "fields": [] - } - , - {"method":"post", - - "destination": "GREP", - - "group": "Клиринг", - - "name": "Формирование отчетности", - - "fields": [ - {"code": "sessionId", - "type": 1,"name": "Клиринговая сессия","shortname": "Сессия","link": "session" - } - ] - } - , - {"method":"post", - - "destination": "LIMM", - - "group": "Обмен с Торговой системой", - - "name": "Выгрузка в торговую систему остатков по деньгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "LIMS", - - "group": "Обмен с Торговой системой", - - "name": "Выгрузка в торговую систему остатков по бумагам", - - "fields": [] - } - , - {"method":"post", - - "destination": "LIQU", - - "group": "Клиринг", - - "name": "иквидационная сессия по обязательтсвам участника", - - "fields": [] - } - , - {"method":"post", - - "destination": "STRM", - - "group": "Клиринг", - - "name": "Начало торговой сессии секции МКР", - - "fields": [] - } - , - {"method":"post", - - "destination": "ETRM", - - "group": "Клиринг", - - "name": "Завершение торговой сессии секции МКР", - - "fields": [] - } - , - {"method":"post", - - "destination": "SIPO", - - "group": "Клиринг", - - "name": "Начало торговой сессии по первичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "EIPO", - - "group": "Клиринг", - - "name": "Завершение торговой сессии по первичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "STRF", - - "group": "Клиринг", - - "name": "Начало торговой сессии по вторичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "ETRF", - - "group": "Клиринг", - - "name": "Завершение торговой сессии по вторичным торгам", - - "fields": [] - } - , - {"method":"post", - - "destination": "RCHK", - - "group": "Клиринг", - - "name": "Запрос на сверку активов", - - "fields": [] - } - , - {"method":"post", - - "destination": "GRYT", - - "group": "Клиринг", - - "name": "Сформировать регистр на текущий день", - - "fields": [] - } - , - {"method":"post", - - "destination": "GRRT", - - "group": "Клиринг", - - "name": "Сформировать реестр на текущий день", - - "fields": [] - } - , {"method":"post", "destination": "GORD", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", "name": "Формирование реестра распоряжений, направленных расчетному депозитарию", @@ -5332,25 +5188,51 @@ , {"method":"post", - "destination": "LOSC", + "destination": "EXLR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", - "name": "Загрузить инструменты", + "name": "Формирование реестра обязательств, исключенных из клирингового пула", "fields": [] } , {"method":"post", - "destination": "LOCM", + "destination": "LBSR", - "group": "Клиринг", + "group": "Формирование реестров и отчетности", - "name": "Загрузить участников", + "name": "Формирование реестра учета обязательств", "fields": [] } + , + {"method":"post", + + "destination": "ECNR", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование реестра сделок", + + "fields": [] + } + , + {"method":"post", + + "destination": "GREP", + + "group": "Формирование реестров и отчетности", + + "name": "Формирование отчетности", + + "fields": [ + {"code": "sessionId", + "type": 1,"name": "Клиринговая сессия","shortname": "Сессия","link": "session" + } + ] + } ] } , diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql index 28d31c8cd..ea34850e6 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql @@ -1,5 +1,5 @@ --- DB version: 3.5.0.21 --- DATA version: 3.5.0.5 +-- DB version: 3.5.0.26 +-- DATA version: 3.5.0.6 /* Dictionaries */ INSERT INTO ALLOWED_DICTIONARY(ID, CODE, NAME) values (1, 'ALWD', 'Разрешено') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; @@ -342,6 +342,8 @@ INSERT INTO REGISTRY_STATUS_DICTIONARY(ID, CODE, NAME) values (8, 'NACK', 'Не INSERT INTO REGISTRY_STATUS_DICTIONARY(ID, CODE, NAME) values (9, 'NACC', 'Не допущено у контрагента') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO REGISTRY_STATUS_DICTIONARY(ID, CODE, NAME) values (10, 'SPLT', 'Разделен') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + INSERT INTO BALANCE_DIMENSION_DICTIONARY(ID, CODE, NAME) values (1, 'PICS', 'Штуки') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO BALANCE_DIMENSION_DICTIONARY(ID, CODE, NAME) values (2, 'LOTS', 'Лоты') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; @@ -384,69 +386,49 @@ INSERT INTO CLEARING_ACCOUNT_TYPE_DICTIONARY(ID, CODE, NAME) values (1, 'A', 'С INSERT INTO CLEARING_ACCOUNT_TYPE_DICTIONARY(ID, CODE, NAME) values (2, 'B', 'Счет клиента') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (1, 'GBAL', 'Зачисление остатков') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (1, 'GALB', 'Запрос остатков по всем счетам (отправка ДФ-51, ДФ-56 для получения ответа ДФ-01, ДФ-57)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (3, 'ABLK', 'Блокировка счета') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (2, 'OUTV', 'Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (4, 'GALB', 'Запрос остатков по всем счетам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (3, 'GTRD', 'Получение сделок из Торговой системы') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (5, 'ADBL', 'Дозачисление/списание остатков') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (4, 'LIMM', 'Выгрузка в Торговую систему остатков по деньгам (отправка lim)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (7, 'CORD', 'Формирование сводного платежного поручения') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (5, 'LIMS', 'Выгрузка в Торговую систему остатков по бумагам (отправка lim)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (8, 'CORC', 'Получение подтверждения переводов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (6, 'LOCM', 'Загрузка участников') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (9, 'GVER', 'Запуск сверки') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (7, 'LOSC', 'Загрузка инструментов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (12, 'CMBA', 'Формирование распоряжения на перевод с ТБС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (8, 'GVER', 'Запуск сверки') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (14, 'GCMR', 'Формирование реестра участников клиринга') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (9, 'GRYT', 'Подготовка КС к клиринговому дню') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (15, 'GBRR', 'Формирование реестра остатков денежных средств ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (10, 'SCLR', 'Запуск клиринговой сессии') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (16, 'GORR', 'Формирование реестра распоряжений, направленных расчетной организации') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (11, 'GRRT', 'Формирование реестра остатков ценных бумаг') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (17, 'GREP', 'Формирование отчетности') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (12, 'GBRR', 'Формирование реестра остатков денежных средств') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (21, 'GSRR', 'Формирование реестра отправленных отчетов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (13, 'ADLR', 'Формирование реестра обязательств, допущенных к клирингу') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (25, 'GTRD', 'Получение сделок из Торговой системы') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (14, 'CDLR', 'Формирование реестра обязательств, прошедших процедуру контроля обеспечения') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (32, 'GACA', 'Создание файла остатков CSV по клиринговым счетам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (15, 'GORR', 'Формирование реестра распоряжений, направленных расчетной организации') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (33, 'GAIA', 'Создание файла остатков CSV по внутренним информацион.счетам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (16, 'GORD', 'Формирование реестра распоряжений, направленных расчетному депозитарию') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (35, 'SCLR', 'Запуск клиринговой сессии') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (17, 'EXLR', 'Формирование реестра обязательств, исключенных из клирингового пула') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (36, 'SPRC', 'Запуск преклиринга') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (18, 'LBSR', 'Формирование реестра учета обязательств') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (37, 'SPOC', 'Запуск постклиринга') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (19, 'ECNR', 'Формирование реестра сделок') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (38, 'LIMM', 'Выгрузка в торговую систему остатков по деньгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (20, 'GREP', 'Формирование отчетности') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (39, 'LIMS', 'Выгрузка в торговую систему остатков по бумагам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (21, 'STRS', 'Начало торговой сессии') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (40, 'LIQU', 'Ликвидационная сессия по обязательтсвам участника') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (41, 'STRM', 'Начало торговой сессии секции МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (42, 'ETRM', 'Завершение торговой сессии секции МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (43, 'SIPO', 'Начало торговой сессии по первичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (44, 'EIPO', 'Завершение торговой сессии по первичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (45, 'STRF', 'Начало торговой сессии по вторичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (46, 'ETRF', 'Завершение торговой сессии по вторичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (47, 'RCHK', 'Запрос на сверку активов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (48, 'GRYT', 'Сформировать регистр на текущий день') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (49, 'GRRT', 'Сформировать реестр на текущий день') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; - -INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (50, 'GORD', 'Формирование реестра распоряжений, направленных расчетному депозитарию') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (22, 'ETRS', 'Завершение торговой сессии') 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; @@ -614,6 +596,20 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1015, 'SECR', 'Вал INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1016, 'SECR', 'Валюта %s не найдена.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1017, 'SECR', 'Инструмент на режиме %s уже существует.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1018, 'SECR', 'Инструмент на режиме %s не найден.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1019, 'SECR', 'Инструмент на режиме %s неактивен.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1020, 'SECR', 'Режим %s не найден.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1021, 'SECR', 'Информиция об инструментах Денежного рынка на режимах добавляется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1022, 'SECR', 'Информиция об инструментах Денежного рынка на режимах изменяется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1023, 'SECR', 'Информиция об инструментах Денежного рынка на режимах блокируется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (2000, 'UTIL', 'Общая ошибка модуля utility-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (2001, 'UTIL', 'Нет прав на проведение данной операции.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; @@ -828,6 +824,10 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7014, 'SCHD', 'Ука INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7015, 'SCHD', 'Указанная компания неактивна.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7016, 'SCHD', 'Возможно добавить запись в календарь только на будущую дату.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7017, 'SCHD', 'Возможно добавить задачу только на будущее время.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (8000, 'CNTR', 'Общая ошибка модуля control-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (9000, 'BAPI', 'Ошибка проверки поля %s.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; @@ -856,12 +856,14 @@ INSERT INTO COMPANY(ID, FULL_NAME, SHORT_NAME, TRADING_CODE, CLEARING_CODE, WORK INSERT INTO COMPANY(ID, FULL_NAME, SHORT_NAME, TRADING_CODE, CLEARING_CODE, WORKFLOW_STATUS) values (4, 'ЗАО «Санкт-Петербургский Расчетно-Депозитарный Центр»', 'РДЦ', '', '', 'ACTV') ON CONFLICT (ID) DO UPDATE SET FULL_NAME = EXCLUDED.FULL_NAME, SHORT_NAME = EXCLUDED.SHORT_NAME, TRADING_CODE = EXCLUDED.TRADING_CODE, CLEARING_CODE = EXCLUDED.CLEARING_CODE, WORKFLOW_STATUS = EXCLUDED.WORKFLOW_STATUS; -INSERT INTO COMPANY(ID, FULL_NAME, SHORT_NAME, TRADING_CODE, CLEARING_CODE, WORKFLOW_STATUS) values (5, 'Центральный Банк Российской Федерации', 'ЦБ РФ', '', '', 'ACTV') ON CONFLICT (ID) DO UPDATE SET FULL_NAME = EXCLUDED.FULL_NAME, SHORT_NAME = EXCLUDED.SHORT_NAME, TRADING_CODE = EXCLUDED.TRADING_CODE, CLEARING_CODE = EXCLUDED.CLEARING_CODE, WORKFLOW_STATUS = EXCLUDED.WORKFLOW_STATUS; - INSERT INTO COMPANY_SYMBOLS(ID, COMPANY_ID, COMPANY_SYMBOL, COMPANY_SYMBOL_VALUE) values (1, 1, 'BIC', '044030920') ON CONFLICT (ID) DO UPDATE SET COMPANY_ID = EXCLUDED.COMPANY_ID, COMPANY_SYMBOL = EXCLUDED.COMPANY_SYMBOL, COMPANY_SYMBOL_VALUE = EXCLUDED.COMPANY_SYMBOL_VALUE; INSERT INTO COMPANY_SYMBOLS(ID, COMPANY_ID, COMPANY_SYMBOL, COMPANY_SYMBOL_VALUE) values (2, 2, 'BIC', '044030505') ON CONFLICT (ID) DO UPDATE SET COMPANY_ID = EXCLUDED.COMPANY_ID, COMPANY_SYMBOL = EXCLUDED.COMPANY_SYMBOL, COMPANY_SYMBOL_VALUE = EXCLUDED.COMPANY_SYMBOL_VALUE; +INSERT INTO CURRENCY(ID, CURRENCY_CODE) values (643, 'RUB') ON CONFLICT (ID) DO UPDATE SET CURRENCY_CODE = EXCLUDED.CURRENCY_CODE; + +INSERT INTO SECURITY(INSTRUMENT_TYPE, SHORT_NAME, FULL_NAME, SECURITY_SYMBOL, WORKFLOW_STATUS, ID) values ('CRNC', 'RUB', 'Российский рубль', 'RUB', 'ACTV', 643) ON CONFLICT (ID) DO UPDATE SET INSTRUMENT_TYPE = EXCLUDED.INSTRUMENT_TYPE, SHORT_NAME = EXCLUDED.SHORT_NAME, FULL_NAME = EXCLUDED.FULL_NAME, SECURITY_SYMBOL = EXCLUDED.SECURITY_SYMBOL, WORKFLOW_STATUS = EXCLUDED.WORKFLOW_STATUS; + INSERT INTO ACCOUNT(ID, COMPANY_ID, ACCOUNT, ACCOUNT_TYPE, STATUS, PROCESSING_SIGN) values (1, 1, '30414810300000006000', 'TRAN', 'ACTV', 'ALWD') ON CONFLICT (ID) DO UPDATE SET COMPANY_ID = EXCLUDED.COMPANY_ID, ACCOUNT = EXCLUDED.ACCOUNT, ACCOUNT_TYPE = EXCLUDED.ACCOUNT_TYPE, STATUS = EXCLUDED.STATUS, PROCESSING_SIGN = EXCLUDED.PROCESSING_SIGN; INSERT INTO ACCOUNT(ID, COMPANY_ID, ACCOUNT, ACCOUNT_TYPE, STATUS, PROCESSING_SIGN) values (2, 1, '30414810600000007000', 'ANLT', 'ACTV', 'ALWD') ON CONFLICT (ID) DO UPDATE SET COMPANY_ID = EXCLUDED.COMPANY_ID, ACCOUNT = EXCLUDED.ACCOUNT, ACCOUNT_TYPE = EXCLUDED.ACCOUNT_TYPE, STATUS = EXCLUDED.STATUS, PROCESSING_SIGN = EXCLUDED.PROCESSING_SIGN; 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 cb3537967..70978cd94 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -1,4 +1,4 @@ --- DB version: 3.5.0.22 +-- DB version: 3.5.0.26 /* Dictionaries */ -- allowed - Справочник признаков допустимости использования объектов @@ -1376,17 +1376,17 @@ COMMENT ON COLUMN COUPON_PERIOD_HISTORY.PERIOD_START_DATE IS 'Окончание COMMENT ON COLUMN COUPON_PERIOD_HISTORY.ID IS 'Идентификатор записи'; --- listing - Листинг инструментов +-- listing - Инструменты на режимах DROP TABLE IF EXISTS LISTING; -CREATE TABLE LISTING(SECURITY_ID bigint, LOT_SIZE numeric(72,2), MARKET varchar(4), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); -COMMENT ON TABLE LISTING IS 'Листинг инструментов'; +CREATE TABLE LISTING(SECURITY_ID bigint, MARKET varchar(4), LOT_SIZE numeric(72,2), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +COMMENT ON TABLE LISTING IS 'Инструменты на режимах'; COMMENT ON COLUMN LISTING.SECURITY_ID IS 'Идентификатор инструмента (linked to security)'; -COMMENT ON COLUMN LISTING.LOT_SIZE IS 'Размер лота'; - COMMENT ON COLUMN LISTING.MARKET IS 'Код торговой секции (linked to market)'; +COMMENT ON COLUMN LISTING.LOT_SIZE IS 'Размер лота'; + COMMENT ON COLUMN LISTING.SYMBOL_CODE IS 'Код инструмента на торговой площадке'; COMMENT ON COLUMN LISTING.SYMBOL_NAME IS 'Наименование инструмента на торговой площадке'; @@ -1402,9 +1402,9 @@ COMMENT ON COLUMN LISTING.CREATED_AT IS 'Дата-время создания з COMMENT ON COLUMN LISTING.UPDATED_AT IS 'Дата-время изменения записи'; --- History log of listing - Листинг инструментов +-- History log of listing - Инструменты на режимах DROP TABLE IF EXISTS LISTING_HISTORY; -CREATE TABLE LISTING_HISTORY(LISTING_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), SECURITY_ID bigint, LOT_SIZE numeric(72,2), MARKET varchar(4), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); +CREATE TABLE LISTING_HISTORY(LISTING_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), SECURITY_ID bigint, MARKET varchar(4), LOT_SIZE numeric(72,2), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp); COMMENT ON TABLE LISTING_HISTORY IS 'История изменений таблицы listing'; COMMENT ON COLUMN LISTING_HISTORY.LISTING_ID IS 'Идентификатор записи в таблице LISTING'; COMMENT ON COLUMN LISTING_HISTORY.EVENT_TIME IS 'Дата и время изменения'; @@ -1413,10 +1413,10 @@ COMMENT ON COLUMN LISTING_HISTORY.EVENT_TYPE IS 'Тип изменения'; COMMENT ON COLUMN LISTING_HISTORY.SECURITY_ID IS 'Идентификатор инструмента (linked to security)'; -COMMENT ON COLUMN LISTING_HISTORY.LOT_SIZE IS 'Размер лота'; - COMMENT ON COLUMN LISTING_HISTORY.MARKET IS 'Код торговой секции (linked to market)'; +COMMENT ON COLUMN LISTING_HISTORY.LOT_SIZE IS 'Размер лота'; + COMMENT ON COLUMN LISTING_HISTORY.SYMBOL_CODE IS 'Код инструмента на торговой площадке'; COMMENT ON COLUMN LISTING_HISTORY.SYMBOL_NAME IS 'Наименование инструмента на торговой площадке'; @@ -2205,10 +2205,10 @@ COMMENT ON COLUMN LAUNCHER.CREATED_AT IS 'Дата-время создания COMMENT ON COLUMN LAUNCHER.UPDATED_AT IS 'Дата-время изменения записи'; --- session - Клиринговая сессия +-- session - Клиринговые сессии DROP TABLE IF EXISTS SESSION; CREATE TABLE SESSION(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SESSION_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, USER_ID bigint, SECTION varchar(4), SESSION_TYPE varchar(4)); -COMMENT ON TABLE SESSION IS 'Клиринговая сессия'; +COMMENT ON TABLE SESSION IS 'Клиринговые сессии'; COMMENT ON COLUMN SESSION.ID IS 'Идентификатор записи'; @@ -2231,7 +2231,7 @@ COMMENT ON COLUMN SESSION.SECTION IS 'Код наименования секци COMMENT ON COLUMN SESSION.SESSION_TYPE IS 'Код типа клиринговой сессии (linked to sessionType)'; --- History log of session - Клиринговая сессия +-- History log of session - Клиринговые сессии DROP TABLE IF EXISTS SESSION_HISTORY; CREATE TABLE SESSION_HISTORY(SESSION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SESSION_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, USER_ID bigint, SECTION varchar(4), SESSION_TYPE varchar(4)); COMMENT ON TABLE SESSION_HISTORY IS 'История изменений таблицы session'; From b770d8431fb1da462b76c06391b51adcb6b5ff13 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 26 May 2023 19:34:57 +0300 Subject: [PATCH 2/4] =?UTF-8?q?scheduler-service=20http://jira.mfd.msk:808?= =?UTF-8?q?8/browse/CLS-320=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=20enum.=20=D0=A2=D0=B0=D0=BC=20=D0=B5=D1=89=D1=91=20?= =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BD=D0=B0=D0=B4=D0=BE=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C,=20todo.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/spcex/platform/enumeration/Task.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java index cbf47b0f7..bde7c6d30 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java @@ -15,7 +15,7 @@ public enum Task implements IEnumKey { startPostClearing("SPOC"),// Запуск постклиринга createOrder("CORD"), createOrderConfirm("CORC"), - getAllBalance("GALB"), + getAllBalance("GALB"), // Запрос остатков по всем счетам (отправка ДФ-51, ДФ-56 для получения ответа ДФ-01, ДФ-57) createReport_GREP("GREP"), // Создание отчёта (report-service) RPRT нескольких видов, этот GREP unloadingSession_LIMM("LIMM"),//Выгрузка в торговую систему остатков по деньгам unloadingSession_LIMS("LIMS"),//Выгрузка в торговую систему остатков по бумагам @@ -37,6 +37,8 @@ public enum Task implements IEnumKey { createRegistry_GACA("GACA"), // Создание файла остатков CSV по клиринговым счетам forming_CMBA("CMBA"), // Формирование распоряжения на перевод с ТБС creatingFile_GAIA("GAIA"), // Создание файла остатков CSV по внутренним информацион.счетам + loadParty_LOCM("LOCM"), // Загрузка участников + loadIssue_LOSC("LOSC"), // Загрузка инструментов ; private final String key; From 8546affd947fbdc7615679442ad2978f3f8548d2 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 26 May 2023 19:42:26 +0300 Subject: [PATCH 3/4] meta 3.5.0.27 --- .../src/main/resources/meta/meta.json | 160 +++++++++--------- .../src/main/resources/meta/meta.xml | 43 ++--- .../backend-api/src/test/resources/meta.json | 160 +++++++++--------- 3 files changed, 186 insertions(+), 177 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 e30767a8b..d48786815 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.5.0.26", + "version": "3.5.0.27", "enums": { @@ -2473,7 +2473,7 @@ } , {"code": "termType", - "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType","ignore": true + "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType" } , {"code": "lotSize", @@ -2638,7 +2638,7 @@ } , {"code": "termType", - "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","visible": false + "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType" } , {"code": "description", @@ -3961,7 +3961,7 @@ ,"actions":[ {"method":"post", - "name": "Досрочное изъятие части денежных средств по депозиту МКР", + "name": "Досрочное изъятие депозита", "destination": "registries/splitDeposit", @@ -3970,8 +3970,12 @@ "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew", "fields": [ + {"code": "companyId", + "type": 1,"name": "Наименование участника","shortname": "Инициатор","link": "company","linkCode": "shortName","enabled": false + } + , {"code": "contract", - "type": 2,"length": 255,"name": "Договор","shortname": "Договор","required": true + "type": 2,"length": 255,"name": "Договор","shortname": "Номер договора","required": true,"enabled": false } , {"code": "outboundAmount", @@ -5016,6 +5020,35 @@ , {"method":"post", + "destination": "SCLR", + + "group": "Клиринг", + + "name": "Запуск клиринговой сессии", + + "confirmation": "section,sessionType", + + "fields": [ + {"code": "section", + "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" + } + , + {"code": "sessionType", + "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" + } + , + {"code": "companyId", + "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName","visible": false + } + , + {"code": "securityId", + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false + } + ] + } + , + {"method":"post", + "destination": "GTRD", "group": "Обмен с Торговой системой", @@ -5049,79 +5082,6 @@ , {"method":"post", - "destination": "LOCM", - - "group": "Обмен с интеграционными модулями", - - "name": "Загрузка участников", - - "fields": [] - } - , - {"method":"post", - - "destination": "LOSC", - - "group": "Обмен с интеграционными модулями", - - "name": "Загрузка инструментов", - - "fields": [] - } - , - {"method":"post", - - "destination": "GVER", - - "group": "Общее", - - "name": "Запуск сверки", - - "fields": [] - } - , - {"method":"post", - - "destination": "GRYT", - - "group": "Общее", - - "name": "Подготовка КС к клиринговому дню", - - "fields": [] - } - , - {"method":"post", - - "destination": "SCLR", - - "group": "Клиринг", - - "name": "Запуск клиринговой сессии", - - "confirmation": "section,sessionType", - - "fields": [ - {"code": "section", - "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" - } - , - {"code": "sessionType", - "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" - } - , - {"code": "companyId", - "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName","visible": false - } - , - {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false - } - ] - } - , - {"method":"post", - "destination": "GRRT", "group": "Формирование реестров и отчетности", @@ -5233,6 +5193,50 @@ } ] } + , + {"method":"post", + + "destination": "LOCM", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка участников", + + "fields": [] + } + , + {"method":"post", + + "destination": "LOSC", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка инструментов", + + "fields": [] + } + , + {"method":"post", + + "destination": "GVER", + + "group": "Общее", + + "name": "Запуск сверки", + + "fields": [] + } + , + {"method":"post", + + "destination": "GRYT", + + "group": "Общее", + + "name": "Подготовка КС к клиринговому дню", + + "fields": [] + } ] } , 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 8cdbfd236..b08418cf1 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -569,7 +569,7 @@ - + @@ -609,7 +609,7 @@ - + @@ -921,12 +921,13 @@ - - - + + + + - + @@ -1168,26 +1169,18 @@ - - - - - - - - - - - - - -
+ + + + + + @@ -1209,6 +1202,14 @@ + + + + + + + + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index e30767a8b..d48786815 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.5.0.26", + "version": "3.5.0.27", "enums": { @@ -2473,7 +2473,7 @@ } , {"code": "termType", - "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType","ignore": true + "type": 12,"dbname": "Код вида инструмента","name": "Наименование вида инструмента","shortname": "Вид инструмента","searchable": true,"sortable": true,"visible": false,"link": "termType" } , {"code": "lotSize", @@ -2638,7 +2638,7 @@ } , {"code": "termType", - "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType","visible": false + "type": 12,"name": "Наименование вида инструмента","shortname": "Вид инструмента","link": "termType" } , {"code": "description", @@ -3961,7 +3961,7 @@ ,"actions":[ {"method":"post", - "name": "Досрочное изъятие части денежных средств по депозиту МКР", + "name": "Досрочное изъятие депозита", "destination": "registries/splitDeposit", @@ -3970,8 +3970,12 @@ "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew", "fields": [ + {"code": "companyId", + "type": 1,"name": "Наименование участника","shortname": "Инициатор","link": "company","linkCode": "shortName","enabled": false + } + , {"code": "contract", - "type": 2,"length": 255,"name": "Договор","shortname": "Договор","required": true + "type": 2,"length": 255,"name": "Договор","shortname": "Номер договора","required": true,"enabled": false } , {"code": "outboundAmount", @@ -5016,6 +5020,35 @@ , {"method":"post", + "destination": "SCLR", + + "group": "Клиринг", + + "name": "Запуск клиринговой сессии", + + "confirmation": "section,sessionType", + + "fields": [ + {"code": "section", + "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" + } + , + {"code": "sessionType", + "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" + } + , + {"code": "companyId", + "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName","visible": false + } + , + {"code": "securityId", + "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false + } + ] + } + , + {"method":"post", + "destination": "GTRD", "group": "Обмен с Торговой системой", @@ -5049,79 +5082,6 @@ , {"method":"post", - "destination": "LOCM", - - "group": "Обмен с интеграционными модулями", - - "name": "Загрузка участников", - - "fields": [] - } - , - {"method":"post", - - "destination": "LOSC", - - "group": "Обмен с интеграционными модулями", - - "name": "Загрузка инструментов", - - "fields": [] - } - , - {"method":"post", - - "destination": "GVER", - - "group": "Общее", - - "name": "Запуск сверки", - - "fields": [] - } - , - {"method":"post", - - "destination": "GRYT", - - "group": "Общее", - - "name": "Подготовка КС к клиринговому дню", - - "fields": [] - } - , - {"method":"post", - - "destination": "SCLR", - - "group": "Клиринг", - - "name": "Запуск клиринговой сессии", - - "confirmation": "section,sessionType", - - "fields": [ - {"code": "section", - "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code" - } - , - {"code": "sessionType", - "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code" - } - , - {"code": "companyId", - "type": 1,"name": "Наименование инициатора","shortname": "Инициатор","link": "company","linkCode": "shortName","visible": false - } - , - {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","link": "security","linkCode": "shortName","visible": false - } - ] - } - , - {"method":"post", - "destination": "GRRT", "group": "Формирование реестров и отчетности", @@ -5233,6 +5193,50 @@ } ] } + , + {"method":"post", + + "destination": "LOCM", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка участников", + + "fields": [] + } + , + {"method":"post", + + "destination": "LOSC", + + "group": "Обмен с интеграционными модулями", + + "name": "Загрузка инструментов", + + "fields": [] + } + , + {"method":"post", + + "destination": "GVER", + + "group": "Общее", + + "name": "Запуск сверки", + + "fields": [] + } + , + {"method":"post", + + "destination": "GRYT", + + "group": "Общее", + + "name": "Подготовка КС к клиринговому дню", + + "fields": [] + } ] } , From 9a40d06eb976fe54f35828e4c6ba902568f372f5 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 26 May 2023 19:28:05 +0300 Subject: [PATCH 4/4] define marketcodes for bn session --- .../config/MarketCodesBySessionConfig.java | 28 +++++++++++++++++++ .../stage/PrimaryAuctionBnSession.java | 13 +++++---- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java new file mode 100644 index 000000000..5e8dd6bce --- /dev/null +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java @@ -0,0 +1,28 @@ +package ru.spcex.clearing.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import ru.clearing.classes.statics.data.misc.Market; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.platform.enumeration.MarketType; +import ru.spcex.platform.enumeration.Section; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Configuration +public class MarketCodesBySessionConfig { + + @Bean(name = "marketCodesForBn") + public List marketCodesForBn(ImdgProvider imdgProvider) { + Imdg marketImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Market, Market.class); + Collection markets = marketImdg.getCollectionObjectsByFieldValues(Map.of( + "section", Section.FOND.getKey(), + "marketType", MarketType.PRMR.getKey())); + return markets.stream().map(Market::getCode).distinct().collect(Collectors.toList()); + } +} diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java index 80131da2b..7b69881cd 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java @@ -3,6 +3,7 @@ package ru.spcex.clearing.session.stage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.execution.ExecutionCommon; import ru.clearing.classes.statics.data.execution.ExecutionFond; @@ -40,10 +41,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali private final EndStageNotification endStageNotification; private final Imdg executionFondImdg; - - private List marketCodes = List.of("BMFC", "SMMC", "AEPC", "WBIC", "KBVC", "WBFC", "BMVC", "ABIC", - "AESC", "ABFC", "KBIC", "WBMC", "BMMC", "ABEC", "SMIC", "ABMC", "SMVC", "KBFC", "SKVC", "ABVC", "WEPC", - "KBMC", "SMFC", "BKVC", "WBVC", "BMIC", "WESC"); + private final List marketCodes; public PrimaryAuctionBnSession( @@ -56,7 +54,11 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali FormingRegistersOnOS formingRegistersOnOS, FormingPaymentInstruction formingPaymentInstruction, UnlockResources unlockResources, - FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, InspectionObligations inspectionObligations) { + FinishingSession finishingSession, + EndStageNotification endStageNotification, + IMessageResolver messageResolver, + InspectionObligations inspectionObligations, + @Qualifier("marketCodesForBn") List marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; this.dealsPrepare = dealsPrepare; @@ -70,6 +72,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali this.endStageNotification = endStageNotification; this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class); this.inspectionObligations = inspectionObligations; + this.marketCodes = marketCodes; } @Override