diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java index 3875ddc24..37a601135 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java @@ -7,12 +7,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; -import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.registry.AdmittedLiabilitiesRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -50,8 +48,8 @@ public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements register.setCompanyId(req.getCompanyId()); register.setAmount(req.getAmount()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); register.setCompanyFullName(req.getCompanyFullName()); admittedLiabilitiesRegisterMap.insert(register); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java index f95c4080a..f658cbdb8 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java @@ -21,22 +21,22 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements private final Imdg coveredLiabilitiesRegisterMap; @Autowired - public CoveredLiabilitiesRegisterService(Consumer< String, Object > kafkaQueue, - Producer< String, Object > kafkaProducer, + public CoveredLiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.coveredLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, CoveredLiabilitiesRegister.class); } @Override - public void afterPropertiesSet () { + public void afterPropertiesSet() { callback(CoveredLiabilitiesRegisterNewRequest.class) .setConsumer(this::coveredLiabilitiesRegisterNew) .forDestination(Consts.REGISTRY_COVERED_LIABILITIES_REGISTER_NEW, callbacks::put); init(); } - public void coveredLiabilitiesRegisterNew (BaseRequest userRequest) { + public void coveredLiabilitiesRegisterNew(BaseRequest userRequest) { CoveredLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); log.debug("CoveredLiabilitiesRegisterNewRequest received"); CoveredLiabilitiesRegister register = new CoveredLiabilitiesRegister(); @@ -49,8 +49,8 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements register.setAccount(req.getAccount()); register.setAmount(req.getAmount()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); coveredLiabilitiesRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java index 4bfbb3b64..9ca959a81 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java @@ -7,12 +7,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.AdmittedDealRegister; import ru.clearing.classes.statics.data.register.DepoBalanceRegister; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.AdmittedDealRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.DepoBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; @@ -45,13 +43,13 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial log.debug("DepoBalanceRegisterNewRequest received"); DepoBalanceRegister register = new DepoBalanceRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setCompanyId(req.getCompanyId()); register.setSessionId(req.getSessionId()); register.setDepoCode(req.getDepoCode()); register.setQuantity(req.getQuantity()); - register.setSecurityCode(req.getSecurityCode()); + register.setSecuritySymbol(req.getSecuritySymbol()); depoBalanceRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java index 9a05dfdfa..263191948 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java @@ -41,8 +41,8 @@ public class DepoPaymentInstructionRegisterService extends QueueConsumer impleme log.debug("DepoPaymentInstructionRegisterNewRequest received"); DepoPaymentInstructionRegister register = new DepoPaymentInstructionRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setCompanyId(req.getCompanyId()); register.setTradingClearingRegistryType(req.getTradingClearingRegistryType()); register.setTradingClearingRegistry(req.getTradingClearingRegistry()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java index 778300dd1..f56dcd1b7 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java @@ -22,8 +22,8 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements @Autowired public ExcludeLiabilitiesRegisterService(Consumer kafkaQueue, - Producer kafkaProducer, - ImdgProvider imdgProvider) { + Producer kafkaProducer, + ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.excludeLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, ExcludeLiabilitiesRegister.class); } @@ -41,8 +41,8 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements log.debug("ExcludeLiabilitiesRegisterNewRequest received"); ExcludeLiabilitiesRegister register = new ExcludeLiabilitiesRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setSessionId(req.getSessionId()); register.setValidFromDate(req.getValidFromDate()); register.setValidToDate(req.getValidToDate()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java index 5dfcde942..63caff003 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java @@ -7,16 +7,16 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import ru.clearing.classes.statics.data.register.ExecutionRegister; -import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExecutionRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExecutionRegisterUpdateRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; +import static ru.spcex.clearing.imdg.IMDGDistributedNames.Map_ExecutionRegister; + public class ExecutionRegisterService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -27,7 +27,7 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ Producer kafkaProducer, ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); - this.executionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionRegister, ExecutionRegister.class); + this.executionRegisterMap = imdgProvider.getImdg(Map_ExecutionRegister, ExecutionRegister.class); } @Override @@ -49,12 +49,12 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ register.setExchangeExecutionId(req.getExchangeExecutionId()); register.setExchangeExecutionTime(req.getExchangeExecutionTime()); register.setSecurityId(req.getSecurityId()); - register.setSeller(req.getSeller()); + register.setSellerId(req.getSellerId()); register.setSellerClearingCode(req.getSellerClearingCode()); register.setSellerTradingClearingRegister(req.getSellerTradingClearingRegister()); register.setSellerMoneyAccount(req.getSellerMoneyAccount()); register.setSellerDepoAccount(req.getSellerDepoAccount()); - register.setBuyer(req.getBuyer()); + register.setBuyerId(req.getBuyerId()); register.setBuyerClearingCode(req.getBuyerClearingCode()); register.setBuyerTradingClearingRegister(req.getBuyerTradingClearingRegister()); register.setBuyerMoneyAccount(req.getBuyerMoneyAccount()); @@ -62,8 +62,8 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ register.setAmount(req.getAmount()); register.setQuantity(req.getQuantity()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); executionRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java index a99fe279f..f310b589a 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java @@ -10,7 +10,6 @@ import ru.clearing.classes.statics.data.register.LiabilitiesRegister; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExcludeLiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; @@ -23,8 +22,8 @@ public class LiabilitiesRegisterService extends QueueConsumer implements Initial @Autowired public LiabilitiesRegisterService(Consumer kafkaQueue, - Producer kafkaProducer, - ImdgProvider imdgProvider) { + Producer kafkaProducer, + ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.liabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesRegister, LiabilitiesRegister.class); } @@ -42,8 +41,8 @@ public class LiabilitiesRegisterService extends QueueConsumer implements Initial log.debug("LiabilitiesRegisterNewRequest received"); LiabilitiesRegister register = new LiabilitiesRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setSessionId(req.getSessionId()); register.setValidFromDate(req.getValidFromDate()); register.setValidToDate(req.getValidToDate()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java index eb1ca12e6..d4b26a1ba 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -6,12 +6,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import ru.clearing.classes.statics.data.register.DepoBalanceRegister; import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.DepoBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; @@ -53,8 +51,8 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia register.setCompanyFullName(req.getCompanyFullName()); register.setCompanyId(req.getCompanyId()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); moneyBalanceRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java index 055e043ed..a342fac19 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java @@ -22,8 +22,8 @@ public class MoneyPaymentInstructionRegisterService extends QueueConsumer implem @Autowired public MoneyPaymentInstructionRegisterService(Consumer kafkaQueue, - Producer kafkaProducer, - ImdgProvider imdgProvider) { + Producer kafkaProducer, + ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.moneyPaymentInstructionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyPaymentInstructionRegister, MoneyPaymentInstructionRegister.class); } @@ -47,8 +47,8 @@ public class MoneyPaymentInstructionRegisterService extends QueueConsumer implem register.setSender(req.getSender()); register.setAddressee(req.getAddressee()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); moneyPaymentInstructionRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java index f76d06b88..7f03e7c0a 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class AdmittedLiabilitiesRegisterNewRequest { @JsonProperty @@ -36,10 +39,10 @@ public class AdmittedLiabilitiesRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; + private LocalDate clearingDate; public String getCompanyFullName() { return companyFullName; @@ -129,11 +132,11 @@ public class AdmittedLiabilitiesRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java index 1bcf03ef5..2d4045f76 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class CoveredLiabilitiesRegisterNewRequest { @JsonProperty @@ -36,10 +39,10 @@ public class CoveredLiabilitiesRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; + private LocalDate clearingDate; public String getCompanyFullName() { return companyFullName; @@ -129,11 +132,11 @@ public class CoveredLiabilitiesRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java index 227b7c042..e3bcaec58 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java @@ -3,13 +3,10 @@ package ru.spcex.clearing.platform.messaging.domain.cud.registry; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.apache.kafka.common.serialization.Deserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; -import java.math.BigInteger; +import java.math.BigDecimal; import java.time.Instant; public class DepoBalanceRegisterNewRequest { @@ -25,15 +22,15 @@ public class DepoBalanceRegisterNewRequest { @JsonProperty private Instant updatedAt; @JsonProperty - private String companyId; + private Long companyId; @JsonProperty private Long sessionId; @JsonProperty private String depoCode; @JsonProperty - private String quantity; + private BigDecimal quantity; @JsonProperty - private String securityCode; + private String securitySymbol; public Long getId() { return id; @@ -59,11 +56,11 @@ public class DepoBalanceRegisterNewRequest { this.updatedAt = updatedAt; } - public String getCompanyId() { + public Long getCompanyId() { return companyId; } - public void setCompanyId(String companyId) { + public void setCompanyId(Long companyId) { this.companyId = companyId; } @@ -83,19 +80,19 @@ public class DepoBalanceRegisterNewRequest { this.depoCode = depoCode; } - public String getQuantity() { + public BigDecimal getQuantity() { return quantity; } - public void setQuantity(String quantity) { + public void setQuantity(BigDecimal quantity) { this.quantity = quantity; } - public String getSecurityCode() { - return securityCode; + public String getSecuritySymbol() { + return securitySymbol; } - public void setSecurityCode(String securityCode) { - this.securityCode = securityCode; + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java index 73d977403..6a0f7ff09 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class ExcludeLiabilitiesRegisterNewRequest { @JsonProperty @@ -40,13 +43,13 @@ public class ExcludeLiabilitiesRegisterNewRequest { @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty - private Instant validFromDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate validFromDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant validToDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate validToDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty private Instant createdAt; @JsonSerialize(using = InstantSerializer.class) @@ -150,19 +153,19 @@ public class ExcludeLiabilitiesRegisterNewRequest { this.settlementDate = settlementDate; } - public Instant getValidFromDate() { + public LocalDate getValidFromDate() { return validFromDate; } - public void setValidFromDate(Instant validFromDate) { + public void setValidFromDate(LocalDate validFromDate) { this.validFromDate = validFromDate; } - public Instant getValidToDate() { + public LocalDate getValidToDate() { return validToDate; } - public void setValidToDate(Instant validToDate) { + public void setValidToDate(LocalDate validToDate) { this.validToDate = validToDate; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java index 09f9e2afa..8d87d0b2f 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java @@ -4,41 +4,44 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class ExecutionRegisterNewRequest { - @JsonProperty + @JsonProperty private Long exchangeExecutionId; - @JsonProperty + @JsonProperty private Long securityId; - @JsonProperty - private Long seller; - @JsonProperty + @JsonProperty + private Long sellerId; + @JsonProperty private String sellerClearingCode; - @JsonProperty + @JsonProperty private String sellerTradingClearingRegister; - @JsonProperty + @JsonProperty private String sellerMoneyAccount; - @JsonProperty + @JsonProperty private String sellerDepoAccount; - @JsonProperty - private Long buyer; - @JsonProperty + @JsonProperty + private Long buyerId; + @JsonProperty private String buyerClearingCode; - @JsonProperty + @JsonProperty private String buyerTradingClearingRegister; - @JsonProperty + @JsonProperty private String buyerMoneyAccount; - @JsonProperty + @JsonProperty private String buyerDepoAccount; - @JsonProperty + @JsonProperty private BigDecimal amount; - @JsonProperty + @JsonProperty private BigDecimal quantity; - @JsonProperty + @JsonProperty private Long id; @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @@ -48,14 +51,14 @@ public class ExecutionRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate clearingDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant tradingDate; + private LocalDate tradingDate; @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty @@ -77,14 +80,6 @@ public class ExecutionRegisterNewRequest { this.securityId = securityId; } - public Long getSeller() { - return seller; - } - - public void setSeller(Long seller) { - this.seller = seller; - } - public String getSellerClearingCode() { return sellerClearingCode; } @@ -117,14 +112,6 @@ public class ExecutionRegisterNewRequest { this.sellerDepoAccount = sellerDepoAccount; } - public Long getBuyer() { - return buyer; - } - - public void setBuyer(Long buyer) { - this.buyer = buyer; - } - public String getBuyerClearingCode() { return buyerClearingCode; } @@ -197,19 +184,19 @@ public class ExecutionRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } - public Instant getTradingDate() { + public LocalDate getTradingDate() { return tradingDate; } - public void setTradingDate(Instant tradingDate) { + public void setTradingDate(LocalDate tradingDate) { this.tradingDate = tradingDate; } @@ -220,4 +207,20 @@ public class ExecutionRegisterNewRequest { public void setExchangeExecutionTime(Instant exchangeExecutionTime) { this.exchangeExecutionTime = exchangeExecutionTime; } + + public Long getSellerId() { + return sellerId; + } + + public void setSellerId(Long sellerId) { + this.sellerId = sellerId; + } + + public Long getBuyerId() { + return buyerId; + } + + public void setBuyerId(Long buyerId) { + this.buyerId = buyerId; + } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java index feb139839..da5827454 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class LiabilitiesRegisterNewRequest { @JsonProperty @@ -32,10 +35,10 @@ public class LiabilitiesRegisterNewRequest { private String currency; @JsonProperty private BigDecimal sumLiabilities; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant settlementDate; + private LocalDate settlementDate; @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty @@ -44,14 +47,14 @@ public class LiabilitiesRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant validFromDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate validFromDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant validToDate; + private LocalDate validToDate; public Long getId() { return id; @@ -141,11 +144,11 @@ public class LiabilitiesRegisterNewRequest { this.sumLiabilities = sumLiabilities; } - public Instant getSettlementDate() { + public LocalDate getSettlementDate() { return settlementDate; } - public void setSettlementDate(Instant settlementDate) { + public void setSettlementDate(LocalDate settlementDate) { this.settlementDate = settlementDate; } @@ -165,19 +168,19 @@ public class LiabilitiesRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getValidFromDate() { + public LocalDate getValidFromDate() { return validFromDate; } - public void setValidFromDate(Instant validFromDate) { + public void setValidFromDate(LocalDate validFromDate) { this.validFromDate = validFromDate; } - public Instant getValidToDate() { + public LocalDate getValidToDate() { return validToDate; } - public void setValidToDate(Instant validToDate) { + public void setValidToDate(LocalDate validToDate) { this.validToDate = validToDate; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java index 3b1dee7c8..c1e8c60ad 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class MoneyPaymentInstructionRegisterNewRequest { @JsonProperty @@ -32,10 +35,10 @@ public class MoneyPaymentInstructionRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; + private LocalDate clearingDate; public String getCreditLegAccount() { return creditLegAccount; @@ -109,11 +112,11 @@ public class MoneyPaymentInstructionRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } }