From b7c7e8b35804186e1a2508570fa899beb32d938b Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 13 Sep 2023 19:28:23 +0300 Subject: [PATCH] backend-api http://jira.mfd.msk:8088/browse/CLS-534 --- .../queue/register/RegistryController.java | 15 ++++ .../ChangeStatusExtractActionNew.java | 82 +++++++++++++++++++ .../platform/messaging/domain/Consts.java | 1 + .../RegistryChangeStatusExtractRequest.java | 58 +++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeStatusExtractActionNew.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeStatusExtractRequest.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java index ffbe774c3..d83fc062a 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; import ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeRefundDateActionNew; +import ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeStatusExtractActionNew; import ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew; import ru.spcex.clearing.backendapi.controller.request.cud.registry.ReturnDepositActionNew; import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; @@ -82,4 +83,18 @@ public class RegistryController extends AbstractQueueController { returnDepositAction.setGroupId(groupId); return processRequest(Consts.REGISTRY_CHANGE_REFUND_DATE_ACTION, returnDepositAction); } + + @ApiOperation(value = "Изменение отметки о получении выписки") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)}) + @RequestMapping(value = "/changeStatusExtract/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + public CudResponse changeStatusExtract( + @ApiParam(value = "Идентификатор регистра.", required = true, example = "1234") + @PathVariable("id") Long id, + @ApiParam(value = "Параметры команды в JSON формате.", required = true) + @RequestBody ChangeStatusExtractActionNew changeStatusExtractAction) throws ExecutionException, InterruptedException { + changeStatusExtractAction.setId(id); + return processRequest(Consts.REGISTRY_CHANGE_STATUS_EXTRACT_ACTION, changeStatusExtractAction); + } + } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeStatusExtractActionNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeStatusExtractActionNew.java new file mode 100644 index 000000000..114928997 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeStatusExtractActionNew.java @@ -0,0 +1,82 @@ +package ru.spcex.clearing.backendapi.controller.request.cud.registry; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import ru.spcex.clearing.backendapi.domain.actions.IAction; +import ru.spcex.clearing.platform.messaging.domain.ActionType; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryChangeStatusExtractRequest; + +import java.math.BigDecimal; + +public class ChangeStatusExtractActionNew implements IAction { + + @JsonIgnore + public Long id; + @JsonProperty + public String shortName; + @JsonProperty + public String contract; + @JsonProperty + public BigDecimal balance; + @JsonProperty + public String registryStatus; + + @Override + public RegistryChangeStatusExtractRequest toRequest() { + var req = new RegistryChangeStatusExtractRequest(); + req.setId(id); + req.setShortName(shortName); + req.setContract(contract); + req.setBalance(balance); + req.setRegistryStatus(registryStatus); + return req; + } + + + @ApiModelProperty(hidden = true) + @Override + public ActionType getActionType() { + return ActionType.UPDATE; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getShortName() { + return shortName; + } + + public void setShortName(String shortName) { + this.shortName = shortName; + } + + public String getContract() { + return contract; + } + + public void setContract(String contract) { + this.contract = contract; + } + + public BigDecimal getBalance() { + return balance; + } + + public void setBalance(BigDecimal balance) { + this.balance = balance; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java index 4deabe87a..379136ac0 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java @@ -162,6 +162,7 @@ public interface Consts { String REGISTRY_SPLIT_DEPOSIT_ACTION = "registry-split-deposit-action"; String REGISTRY_RETURN_DEPOSIT_ACTION = "registry-return-deposit-action"; String REGISTRY_CHANGE_REFUND_DATE_ACTION = "registry-change-refund-date-action"; + String REGISTRY_CHANGE_STATUS_EXTRACT_ACTION = "registry-change-status-extract-action"; String REGISTRY_COVERED_DEAL_REGISTER_NEW = "registry-covered-deal-register-new"; String REGISTRY_ADMITTED_DEAL_REGISTER_NEW = "registry-admitted-deal-register-new"; String REGISTRY_DEAL_REGISTER_NEW = "registry-deal-register-new"; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeStatusExtractRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeStatusExtractRequest.java new file mode 100644 index 000000000..260d4f430 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeStatusExtractRequest.java @@ -0,0 +1,58 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.math.BigDecimal; + +public class RegistryChangeStatusExtractRequest { + @JsonProperty + public Long id; + @JsonProperty + public String shortName; + @JsonProperty + public String contract; + @JsonProperty + public BigDecimal balance; + @JsonProperty + public String registryStatus; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getShortName() { + return shortName; + } + + public void setShortName(String shortName) { + this.shortName = shortName; + } + + public String getContract() { + return contract; + } + + public void setContract(String contract) { + this.contract = contract; + } + + public BigDecimal getBalance() { + return balance; + } + + public void setBalance(BigDecimal balance) { + this.balance = balance; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } +}