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

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/RatesController.java

@@ -0,0 +1,74 @@
+package ru.spcex.clearing.backendapi.controller.queue.misc;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import ru.clearing.classes.statics.data.security.Rates;
+import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
+import ru.spcex.clearing.backendapi.controller.request.cud.securities.RatesNewAction;
+import ru.spcex.clearing.backendapi.controller.request.cud.securities.RatesUpdateAction;
+import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
+import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
+import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
+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("/rates")
+public class RatesController extends AbstractQueueController {
+    private final IStateLoader stateLoader;
+
+    @Autowired
+    public RatesController(IOperator operator, IStateLoader stateLoader) {
+        super(operator);
+        this.stateLoader = stateLoader;
+    }
+
+    @ApiOperation(value = "get all rates.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAll() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_Rates, Rates.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "create rates.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse create(
+        @ApiParam(value = "Значения полей нового объекта.", required = true)
+        @RequestBody RatesNewAction ratesNewAction) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.DESTINATION_RATES_NEW, ratesNewAction);
+    }
+
+    @ApiOperation(value = "update risk_parameter.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse update(
+        @ApiParam(value = "Идентификатор изменяемого объекта.", required = true, example = "1234")
+        @PathVariable("id") Long id,
+        @ApiParam(value = "Новые значения полей объекта.", required = true)
+        @RequestBody RatesUpdateAction ratesUpdateAction) throws ExecutionException, InterruptedException {
+        ratesUpdateAction.setId(id);
+        return processRequest(Consts.DESTINATION_RATES_UPDATE, ratesUpdateAction);
+    }
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/RiskParameterController.java

@@ -0,0 +1,74 @@
+package ru.spcex.clearing.backendapi.controller.queue.misc;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import ru.clearing.classes.statics.data.security.RiskParameter;
+import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
+import ru.spcex.clearing.backendapi.controller.request.cud.securities.RiskParameterNewAction;
+import ru.spcex.clearing.backendapi.controller.request.cud.securities.RiskParameterUpdateAction;
+import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
+import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
+import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
+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("/risk-parameter")
+public class RiskParameterController extends AbstractQueueController {
+    private final IStateLoader stateLoader;
+
+    @Autowired
+    public RiskParameterController(IOperator operator, IStateLoader stateLoader) {
+        super(operator);
+        this.stateLoader = stateLoader;
+    }
+
+    @ApiOperation(value = "get all risk_parameter.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAll() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_RiskParameter, RiskParameter.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "create risk_parameter.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse create(
+        @ApiParam(value = "Значения полей нового объекта.", required = true)
+        @RequestBody RiskParameterNewAction riskParameterNewAction) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.DESTINATION_RISK_PARAMETER_NEW, riskParameterNewAction);
+    }
+
+    @ApiOperation(value = "update risk_parameter.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse update(
+        @ApiParam(value = "Идентификатор изменяемого объекта.", required = true, example = "1234")
+        @PathVariable("id") Long id,
+        @ApiParam(value = "Новые значения полей объекта.", required = true)
+        @RequestBody RiskParameterUpdateAction riskParameterUpdateAction) throws ExecutionException, InterruptedException {
+        riskParameterUpdateAction.setId(id);
+        return processRequest(Consts.DESTINATION_RISK_PARAMETER_UPDATE, riskParameterUpdateAction);
+    }
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java

@@ -0,0 +1,73 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.securities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import ru.spcex.clearing.backendapi.domain.actions.IAction;
+import ru.spcex.clearing.platform.messaging.domain.ActionType;
+import ru.spcex.clearing.platform.messaging.domain.cud.security.RatesNewRequest;
+
+public class RatesNewAction implements IAction<RatesNewRequest> {
+
+    @ApiModelProperty(value = "Курс.", example = "1234")
+    @JsonProperty
+    private BigDecimal value;
+    @ApiModelProperty(value = "Дата.", example = "1234")
+    @JsonProperty
+    private LocalDate valueDate;
+    @ApiModelProperty(value = "Валюта.", example = "1234")
+    @JsonProperty
+    private Long currencyPairId;
+    @ApiModelProperty(value = "Статус.", example = "1234")
+    @JsonProperty
+    private String status;
+
+    @Override
+    public RatesNewRequest toRequest() {
+        RatesNewRequest request = new RatesNewRequest();
+        request.setValue(this.value);
+        request.setValueDate(this.valueDate);
+        request.setCurrencyPairId(this.currencyPairId);
+        request.setStatus(this.status);
+        return request;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.NEW;
+    }
+
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    public LocalDate getValueDate() {
+        return valueDate;
+    }
+
+    public void setValueDate(LocalDate valueDate) {
+        this.valueDate = valueDate;
+    }
+
+    public Long getCurrencyPairId() {
+        return currencyPairId;
+    }
+
+    public void setCurrencyPairId(Long currencyPairId) {
+        this.currencyPairId = currencyPairId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesUpdateAction.java

@@ -0,0 +1,59 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.securities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import ru.spcex.clearing.backendapi.domain.actions.IAction;
+import ru.spcex.clearing.platform.messaging.domain.ActionType;
+import ru.spcex.clearing.platform.messaging.domain.cud.security.RatesNewRequest;
+
+public class RatesUpdateAction implements IAction<RatesNewRequest> {
+
+    @ApiModelProperty(hidden = true)
+    @JsonProperty
+    public Long id;
+    @ApiModelProperty(value = "Курс.", example = "1234")
+    @JsonProperty
+    private BigDecimal value;
+    @ApiModelProperty(value = "Статус.", example = "1234")
+    @JsonProperty
+    private String status;
+
+    @Override
+    public RatesNewRequest toRequest() {
+        RatesNewRequest request = new RatesNewRequest();
+        request.setValue(this.value);
+        request.setStatus(this.status);
+        return request;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.NEW;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterNewAction.java

@@ -0,0 +1,72 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.securities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import ru.spcex.clearing.backendapi.domain.actions.IAction;
+import ru.spcex.clearing.platform.messaging.domain.ActionType;
+import ru.spcex.clearing.platform.messaging.domain.cud.security.RiskParameterNewRequest;
+
+public class RiskParameterNewAction implements IAction<RiskParameterNewRequest> {
+
+    @ApiModelProperty(value = "Курс.", example = "1234")
+    @JsonProperty
+    private BigDecimal value;
+    @ApiModelProperty(value = "Код расчёта.", example = "1234")
+    @JsonProperty
+    private String settlementType;
+    @ApiModelProperty(value = "Валютная пара.", example = "1234")
+    @JsonProperty
+    private Long currencyPairId;
+    @ApiModelProperty(value = "Статус.", example = "1234")
+    @JsonProperty
+    private String status;
+
+    @Override
+    public RiskParameterNewRequest toRequest() {
+        RiskParameterNewRequest request = new RiskParameterNewRequest();
+        request.setValue(this.value);
+        request.setSettlementType(this.settlementType);
+        request.setCurrencyPairId(this.currencyPairId);
+        request.setStatus(this.status);
+        return request;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.NEW;
+    }
+
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    public String getSettlementType() {
+        return settlementType;
+    }
+
+    public void setSettlementType(String settlementType) {
+        this.settlementType = settlementType;
+    }
+
+    public Long getCurrencyPairId() {
+        return currencyPairId;
+    }
+
+    public void setCurrencyPairId(Long currencyPairId) {
+        this.currencyPairId = currencyPairId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterUpdateAction.java

@@ -0,0 +1,59 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.securities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import ru.spcex.clearing.backendapi.domain.actions.IAction;
+import ru.spcex.clearing.platform.messaging.domain.ActionType;
+import ru.spcex.clearing.platform.messaging.domain.cud.security.RiskParameterUpdateRequest;
+
+public class RiskParameterUpdateAction implements IAction<RiskParameterUpdateRequest> {
+
+    @ApiModelProperty(hidden = true)
+    @JsonProperty
+    public Long id;
+    @ApiModelProperty(value = "Курс.", example = "1234")
+    @JsonProperty
+    private BigDecimal value;
+    @ApiModelProperty(value = "Статус.", example = "1234")
+    @JsonProperty
+    private String status;
+
+    @Override
+    public RiskParameterUpdateRequest toRequest() {
+        RiskParameterUpdateRequest request = new RiskParameterUpdateRequest();
+        request.setValue(this.value);
+        request.setStatus(this.status);
+        return request;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.NEW;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

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

@@ -1,6 +1,6 @@
 
 {
-		"version": "3.14.105.104",
+	"version": "3.15.206.105",
 
 	"enums": {
 
@@ -10542,6 +10542,82 @@
 		]
 
 	}
+,
+	"riskParameter": {
+
+		"name": "Параметры риска",
+
+		"destination": "risk-parameter",
+
+		"class": "ru.clearing.classes.statics.data.security.RiskParameter",
+
+		"table": "risk-parameter",
+
+		"fields": [
+			{"code": "id",
+				"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": true
+			}
+		,
+			{"code": "value",
+				"name": "Ставка","shortname": "Ставка","type": 10
+			}
+		,
+			{"code": "settlementType",
+				"name": "Код расчета","shortname": "Код расчета","type": 2,"length": 4
+			}
+		,
+			{"code": "currencyPair",
+				"name": "Код валютной пары","shortname": "Код валютной пары","type": 2,"length": 12
+			}
+		,
+			{"code": "currencyPairId",
+				"name": "Идентификатор валютной пары","shortname": "Валютная пара","type": 1
+			}
+		,
+			{"code": "workflowStatus",
+				"name": "Статус","shortname": "Секция","type": 2,"length": 4
+			}
+		]
+
+	}
+,
+	"rates": {
+
+		"name": "Расчетные курсы",
+
+		"destination": "rates",
+
+		"class": "ru.clearing.classes.statics.data.security.Rates",
+
+		"table": "rates",
+
+		"fields": [
+			{"code": "id",
+				"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": true
+			}
+		,
+			{"code": "value",
+				"name": "Расчетный курс","shortname": "Расчетный курс","type": 10
+			}
+		,
+			{"code": "valueDate",
+				"name": "Дата, на которую  расчетный курс","shortname": "Дата","type": 6
+			}
+		,
+			{"code": "currency",
+				"name": "Код валюты","shortname": "Код валюты","type": 2,"length": 4
+			}
+		,
+			{"code": "currencyId",
+				"name": "Идентификатор валюты","shortname": "Валюта","type": 1
+			}
+		,
+			{"code": "workflowStatus",
+				"name": "Статус","shortname": "Секция","type": 2,"length": 4
+			}
+		]
+
+	}
 
 }
 

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.14.105.104">
+<meta version="3.15.206.105">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -2442,6 +2442,22 @@
 			<code name="Код рынка" shortname="Код рынка" type="2" length="12"/>
 			<section name="Секция" shortname="Секция" type="12"/>
 		</blacklistMarket>
+		<riskParameter name="Параметры риска" destination="risk-parameter" class="ru.clearing.classes.statics.data.security.RiskParameter" table="risk-parameter">
+			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="true"/>
+			<value name="Ставка" shortname="Ставка" type="10"/>
+			<settlementType name="Код расчета" shortname="Код расчета" type="2" length="4"/>
+			<currencyPair name="Код валютной пары" shortname="Код валютной пары" type="2" length="12"/>
+			<currencyPairId name="Идентификатор валютной пары" shortname="Валютная пара" type="1"/>
+			<workflowStatus name="Статус" shortname="Секция" type="2" length="4"/>
+		</riskParameter>
+		<rates name="Расчетные курсы" destination="rates" class="ru.clearing.classes.statics.data.security.Rates" table="rates">
+			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="true"/>
+			<value name="Расчетный курс" shortname="Расчетный курс" type="10"/>
+			<valueDate name="Дата, на которую  расчетный курс" shortname="Дата" type="6"/>
+			<currency name="Код валюты" shortname="Код валюты" type="2" length="4"/>
+			<currencyId name="Идентификатор валюты" shortname="Валюта" type="1"/>
+			<workflowStatus name="Статус" shortname="Секция" type="2" length="4"/>
+		</rates>
 	</objects>
 	<views>
 		<AccountUnion>