From 4b5d5b94afda8e5c6227a0cf8e831e6d29305358 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 13 Aug 2025 15:08:04 +0300 Subject: [PATCH 1/4] http://jira.mfd.msk:8088/browse/CLS-885 --- .../cud/company/CompanyInfoUpdateAction.java | 33 ++++++++++++++- .../src/main/resources/meta/meta.json | 41 ++++++++++++++++++- .../src/main/resources/meta/meta.xml | 11 ++++- .../cud/company/CompanyInfoUpdateRequest.java | 21 ++++++++++ 4 files changed, 103 insertions(+), 3 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java index e9ec48c61..1e74c7cb8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyInfoUpdateAction.java @@ -1,10 +1,15 @@ package ru.spcex.clearing.backendapi.controller.request.cud.company; 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 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.company.CompanyInfoUpdateRequest; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; public class CompanyInfoUpdateAction implements IAction { @ApiModelProperty(hidden = true) @@ -47,6 +52,14 @@ public class CompanyInfoUpdateAction implements IAction - + @@ -344,6 +344,11 @@ + + + + + @@ -444,6 +449,8 @@ + + @@ -460,6 +467,8 @@ + + diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java index 5a7cd8c5a..23c1c7268 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java @@ -1,6 +1,7 @@ package ru.spcex.clearing.platform.messaging.domain.cud.company; import com.fasterxml.jackson.annotation.JsonProperty; +import java.time.LocalDate; public class CompanyInfoUpdateRequest { @JsonProperty @@ -30,6 +31,10 @@ public class CompanyInfoUpdateRequest { private String fullName; @JsonProperty private String workflowStatus; + @JsonProperty + private String taxNumber; + @JsonProperty + private LocalDate registrationDate; public Long getId() { return id; @@ -134,4 +139,20 @@ public class CompanyInfoUpdateRequest { public void setWorkflowStatus(String workflowStatus) { this.workflowStatus = workflowStatus; } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public LocalDate getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(LocalDate registrationDate) { + this.registrationDate = registrationDate; + } } From 4762f29ee75c3555ced9691e132df4ab0b962cde Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 13 Aug 2025 17:39:12 +0300 Subject: [PATCH 2/4] edit new fields for companyInfo --- .../ru/spcex/clearing/company/service/CompanyInfoService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java index ccdd7723e..fccbe1798 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java @@ -104,6 +104,8 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea companyInfo.setDescription(req.getDescription()); companyInfo.setShortNameEng(req.getShortNameEng()); companyInfo.setFullNameEng(req.getFullNameEng()); + companyInfo.setTaxNumber(req.getTaxNumber()); + companyInfo.setRegistrationDate(req.getRegistrationDate()); boolean simpleUpdate = true; if (req.getWorkflowStatus() != null) { From 7bbe9b4bfba2334caa57828875a6d911868f9d7a Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Thu, 14 Aug 2025 17:46:43 +0300 Subject: [PATCH 3/4] http://jira.mfd.msk:8088/browse/CLS-899 (cherry picked from commit 178aa1156144a618aa14072d771f4b7a4aae2f0f) --- .../importer/services/TradeImporterService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java index 8add89ed9..2940ca7a5 100644 --- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java +++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java @@ -185,19 +185,25 @@ public class TradeImporterService { * returns OK - everything is kk */ private boolean fillNessessaryFields(STrades tradesDb) { - Consumer logErr = (st) -> log.error("strades {} {} {}", tradesDb.getTradeDate(), tradesDb.getTradeNum(), st); + Consumer log = (st) -> { + if (tradesDb.getClassCode().contains("INSTR")) + this.log.warn("strades {} {} {}", tradesDb.getTradeDate(), tradesDb.getTradeNum(), st); + else { + this.log.error("strades {} {} {}", tradesDb.getTradeDate(), tradesDb.getTradeNum(), st); + } + }; try { Market market = marketImdg.getFirstObjectBySQL("code = '%s'".formatted(tradesDb.getClassCode())); if (market == null) { if (blacklistMarketImdg.getFirstObjectByFieldValues(Map.of("code", tradesDb.getClassCode())) == null) { - logErr.accept("couldn't find market.section for classCode " + tradesDb.getClassCode()); + log.accept("couldn't find market.section for classCode " + tradesDb.getClassCode()); } return false; } tradesDb.setSection(market.getSection()); return true; } catch (Exception e) { - logErr.accept(ExceptionUtils.getStackTrace(e)); + log.accept(ExceptionUtils.getStackTrace(e)); return false; } } From 3d511b540e96d68107ffdb8c50453c8de9dcef81 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 19 Aug 2025 14:08:14 +0300 Subject: [PATCH 4/4] http://jira.mfd.msk:8088/browse/CLS-885 --- .../company/CompanyInfoBackendGetFields.java | 31 +++++++++++++++++++ .../cud/company/CompanyInfoUpdateRequest.java | 6 ++++ 2 files changed, 37 insertions(+) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java index 4e039a019..0f0dcf8c8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java @@ -1,9 +1,14 @@ package ru.spcex.clearing.backendapi.controller.response.entity.company; 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 java.time.LocalDate; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.profile.CompanyInfo; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; public class CompanyInfoBackendGetFields { @JsonProperty @@ -57,6 +62,14 @@ public class CompanyInfoBackendGetFields { @JsonProperty @ApiModelProperty(value = "Наименование статуса") private String workflowStatus; + @JsonProperty + @ApiModelProperty(value = "Номер") + private String taxNumber; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + @ApiModelProperty(value = "Дата регистрации") + private LocalDate registrationDate; public Long getId() { return id; @@ -194,6 +207,22 @@ public class CompanyInfoBackendGetFields { this.workflowStatus = workflowStatus; } + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public LocalDate getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(LocalDate registrationDate) { + this.registrationDate = registrationDate; + } + public static CompanyInfoBackendGetFields fromEntity(Company company) { if (company == null || company.getProfile() == null) { return null; @@ -211,6 +240,8 @@ public class CompanyInfoBackendGetFields { fields.setResidence(info.getResidence()); fields.setShortNameEng(info.getShortNameEng()); fields.setFullNameEng(info.getFullNameEng()); + fields.setTaxNumber(info.getTaxNumber()); + fields.setRegistrationDate(info.getRegistrationDate()); fields.setShortName(company.getShortName()); fields.setFullName(company.getFullName()); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java index 23c1c7268..b465ec317 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java @@ -1,7 +1,11 @@ package ru.spcex.clearing.platform.messaging.domain.cud.company; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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 CompanyInfoUpdateRequest { @JsonProperty @@ -33,6 +37,8 @@ public class CompanyInfoUpdateRequest { private String workflowStatus; @JsonProperty private String taxNumber; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty private LocalDate registrationDate;