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 6fd604853..c4917d92f 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 @@ -1,5 +1,6 @@ package ru.spcex.clearing.backendapi.controller.request.cud.schedule; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -9,11 +10,13 @@ import ru.spcex.clearing.backendapi.domain.actions.IAction; import ru.spcex.clearing.backendapi.errors.BackEndError; import ru.spcex.clearing.platform.messaging.domain.ActionType; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalTimeDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; import ru.spcex.platform.utils.enumeration.EnumMessage; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalTime; import java.util.Collection; import java.util.Collections; @@ -78,6 +81,17 @@ public class LauncherNew implements IAction { @JsonProperty public LocalTime fromTime; + @ApiModelProperty(value = "Дата с", example = "2024-01-02") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + public LocalDate fromDate; + @ApiModelProperty(value = "Дата по", example = "2024-03-02") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + public LocalDate toDate; + @Override public Object toRequest() { LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest(); @@ -99,6 +113,8 @@ public class LauncherNew implements IAction { taskRunnerCommandRequest.setDebitLeg_accountId(debitLeg_accountId); taskRunnerCommandRequest.setFromTime(fromTime); taskRunnerCommandRequest.setSwiftCode(swiftCode); + taskRunnerCommandRequest.setFromDate(fromDate); + taskRunnerCommandRequest.setToDate(toDate); return taskRunnerCommandRequest; } @@ -259,4 +275,20 @@ public class LauncherNew implements IAction { public void setFromTime(LocalTime fromTime) { this.fromTime = fromTime; } + + public LocalDate getFromDate() { + return fromDate; + } + + public void setFromDate(LocalDate fromDate) { + this.fromDate = fromDate; + } + + public LocalDate getToDate() { + return toDate; + } + + public void setToDate(LocalDate toDate) { + this.toDate = toDate; + } } 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 34aff80d4..c421ce0b2 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.11.0.88", + "version": "3.11.0.89", "enums": { @@ -5983,7 +5983,15 @@ "name": "Формирование реестра остатков денежных средств", - "fields": [] + "fields": [ + {"code": "fromDate", + "type": 6,"name": "С дата","shortname": "с" + } + , + {"code": "toDate", + "type": 6,"name": "По дату","shortname": "по" + } + ] } , {"method":"post", 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 fb2a3a9fd..5e7c221ac 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 @@ - + @@ -1385,6 +1385,8 @@ + + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 34aff80d4..c421ce0b2 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.11.0.88", + "version": "3.11.0.89", "enums": { @@ -5983,7 +5983,15 @@ "name": "Формирование реестра остатков денежных средств", - "fields": [] + "fields": [ + {"code": "fromDate", + "type": 6,"name": "С дата","shortname": "с" + } + , + {"code": "toDate", + "type": 6,"name": "По дату","shortname": "по" + } + ] } , {"method":"post", diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java index f726283c2..156f4154b 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -79,10 +79,11 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia @Override public void afterPropertiesSet() { - callback(LauncherCommandRequest.class) - .setConsumer(this::moneyBalanceRegisterNew) - .forDestination(createRegistry_GBRR.topic(), callbacks::put); - init(); +// callback(LauncherCommandRequest.class) +// .setConsumer(this::moneyBalanceRegisterNew) +// .forDestination(createRegistry_GBRR.topic(), callbacks::put); +// init(); + log.warn("MoneyBalanceRegisterService topic GBRR disabled."); } public void moneyBalanceRegisterNew(BaseRequest userRequest) { diff --git a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java index 85b59251b..3fc4ed31d 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java +++ b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java @@ -20,6 +20,7 @@ import ru.spcex.clearing.test.MatcherFactory; import javax.annotation.PostConstruct; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalTime; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -83,6 +84,8 @@ class LauncherServiceTest extends AbstractServiceTest { launcherCommandRequest.setDebitLeg_accountId(145L); launcherCommandRequest.setSwiftCode("SWIFT"); launcherCommandRequest.setFromTime(LocalTime.of(12,23)); + launcherCommandRequest.setFromDate(LocalDate.of(2024,12,21)); + launcherCommandRequest.setToDate(LocalDate.of(2024,12,21)); BaseRequest predictableBaseRequest = new BaseRequest<>(); predictableBaseRequest.setRequestPayload(launcherCommandRequest); 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 d316c0c6e..19bc9d688 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 @@ -35,8 +35,8 @@ public enum Task implements IEnumKey { terminationSession_ETRF("ETRF"),//Завершение торговой сессии по вторичным торгам reconciliationRequest_RCHK("RCHK"),//Запрос на сверку активов createRegistry_GRYT("GRYT"),//Сформировать регистр на текущий день - createRegistry_GRRT("GRRT"),//Сформировать реестр на текущий день - createRegistry_GBRR("GBRR"),//Сформировать реестр на текущий день + createRegistry_GRRT("GRRT"),//Сформировать реестр остатков ценных бумаг на текущий день + createRegistry_GBRR("GBRR"),//Сформировать реестра остатков денежных средств на текущий день createRegistry_GORD("GORD"), // Формирование реестра распоряжений, направленных расчетному депозитарию createRegistry_GORR("GORR"), // Формирование реестра распоряжений, направленных расчетному депозитарию createRegistry_GCMR("GCMR"), // Формирование реестра участников клиринга diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java index 939aa8aa6..940ae9fbc 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java @@ -1,12 +1,15 @@ package ru.spcex.clearing.platform.messaging.domain.cud.schedule; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalTimeDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalTime; public class LauncherCommandRequest { @@ -51,6 +54,14 @@ public class LauncherCommandRequest { @JsonDeserialize(using = LocalTimeDeserializer.class) @JsonProperty public LocalTime fromTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + public LocalDate fromDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + public LocalDate toDate; public Long getUserId() { return userId; @@ -195,4 +206,20 @@ public class LauncherCommandRequest { public void setSwiftCode(String swiftCode) { this.swiftCode = swiftCode; } + + public LocalDate getFromDate() { + return fromDate; + } + + public void setFromDate(LocalDate fromDate) { + this.fromDate = fromDate; + } + + public LocalDate getToDate() { + return toDate; + } + + public void setToDate(LocalDate toDate) { + this.toDate = toDate; + } }