From 7c0b2d92152ebb87d167ddf1f29896746d9635ff Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 15 Aug 2023 12:12:06 +0300 Subject: [PATCH] backend-api platform-messaging scheduler-service meta add field to Launcher OUTV --- .../request/cud/schedule/LauncherNew.java | 98 + .../src/main/resources/meta/meta.json | 77 +- .../src/main/resources/meta/meta.xml | 4306 +++++++++-------- .../backend-api/src/test/resources/meta.json | 77 +- .../service/LauncherServiceTest.java | 10 + .../cud/schedule/LauncherCommandRequest.java | 82 + 6 files changed, 2467 insertions(+), 2183 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java index 8b2c1ab30..2d37ab1a7 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java @@ -9,6 +9,7 @@ import ru.spcex.clearing.platform.messaging.domain.ActionType; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.platform.utils.enumeration.EnumMessage; +import java.math.BigDecimal; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -35,6 +36,31 @@ public class LauncherNew implements IAction { @JsonProperty private Long sessionId; + @ApiModelProperty(value = "Текущий баланс", example = "12.22") + @JsonProperty + private BigDecimal balance; + @ApiModelProperty(value = "Наименование инструмента/валюты", example = "SPB") + @JsonProperty + private String securitySymbol; + @ApiModelProperty(value = "Сумма отправителя", example = "12.22") + @JsonProperty + private BigDecimal creditLeg_amount; + @ApiModelProperty(value = "Назначение платежа", example = "text") + @JsonProperty + private String paymentPurpose; + @ApiModelProperty(value = "Участник отправитель", example = "1000") + @JsonProperty + private Long senderId; + @ApiModelProperty(value = "Наименование счета отправителя", example = "1000") + @JsonProperty + private Long creditLeg_accountId; + @ApiModelProperty(value = "Участник получатель", example = "1000") + @JsonProperty + private Long addresseeId; + @ApiModelProperty(value = "Наименование счета получателя", example = "1000") + @JsonProperty + private Long debitLeg_accountId; + @Override public Object toRequest() { LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest(); @@ -45,6 +71,14 @@ public class LauncherNew implements IAction { taskRunnerCommandRequest.setSection(section); taskRunnerCommandRequest.setSessionType(sessionType); taskRunnerCommandRequest.setSessionId(sessionId); + taskRunnerCommandRequest.setBalance(balance); + taskRunnerCommandRequest.setSecuritySymbol(securitySymbol); + taskRunnerCommandRequest.setCreditLeg_amount(creditLeg_amount); + taskRunnerCommandRequest.setPaymentPurpose(paymentPurpose); + taskRunnerCommandRequest.setSenderId(senderId); + taskRunnerCommandRequest.setCreditLeg_accountId(creditLeg_accountId); + taskRunnerCommandRequest.setAddresseeId(addresseeId); + taskRunnerCommandRequest.setDebitLeg_accountId(debitLeg_accountId); return taskRunnerCommandRequest; } @@ -117,4 +151,68 @@ public class LauncherNew implements IAction { public void setSessionId(Long sessionId) { this.sessionId = sessionId; } + + public BigDecimal getBalance() { + return balance; + } + + public void setBalance(BigDecimal balance) { + this.balance = balance; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } + + public BigDecimal getCreditLeg_amount() { + return creditLeg_amount; + } + + public void setCreditLeg_amount(BigDecimal creditLeg_amount) { + this.creditLeg_amount = creditLeg_amount; + } + + public String getPaymentPurpose() { + return paymentPurpose; + } + + public void setPaymentPurpose(String paymentPurpose) { + this.paymentPurpose = paymentPurpose; + } + + public Long getSenderId() { + return senderId; + } + + public void setSenderId(Long senderId) { + this.senderId = senderId; + } + + public Long getCreditLeg_accountId() { + return creditLeg_accountId; + } + + public void setCreditLeg_accountId(Long creditLeg_accountId) { + this.creditLeg_accountId = creditLeg_accountId; + } + + public Long getAddresseeId() { + return addresseeId; + } + + public void setAddresseeId(Long addresseeId) { + this.addresseeId = addresseeId; + } + + public Long getDebitLeg_accountId() { + return debitLeg_accountId; + } + + public void setDebitLeg_accountId(Long debitLeg_accountId) { + this.debitLeg_accountId = debitLeg_accountId; + } } 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 782c2cfe7..044c55442 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.40", + "version": "3.5.0.41", "enums": { @@ -2462,7 +2462,7 @@ , "moneyMarketSecurity": { - "name": "Инструменты Денежного рынка", + "name": "Спецификации Денежного рынка", "destination": "securities/money-securities", @@ -2552,7 +2552,7 @@ ,"actions":[ {"method":"post", - "name": "Добавление инструмента Денежного рынка", + "name": "Добавление спецификации Денежного рынка", "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", @@ -2631,7 +2631,7 @@ , {"method":"put", - "name": "Изменение инструмента Денежного рынка", + "name": "Изменение спецификации Денежного рынка", "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", @@ -2714,7 +2714,7 @@ , {"method":"delete", - "name": "Блокировка инструмента Денежного рынка", + "name": "Блокировка спецификации Денежного рынка", "confirmation": "securitySymbol,shortName", @@ -2731,7 +2731,7 @@ , "tradedMoneyMarketSecurity": { - "name": "Инструменты денежного рынка, учавствующие в сделках", + "name": "Спецификации денежного рынка, учавствующие в сделках", "destination": "securities/traded-money-securities", @@ -3456,7 +3456,7 @@ } , {"code": "code", - "type": 12,"name": "Код рынка","shortname": "Код","searchable": true,"sortable": true + "type": 2,"length": 10,"name": "Код рынка","shortname": "Код","searchable": true,"sortable": true } , {"code": "settlementCurrency", @@ -4042,6 +4042,25 @@ {"code": "direction", "type": 1,"name": "Направление","shortname": "Направление","link": "inOutDirection" } + ] + } + , + {"method":"post", + + "name": "Отметить средства на возврат депозита", + + "destination": "registries/returnDeposit", + + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.ReturnDepositActionNew", + + "fields": [ + {"code": "id", + "type": 1,"name": "Регистр требований","shortname": "Регистр требований","required": true,"enabled": false,"visible": false + } + , + {"code": "balance", + "type": 10,"name": "Сумма","shortname": "Сумма","required": true + } ] } ] @@ -5108,7 +5127,39 @@ "name": "Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)", - "fields": [] + "fields": [ + {"code": "balance", + "type": 10,"name": "Текущий баланс","shortname": "Текущие средства","enabled": false + } + , + {"code": "securitySymbol", + "type": 2,"name": "Наименование инструмента/валюты","shortname": "Валюта","enabled": false + } + , + {"code": "creditLeg_amount", + "type": 10,"name": "Сумма отправителя","shortname": "Сумма","required": true + } + , + {"code": "paymentPurpose", + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Основание","required": true + } + , + {"code": "senderId", + "type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true + } + , + {"code": "creditLeg_accountId", + "type": 1,"group": "Отправитель","name": "Наименование счета отправителя","shortname": "Регистр списания","link": "account","linkCode": "account" + } + , + {"code": "addresseeId", + "type": 1,"group": "Получатель","name": "Участник получатель","shortname": "Получатель","link": "company","linkCode": "shortName","required": true + } + , + {"code": "debitLeg_accountId", + "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "correspondentAccount" + } + ] } , {"method":"post", @@ -5181,11 +5232,7 @@ "name": "Формирование промежуточной отчетности", - "fields": [ - {"code": "sessionId", - "type": 1,"name": "Клиринговая сессия","shortname": "Сессия","link": "session" - } - ] + "fields": [] } , {"method":"post", @@ -8030,10 +8077,6 @@ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false } - , - {"code": "acc_name", - "type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true - } , {"code": "account", "type": 2,"length": 25,"name": "Код счета участника клиринга","shortname": "Код счета УК","searchable": true,"sortable": true,"visible": true 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 a86fe798b..e706e4acf 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,2150 +1,2158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -