From 0d45ad95548a4c82e5753b0506be1ce1137f1f0b Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 24 Apr 2026 12:19:21 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-967 // http://jira.mfd.msk:8088/browse/CLS-977 --- .../cud/securities/RatesNewAction.java | 12 ++++---- .../cud/securities/RatesUpdateAction.java | 12 ++++---- .../securities/RiskParameterNewAction.java | 12 ++++---- .../securities/RiskParameterUpdateAction.java | 12 ++++---- .../securities/SCrossRateUpdateAction.java | 8 ----- .../src/main/resources/meta/meta.json | 30 +++++++------------ .../src/main/resources/meta/meta.xml | 24 +++++++-------- .../service/facade/RatesFacade.java | 4 +-- .../service/facade/RiskParameterFacade.java | 4 +-- .../service/facade/SCrossRateFacade.java | 4 +-- .../listeners/RatesMessageListener.java | 4 +-- .../securitites/SCrossRateUpdateRequest.java | 27 ----------------- .../domain/cud/security/RatesNewRequest.java | 10 +++---- .../cud/security/RatesUpdateRequest.java | 10 +++---- .../cud/security/RiskParameterNewRequest.java | 10 +++---- .../security/RiskParameterUpdateRequest.java | 10 +++---- 16 files changed, 73 insertions(+), 120 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java index 76cd987f2..7edabbbc0 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java @@ -27,7 +27,7 @@ public class RatesNewAction implements IAction { private Long currencyId; @ApiModelProperty(value = "Статус.", example = "1234") @JsonProperty - private String status; + private String workflowStatus; @Override public RatesNewRequest toRequest() { @@ -35,7 +35,7 @@ public class RatesNewAction implements IAction { request.setValue(this.value); request.setValueDate(this.valueDate); request.setCurrencyId(this.currencyId); - request.setStatus(this.status); + request.setWorkflowStatus(this.workflowStatus); return request; } @@ -69,11 +69,11 @@ public class RatesNewAction implements IAction { this.currencyId = currencyPairId; } - public String getStatus() { - return status; + public String getWorkflowStatus() { + return workflowStatus; } - public void setStatus(String status) { - this.status = status; + public void setWorkflowStatus(String workflowStatus) { + this.workflowStatus = workflowStatus; } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesUpdateAction.java index cdb630797..4dc60ed0a 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesUpdateAction.java @@ -17,14 +17,14 @@ public class RatesUpdateAction implements IAction { private BigDecimal value; @ApiModelProperty(value = "Статус.", example = "1234") @JsonProperty - private String status; + private String workflowStatus; @Override public RatesUpdateRequest toRequest() { RatesUpdateRequest request = new RatesUpdateRequest(); request.setId(this.id); request.setValue(this.value); - request.setStatus(this.status); + request.setWorkflowStatus(this.workflowStatus); return request; } @@ -50,11 +50,11 @@ public class RatesUpdateAction implements IAction { this.value = value; } - public String getStatus() { - return status; + public String getWorkflowStatus() { + return workflowStatus; } - public void setStatus(String status) { - this.status = status; + public void setWorkflowStatus(String workflowStatus) { + this.workflowStatus = workflowStatus; } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterNewAction.java index 9aa0e1e26..74b308982 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterNewAction.java @@ -23,7 +23,7 @@ public class RiskParameterNewAction implements IAction private Long currencyPairId; @ApiModelProperty(value = "Статус.", example = "1234") @JsonProperty - private String status; + private String workflowStatus; @Override public RiskParameterNewRequest toRequest() { @@ -32,7 +32,7 @@ public class RiskParameterNewAction implements IAction request.setQuoteValue(this.quoteValue); request.setSettlementType(this.settlementType); request.setCurrencyPairId(this.currencyPairId); - request.setStatus(this.status); + request.setWorkflowStatus(this.workflowStatus); return request; } @@ -66,11 +66,11 @@ public class RiskParameterNewAction implements IAction this.currencyPairId = currencyPairId; } - public String getStatus() { - return status; + public String getWorkflowStatus() { + return workflowStatus; } - public void setStatus(String status) { - this.status = status; + public void setWorkflowStatus(String workflowStatus) { + this.workflowStatus = workflowStatus; } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterUpdateAction.java index 3a4d2f8a2..581628feb 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RiskParameterUpdateAction.java @@ -20,7 +20,7 @@ public class RiskParameterUpdateAction implements IAction @JsonProperty private Long id; @JsonProperty - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - private LocalDate date; - @JsonProperty - private String currency; - @JsonProperty private BigDecimal unitRate; @JsonProperty private BigDecimal faceValue; @@ -31,8 +25,6 @@ public class SCrossRateUpdateAction implements IAction public SCrossRateUpdateRequest toRequest() { SCrossRateUpdateRequest sCrossRateUpdateRequest = new SCrossRateUpdateRequest(); sCrossRateUpdateRequest.setId(id); - sCrossRateUpdateRequest.setDate(date); - sCrossRateUpdateRequest.setCurrency(currency); sCrossRateUpdateRequest.setUnitRate(unitRate); sCrossRateUpdateRequest.setFaceValue(faceValue); sCrossRateUpdateRequest.setRate(rate); 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 59355b630..9f069b969 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.23.295.157", + "version": "3.23.295.158", "enums": { @@ -10906,7 +10906,7 @@ "name": "Добавление центрального курса", - "class": "ru.spcex.clearing.platform.messaging.domain.cud.securitites.SCrossRateNewRequest", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.SCrossRateNewAction", "fields": [ {"code": "date", @@ -10935,20 +10935,12 @@ "name": "Изменение центрального курса", - "class": "ru.spcex.clearing.platform.messaging.domain.cud.securitites.SCrossRateUpdateRequest", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.SCrossRateUpdateAction", "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "sCrossRate","linkCode": "id","required": true } - , - {"code": "date", - "name": "Дата торгов","shortname": "Дата","type": 6,"required": true - } - , - {"code": "currency", - "name": "Наименование валюты","shortname": "Валюта","type": 2,"length": 50,"link": "currencyCode","linkCode": "code","required": true - } , {"code": "faceValue", "name": "Единица базовой валюты","shortname": "Единица базовой валюты","type": 10 @@ -11036,7 +11028,7 @@ "name": "Добавление параметров риска", - "confirmation": "value,quoteValue,settlementType,currencyPairId,status", + "confirmation": "value,quoteValue,settlementType,currencyPairId,workflowStatus", "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.RiskParameterNewAction", @@ -11057,7 +11049,7 @@ "name": "Ставка сопряженной валюты","shortname": "Ставка сопряженной валюты","type": 10 } , - {"code": "status", + {"code": "workflowStatus", "name": "Статус","shortname": "Статус","type": 2,"length": 4,"link": "workflowStatus" } ] @@ -11067,7 +11059,7 @@ "name": "Изменение параметров риска", - "confirmation": "value,quoteValue,status", + "confirmation": "value,quoteValue,workflowStatus", "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.RiskParameterUpdateAction", @@ -11084,7 +11076,7 @@ "name": "Ставка сопряженной валюты","shortname": "Ставка сопряженной валюты","type": 10 } , - {"code": "status", + {"code": "workflowStatus", "name": "Статус","shortname": "Статус","type": 2,"length": 4,"link": "workflowStatus" } ] @@ -11132,7 +11124,7 @@ "name": "Добавление расчетного курса", - "confirmation": "value,valueDate,currencyId,status", + "confirmation": "value,valueDate,currencyId,workflowStatus", "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.RatesNewAction", @@ -11149,7 +11141,7 @@ "name": "Расчетный курс","shortname": "Расчетный курс","type": 10 } , - {"code": "status", + {"code": "workflowStatus", "name": "Статус","shortname": "Статус","type": 2,"length": 4,"link": "workflowStatus" } ] @@ -11159,7 +11151,7 @@ "name": "Изменение расчетного курса", - "confirmation": "value,status", + "confirmation": "value,workflowStatus", "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.RatesUpdateAction", @@ -11172,7 +11164,7 @@ "name": "Расчетный курс","shortname": "Расчетный курс","type": 10 } , - {"code": "status", + {"code": "workflowStatus", "name": "Статус","shortname": "Статус","type": 2,"length": 4,"link": "workflowStatus" } ] 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 6d1473be5..b0c5d0861 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 @@ - + @@ -2526,17 +2526,15 @@ - + - + - - @@ -2557,18 +2555,18 @@ - + - + - + - + @@ -2580,16 +2578,16 @@ - + - + - + - + diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RatesFacade.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RatesFacade.java index 083718c55..4e1821b43 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RatesFacade.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RatesFacade.java @@ -38,7 +38,7 @@ public class RatesFacade implements IClearingFacade { rates.setCurrency(currencyCodeDictionary.getCode()); rates.setValue(request.getValue()); rates.setValueDate(request.getValueDate()); - rates.setWorkflowStatus(request.getStatus()); + rates.setWorkflowStatus(request.getWorkflowStatus()); rates.setCreated(Instant.now()); ratesImdg.insert(rates); @@ -50,7 +50,7 @@ public class RatesFacade implements IClearingFacade { Rates ratesForUpdate = ratesImdg.getSingleObjectByID(request.getId()); ratesForUpdate.setValue(request.getValue()); - ratesForUpdate.setWorkflowStatus(request.getStatus()); + ratesForUpdate.setWorkflowStatus(request.getWorkflowStatus()); ratesForUpdate.setUpdated(Instant.now()); ratesImdg.update(ratesForUpdate); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RiskParameterFacade.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RiskParameterFacade.java index d24c4be26..dc0058614 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RiskParameterFacade.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/RiskParameterFacade.java @@ -42,7 +42,7 @@ public class RiskParameterFacade implements IClearingFacade { riskParameter.setSettlementType(request.getSettlementType()); riskParameter.setValue(request.getValue()); riskParameter.setQuoteValue(request.getQuoteValue()); - riskParameter.setWorkflowStatus(request.getStatus()); + riskParameter.setWorkflowStatus(request.getWorkflowStatus()); riskParameter.setCreated(Instant.now()); riskParameterImdg.insert(riskParameter); @@ -55,7 +55,7 @@ public class RiskParameterFacade implements IClearingFacade { riskParameterForUpdate.setValue(request.getValue()); riskParameterForUpdate.setQuoteValue(request.getQuoteValue()); - riskParameterForUpdate.setWorkflowStatus(request.getStatus()); + riskParameterForUpdate.setWorkflowStatus(request.getWorkflowStatus()); riskParameterImdg.update(riskParameterForUpdate); log.debug("successfully processed, updated risk_parameter id {}", riskParameterForUpdate.getId()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/SCrossRateFacade.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/SCrossRateFacade.java index 319754a03..42a6364ac 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/SCrossRateFacade.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/facade/SCrossRateFacade.java @@ -38,9 +38,7 @@ public class SCrossRateFacade { public void update(SCrossRateUpdateRequest req) { SCrossRate sCrossRate = sCrossRateImdg.getSingleObjectByID(req.getId()); - if (req.getDate() != null) { - sCrossRate.setDate(req.getDate()); - } + sCrossRate.setUnitRate(req.getUnitRate()); sCrossRate.setFaceValue(req.getFaceValue()); sCrossRate.setRate(req.getRate()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/listeners/RatesMessageListener.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/listeners/RatesMessageListener.java index 3b45db880..f983b7945 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/listeners/RatesMessageListener.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/listeners/RatesMessageListener.java @@ -145,7 +145,7 @@ public class RatesMessageListener extends QueueConsumer implements InitializingB newRequest.setCurrencyId(currencyCodeDictionary.getId()); newRequest.setValueDate(sRateElem.getDate()); newRequest.setValue(sRateElem.getPrice()); - newRequest.setStatus(WorkflowStatus.Active.getKey()); + newRequest.setWorkflowStatus(WorkflowStatus.Active.getKey()); return Optional.of(newRequest); } @@ -157,7 +157,7 @@ public class RatesMessageListener extends QueueConsumer implements InitializingB return Optional.empty(); } updateRequest.setValue(sRateElem.getPrice()); - updateRequest.setStatus(WorkflowStatus.Active.getKey()); + updateRequest.setWorkflowStatus(WorkflowStatus.Active.getKey()); return Optional.of(updateRequest); } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/SCrossRateUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/SCrossRateUpdateRequest.java index 40dbfc125..f48667b2c 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/SCrossRateUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/SCrossRateUpdateRequest.java @@ -1,23 +1,12 @@ package ru.spcex.clearing.platform.messaging.domain.cud.securitites; 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.time.LocalDate; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; public class SCrossRateUpdateRequest { @JsonProperty private Long id; @JsonProperty - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - private LocalDate date; - @JsonProperty - private String currency; - @JsonProperty private BigDecimal unitRate; @JsonProperty private BigDecimal faceValue; @@ -54,20 +43,4 @@ public class SCrossRateUpdateRequest { public void setRate(BigDecimal rate) { this.rate = rate; } - - public LocalDate getDate() { - return date; - } - - public void setDate(LocalDate date) { - this.date = date; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency; - } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java index 665088823..d84dccfe7 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java @@ -19,7 +19,7 @@ public class RatesNewRequest { @JsonProperty private Long currencyId; @JsonProperty - private String status; + private String workflowStatus; public BigDecimal getValue() { return value; @@ -45,11 +45,11 @@ public class RatesNewRequest { this.currencyId = currencyId; } - public String getStatus() { - return status; + public String getWorkflowStatus() { + return workflowStatus; } - public void setStatus(String status) { - this.status = status; + public void setWorkflowStatus(String workflowStatus) { + this.workflowStatus = workflowStatus; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesUpdateRequest.java index fabdb2b99..1a7928b8c 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesUpdateRequest.java @@ -10,7 +10,7 @@ public class RatesUpdateRequest { @JsonProperty private BigDecimal value; @JsonProperty - private String status; + private String workflowStatus; public Long getId() { return id; @@ -28,11 +28,11 @@ public class RatesUpdateRequest { this.value = value; } - public String getStatus() { - return status; + public String getWorkflowStatus() { + return workflowStatus; } - public void setStatus(String status) { - this.status = status; + public void setWorkflowStatus(String workflowStatus) { + this.workflowStatus = workflowStatus; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterNewRequest.java index 02200ffe7..b910fc5d5 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterNewRequest.java @@ -14,7 +14,7 @@ public class RiskParameterNewRequest { @JsonProperty private Long currencyPairId; @JsonProperty - private String status; + private String workflowStatus; public BigDecimal getValue() { return value; @@ -48,11 +48,11 @@ public class RiskParameterNewRequest { this.currencyPairId = currencyPairId; } - public String getStatus() { - return status; + public String getWorkflowStatus() { + return workflowStatus; } - public void setStatus(String status) { - this.status = status; + public void setWorkflowStatus(String status) { + this.workflowStatus = status; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterUpdateRequest.java index 0dcc7b2df..fde0f985f 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RiskParameterUpdateRequest.java @@ -12,7 +12,7 @@ public class RiskParameterUpdateRequest { @JsonProperty private BigDecimal quoteValue; @JsonProperty - private String status; + private String workflowStatus; public Long getId() { return id; @@ -38,11 +38,11 @@ public class RiskParameterUpdateRequest { this.quoteValue = quoteValue; } - public String getStatus() { - return status; + public String getWorkflowStatus() { + return workflowStatus; } - public void setStatus(String status) { - this.status = status; + public void setWorkflowStatus(String status) { + this.workflowStatus = status; } }