treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix naming for riskParameter/rates

Browse source
This commit is contained in:
etreschenkov 2024-10-02 18:14:33 +03:00
parent 2615cc79e4
commit 454bb99dfa
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,12 +1,16 @@
package ru.spcex.clearing.backendapi.controller.request.cud.securities; package ru.spcex.clearing.backendapi.controller.request.cud.securities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import ru.spcex.clearing.backendapi.domain.actions.IAction; import ru.spcex.clearing.backendapi.domain.actions.IAction;
import ru.spcex.clearing.platform.messaging.domain.ActionType; import ru.spcex.clearing.platform.messaging.domain.ActionType;
import ru.spcex.clearing.platform.messaging.domain.cud.security.RatesNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.security.RatesNewRequest;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
public class RatesNewAction implements IAction<RatesNewRequest> { public class RatesNewAction implements IAction<RatesNewRequest> {
@ -14,6 +18,8 @@ public class RatesNewAction implements IAction<RatesNewRequest> {
@JsonProperty @JsonProperty
private BigDecimal value; private BigDecimal value;
@ApiModelProperty(value = "Дата.", example = "1234") @ApiModelProperty(value = "Дата.", example = "1234")
@JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty @JsonProperty
private LocalDate valueDate; private LocalDate valueDate;
@ApiModelProperty(value = "Валюта.", example = "1234") @ApiModelProperty(value = "Валюта.", example = "1234")

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

@ -1,6 +1,6 @@
{ {
"version": "3.15.206.108", "version": "3.15.206.110",
"enums": { "enums": {
@ -10589,7 +10589,7 @@
"fields": [ "fields": [
{"code": "currencyPairId", {"code": "currencyPairId",
"name": "Идентификатор валютной пары","shortname": "Валютная пара","type": 1,"link": "currencyPair","linkCode": "code" "name": "Идентификатор валютной пары","shortname": "Валютная пара","type": 1,"link": "currencyPair","linkCode": "code","linkKeyCode": "id"
} }
, ,
{"code": "settlementType", {"code": "settlementType",
@ -10677,7 +10677,7 @@
"fields": [ "fields": [
{"code": "currencyId", {"code": "currencyId",
"name": "Идентификатор валюты","shortname": "Валюта","type": 1,"link": "currency","linkCode": "code" "name": "Идентификатор валюты","shortname": "Валюта","type": 1,"link": "currencyCode","linkCode": "code","linkKeyCode": "id"
} }
, ,
{"code": "valueDate", {"code": "valueDate",

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?--> <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
<meta version="3.15.206.108"> <meta version="3.15.206.110">
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" --> <!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
<!--Здесь словари--> <!--Здесь словари-->
<enums> <enums>
@ -2451,7 +2451,7 @@
<workflowStatus name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/> <workflowStatus name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>
<actions> <actions>
<post name="Добавление параметров риска" confirmation="value,settlementType,currencyPairId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.securities.RiskParameterNewAction"> <post name="Добавление параметров риска" confirmation="value,settlementType,currencyPairId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.securities.RiskParameterNewAction">
<currencyPairId name="Идентификатор валютной пары" shortname="Валютная пара" type="1" link="currencyPair" linkCode="code"/> <currencyPairId name="Идентификатор валютной пары" shortname="Валютная пара" type="1" link="currencyPair" linkCode="code" linkKeyCode="id"/>
<settlementType name="Код расчёта" shortname="Код расчёта" type="12" link="currencySettlementType" linkCode="code"/> <settlementType name="Код расчёта" shortname="Код расчёта" type="12" link="currencySettlementType" linkCode="code"/>
<value name="Ставка" shortname="Ставка" type="10"/> <value name="Ставка" shortname="Ставка" type="10"/>
<status name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/> <status name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>
@ -2472,7 +2472,7 @@
<workflowStatus name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/> <workflowStatus name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>
<actions> <actions>
<post name="Добавление расчетного курса" confirmation="value,valueDate,currencyId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.securities.RatesNewAction"> <post name="Добавление расчетного курса" confirmation="value,valueDate,currencyId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.securities.RatesNewAction">
<currencyId name="Идентификатор валюты" shortname="Валюта" type="1" link="currency" linkCode="code"/> <currencyId name="Идентификатор валюты" shortname="Валюта" type="1" link="currencyCode" linkCode="code" linkKeyCode="id"/>
<valueDate name="Дата, на которую расчетный курс" shortname="Дата" type="6"/> <valueDate name="Дата, на которую расчетный курс" shortname="Дата" type="6"/>
<value name="Расчетный курс" shortname="Расчетный курс" type="10"/> <value name="Расчетный курс" shortname="Расчетный курс" type="10"/>
<status name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/> <status name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>

6
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java
View file

@ -1,13 +1,19 @@
package ru.spcex.clearing.platform.messaging.domain.cud.security; package ru.spcex.clearing.platform.messaging.domain.cud.security;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
public class RatesNewRequest { public class RatesNewRequest {
@JsonProperty @JsonProperty
private BigDecimal value; private BigDecimal value;
@JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty @JsonProperty
private LocalDate valueDate; private LocalDate valueDate;
@JsonProperty @JsonProperty