http://jira.mfd.msk:8088/browse/CLS-850

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();
+        return processRequest(Consts.DESTINATION_VALIDATE_SYMBOLS_NEW, validationSymbolsNewAction);
-        responseToClient.setCode(0);
-        responseToClient.setMessage("success");
-        return responseToClient;
     }
 
     @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);
+        return processRequest(Consts.DESTINATION_VALIDATE_SYMBOLS_UPDATE, validationSymbolsUpdateAction);
-        CudResponse responseToClient = new CudResponse();
-        responseToClient.setCode(0);
-        responseToClient.setMessage("success");
-        return responseToClient;
     }
 
     @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();
+        return processRequest(Consts.DESTINATION_VALIDATE_SYMBOLS_DELETE, deleteAction);
-        responseToClient.setCode(0);
-        responseToClient.setMessage("success");
-        return responseToClient;
     }
 
     @ApiOperation(value = "get all validation symbols.")

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<ValidationSymbolsNewRequest> {
 

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<ValidationSymbolsUpdateRequest> {
 

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",
 

clearing-parent/backend-api/src/main/resources/meta/meta.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
-<meta version="3.17.223.127">
+<meta version="3.18.240.128">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -2535,7 +2535,7 @@
 				</delete>
 			</actions>
 		</validationSymbols>
-		<digitalCertificateSecurity name="Цифровые свидетельства" destination="securities/digital-certificate-securities" class="ru.clearing.classes.statics.data.security.UtilitarianDigitalRight" logUpdates="true" table="digital_certificate_security">
+		<digitalCertificateSecurity name="Цифровые свидетельства" destination="securities/digital-certificate-securities" class="ru.clearing.classes.statics.data.security.DigitalCertificateSecurity" logUpdates="true" table="digital_certificate_security">
 			<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
 			<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" searchable="true" sortable="true" visible="true" extends="security"/>
 			<securitySymbol type="2" length="255" name="Код инструмента" shortname="Код" searchable="true" sortable="true" visible="true" extends="security"/>

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsDeleteRequest.java

@@ -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;
-    }
-}

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsNewRequest.java

@@ -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;
-    }
-}

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/settings/ValidationSymbolsUpdateRequest.java

@@ -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;
-    }
-}