diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/settings/ValidationSymbolsController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/ValidationSymbolsController.java similarity index 87% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/settings/ValidationSymbolsController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/ValidationSymbolsController.java index fcf4b1b0e..639bf642f 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/settings/ValidationSymbolsController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/ValidationSymbolsController.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.backendapi.controller.queue.settings; +package ru.spcex.clearing.backendapi.controller.queue.misc; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -25,6 +25,7 @@ import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllRespo import ru.spcex.clearing.backendapi.service.IOperator; import ru.spcex.clearing.backendapi.service.IStateLoader; import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.Consts; @Controller @RequestMapping("/settings/validation-symbols") @@ -43,10 +44,7 @@ public class ValidationSymbolsController extends AbstractQueueController { public CudResponse add( @ApiParam(value = "Параметры команды в JSON формате.", required = true) @RequestBody ValidationSymbolsNewAction validationSymbolsNewAction) throws ExecutionException, InterruptedException { - CudResponse responseToClient = new CudResponse(); - responseToClient.setCode(0); - responseToClient.setMessage("success"); - return responseToClient; + return processRequest(Consts.DESTINATION_VALIDATE_SYMBOLS_NEW, validationSymbolsNewAction); } @ApiOperation(value = "update validation symbol.") @@ -58,11 +56,7 @@ public class ValidationSymbolsController extends AbstractQueueController { @PathVariable("id") Long id, @ApiParam(value = "Новые значения полей объекта.", required = true) @RequestBody ValidationSymbolsUpdateAction validationSymbolsUpdateAction) throws ExecutionException, InterruptedException { - validationSymbolsUpdateAction.setId(id); - CudResponse responseToClient = new CudResponse(); - responseToClient.setCode(0); - responseToClient.setMessage("success"); - return responseToClient; + return processRequest(Consts.DESTINATION_VALIDATE_SYMBOLS_UPDATE, validationSymbolsUpdateAction); } @ApiOperation(value = "delete validation symbol.") @@ -73,10 +67,7 @@ public class ValidationSymbolsController extends AbstractQueueController { @PathVariable("id") Long id) throws ExecutionException, InterruptedException { CommonDeleteAction deleteAction = new CommonDeleteAction(); deleteAction.setId(id); - CudResponse responseToClient = new CudResponse(); - responseToClient.setCode(0); - responseToClient.setMessage("success"); - return responseToClient; + return processRequest(Consts.DESTINATION_VALIDATE_SYMBOLS_DELETE, deleteAction); } @ApiOperation(value = "get all validation symbols.") diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsNewAction.java index 2a967181e..5be16992c 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsNewAction.java @@ -4,7 +4,7 @@ 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.settings.ValidationSymbolsNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.misc.ValidationSymbolsNewRequest; public class ValidationSymbolsNewAction implements IAction { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsUpdateAction.java index a1d6db554..4814dc460 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/settings/ValidationSymbolsUpdateAction.java @@ -4,7 +4,7 @@ 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.settings.ValidationSymbolsUpdateRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.misc.ValidationSymbolsUpdateRequest; public class ValidationSymbolsUpdateAction implements IAction { 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 d128014e6..0d8f94ae8 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.17.223.127", + "version": "3.18.240.128", "enums": { @@ -10937,7 +10937,7 @@ "destination": "securities/digital-certificate-securities", - "class": "ru.clearing.classes.statics.data.security.UtilitarianDigitalRight", + "class": "ru.clearing.classes.statics.data.security.DigitalCertificateSecurity", "logUpdates": "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 ee14d588b..4c79102d5 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 @@ - + @@ -2535,7 +2535,7 @@ - + diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsDeleteRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsDeleteRequest.java deleted file mode 100644 index 7d0e2d5a8..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsDeleteRequest.java +++ /dev/null @@ -1,16 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.settings; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ValidationSymbolsDeleteRequest { - @JsonProperty - private Long id; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } -} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsNewRequest.java deleted file mode 100644 index c607ea978..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsNewRequest.java +++ /dev/null @@ -1,37 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.settings; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ValidationSymbolsNewRequest { - - @JsonProperty - private String code; - @JsonProperty - private String symbols; - @JsonProperty - private String comment; - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getSymbols() { - return symbols; - } - - public void setSymbols(String symbols) { - this.symbols = symbols; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } -} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsUpdateRequest.java deleted file mode 100644 index c38f9f991..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsUpdateRequest.java +++ /dev/null @@ -1,46 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.settings; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ValidationSymbolsUpdateRequest { - @JsonProperty - private Long id; - @JsonProperty - private String code; - @JsonProperty - private String symbols; - @JsonProperty - private String comment; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getSymbols() { - return symbols; - } - - public void setSymbols(String symbols) { - this.symbols = symbols; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } -}