From d42cc5696403217578aafb2175464653c7263f25 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 17 Jan 2023 16:03:51 +0300 Subject: [PATCH] =?UTF-8?q?meta=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=BC=D0=B5=D1=82=D1=8B.=20WARN=20=20MetaServer:META?= =?UTF-8?q?=20SERVER=20>>>=20=D0=9A=D0=BB=D0=B0=D1=81=D1=81=20=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20dealRegister=20=D0=BD=D0=B5=20=D0=BD=D0=B0=D0=B9?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LiabilitiesClaimsAssetController.java | 2 +- .../clearing/backendapi/meta/MetaServer.java | 2 +- .../src/main/resources/meta/meta.xml | 34 +- .../liabilities/LiabilitiesClaimsAssets.java | 456 +++++++++--------- .../execution/LiabilitiesClaimsAssets.java | 229 --------- .../LiabilitiesClaimsAssetsMapStore.java | 2 +- .../services/ReportWithPeriodCollector.java | 2 +- .../ReportBR_0420312_P10_Collector.java | 2 +- .../ReportBR_0420312_P1_Collector.java | 2 +- .../ReportBR_0420312_P2_Collector.java | 2 +- .../ReportBR_0420312_P3_Collector.java | 2 +- .../ReportBR_0420312_P4_Collector.java | 2 +- .../ReportBR_0420312_P5_Collector.java | 2 +- .../ReportBR_0420312_P6_Collector.java | 2 +- .../ReportBR_0420312_P7_Collector.java | 2 +- .../ReportBR_0420312_P8_Collector.java | 2 +- .../ReportBR_0420312_P9_Collector.java | 2 +- .../ReportBR_0420314_P1_Collector.java | 2 +- .../ReportBR_0420315_P1_Collector.java | 5 +- .../ReportBR_0420315_P2_collector.java | 5 +- .../collector/ReportBR_0420318_Collector.java | 4 +- .../collector/ReportPA_B_Collector.java | 2 +- .../collector/ReportPA_IV_Collector.java | 2 +- 23 files changed, 266 insertions(+), 501 deletions(-) delete mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/transaction/data/execution/LiabilitiesClaimsAssets.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsAssetController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsAssetController.java index b1cf05848..625b82d90 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsAssetController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsAssetController.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Controller; 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.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; import ru.spcex.clearing.backendapi.service.IOperator; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/meta/MetaServer.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/meta/MetaServer.java index 452a5e9af..976dab9e1 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/meta/MetaServer.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/meta/MetaServer.java @@ -54,7 +54,7 @@ public class MetaServer extends MetaBase { try { oe = getImplInstanceObjectExtracted(objectElement.getClazz(), objectElement.getFields()); } catch (Throwable e) { - log.warn("META SERVER >>> Класс {} для {} не найден!", objects.get(key).getClazz(), key); + log.debug("META SERVER >>> Класс {} для {} не найден!", objects.get(key).getClazz(), key); continue; } objectsExtracted.add(oe); 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 cf6a63aec..0469ba416 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -571,7 +571,7 @@ - + @@ -828,7 +828,7 @@ - + @@ -894,7 +894,7 @@ - + @@ -925,7 +925,7 @@ - + @@ -950,7 +950,7 @@ - + @@ -970,7 +970,7 @@ - + @@ -990,7 +990,7 @@ - + @@ -1011,7 +1011,7 @@ - + @@ -1023,7 +1023,7 @@ - + @@ -1042,7 +1042,7 @@ - + @@ -1056,7 +1056,7 @@ - + @@ -1074,7 +1074,7 @@ - + @@ -1125,7 +1125,7 @@ - + @@ -1139,7 +1139,7 @@ - + @@ -1221,7 +1221,7 @@ - + @@ -1576,7 +1576,7 @@ - + @@ -1615,7 +1615,7 @@ - + diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java index 65198c87e..758bebfbb 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java @@ -1,227 +1,229 @@ -package ru.clearing.classes.statics.data.liabilities; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; - -import java.math.BigDecimal; -import java.time.LocalDate; - -public class LiabilitiesClaimsAssets extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private Long companyId; - private Long accountId; - private String accountType; - private String account; - private BigDecimal liabilitiesQuantity; - private BigDecimal claimsQuantity; - private String currency; - private LocalDate settlementDate; - private LocalDate tradingDate; - private LocalDate refundDate; - private BigDecimal price; - private Long securityId; - private String tradingCode; - private String clearingCode; - private String shortName; - private String contract; - private String comment; - private String fullName; - private Long parentId; - private Long liabilitiesClaimsMoneyId; - private Long clearingStatus; - private Long paymentId; - private Long refundPaymentId; - private LocalDate clearingDate; - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long companyId) { - this.companyId = companyId; - } - - public Long getAccountId() { - return accountId; - } - - public void setAccountId(Long accountId) { - this.accountId = accountId; - } - - public String getAccountType() { - return accountType; - } - - public void setAccountType(String accountType) { - this.accountType = accountType; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public BigDecimal getLiabilitiesQuantity() { - return liabilitiesQuantity; - } - - public void setLiabilitiesQuantity(BigDecimal liabilitiesQuantity) { - this.liabilitiesQuantity = liabilitiesQuantity; - } - - public BigDecimal getClaimsQuantity() { - return claimsQuantity; - } - - public void setClaimsQuantity(BigDecimal claimsQuantity) { - this.claimsQuantity = claimsQuantity; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency; - } - - public LocalDate getSettlementDate() { - return settlementDate; - } - - public void setSettlementDate(LocalDate settlementDate) { - this.settlementDate = settlementDate; - } - - public LocalDate getTradingDate() { - return tradingDate; - } - - public void setTradingDate(LocalDate tradingDate) { - this.tradingDate = tradingDate; - } - - public LocalDate getRefundDate() { - return refundDate; - } - - public void setRefundDate(LocalDate refundDate) { - this.refundDate = refundDate; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public Long getSecurityId() { - return securityId; - } - - public void setSecurityId(Long securityId) { - this.securityId = securityId; - } - - public String getTradingCode() { - return tradingCode; - } - - public void setTradingCode(String tradingCode) { - this.tradingCode = tradingCode; - } - - public String getClearingCode() { - return clearingCode; - } - - public void setClearingCode(String clearingCode) { - this.clearingCode = clearingCode; - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName; - } - - public String getContract() { - return contract; - } - - public void setContract(String contract) { - this.contract = contract; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public Long getParentId() { - return parentId; - } - - public void setParentId(Long parentId) { - this.parentId = parentId; - } - - public Long getLiabilitiesClaimsMoneyId() { - return liabilitiesClaimsMoneyId; - } - - public void setLiabilitiesClaimsMoneyId(Long liabilitiesClaimsMoneyId) { - this.liabilitiesClaimsMoneyId = liabilitiesClaimsMoneyId; - } - - public Long getClearingStatus() { - return clearingStatus; - } - - public void setClearingStatus(Long clearingStatus) { - this.clearingStatus = clearingStatus; - } - - public Long getPaymentId() { - return paymentId; - } - - public void setPaymentId(Long paymentId) { - this.paymentId = paymentId; - } - - public Long getRefundPaymentId() { - return refundPaymentId; - } - - public void setRefundPaymentId(Long refundPaymentId) { - this.refundPaymentId = refundPaymentId; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate clearingDate) { - this.clearingDate = clearingDate; - } -} \ No newline at end of file +package ru.clearing.classes.statics.data.liabilities; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class LiabilitiesClaimsAssets extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long companyId; + private Instant clearingDate; + private Long accountId; + private String accountType; + private String account; + private BigDecimal liabilitiesQuantity; + private BigDecimal claimsQuantity; + private String currency; + private Instant settlementDate; + private Instant tradingDate; + private Instant refundDate; + private BigDecimal price; + private Long securityId; + private String tradingCode; + private String clearingCode; + private String shortName; + private String contract; + private String comment; + private String fullName; + private Long parentId; + private Long liabilitiesClaimsMoneyId; + private Long clearingStatus; + private Long paymentId; + private Long refundPaymentId; + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long value) { + this.companyId = value; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant value) { + this.clearingDate = value; + } + + public Long getAccountId() { + return accountId; + } + + public void setAccountId(Long value) { + this.accountId = value; + } + + public String getAccountType() { + return accountType; + } + + public void setAccountType(String value) { + this.accountType = value; + } + + public String getAccount() { + return account; + } + + public void setAccount(String value) { + this.account = value; + } + + public BigDecimal getLiabilitiesQuantity() { + return liabilitiesQuantity; + } + + public void setLiabilitiesQuantity(BigDecimal value) { + this.liabilitiesQuantity = value; + } + + public BigDecimal getClaimsQuantity() { + return claimsQuantity; + } + + public void setClaimsQuantity(BigDecimal value) { + this.claimsQuantity = value; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String value) { + this.currency = value; + } + + public Instant getSettlementDate() { + return settlementDate; + } + + public void setSettlementDate(Instant value) { + this.settlementDate = value; + } + + public Instant getTradingDate() { + return tradingDate; + } + + public void setTradingDate(Instant value) { + this.tradingDate = value; + } + + public Instant getRefundDate() { + return refundDate; + } + + public void setRefundDate(Instant value) { + this.refundDate = value; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal value) { + this.price = value; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long value) { + this.securityId = value; + } + + public String getTradingCode() { + return tradingCode; + } + + public void setTradingCode(String value) { + this.tradingCode = value; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String value) { + this.clearingCode = value; + } + + public String getShortName() { + return shortName; + } + + public void setShortName(String value) { + this.shortName = value; + } + + public String getContract() { + return contract; + } + + public void setContract(String value) { + this.contract = value; + } + + public String getComment() { + return comment; + } + + public void setComment(String value) { + this.comment = value; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String value) { + this.fullName = value; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long value) { + this.parentId = value; + } + + public Long getLiabilitiesClaimsMoneyId() { + return liabilitiesClaimsMoneyId; + } + + public void setLiabilitiesClaimsMoneyId(Long value) { + this.liabilitiesClaimsMoneyId = value; + } + + public Long getClearingStatus() { + return clearingStatus; + } + + public void setClearingStatus(Long value) { + this.clearingStatus = value; + } + + public Long getPaymentId() { + return paymentId; + } + + public void setPaymentId(Long value) { + this.paymentId = value; + } + + public Long getRefundPaymentId() { + return refundPaymentId; + } + + public void setRefundPaymentId(Long value) { + this.refundPaymentId = value; + } + +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/transaction/data/execution/LiabilitiesClaimsAssets.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/transaction/data/execution/LiabilitiesClaimsAssets.java deleted file mode 100644 index 00eff76d8..000000000 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/transaction/data/execution/LiabilitiesClaimsAssets.java +++ /dev/null @@ -1,229 +0,0 @@ -package ru.clearing.classes.transaction.data.execution; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; - -import java.math.BigDecimal; -import java.time.Instant; - -public class LiabilitiesClaimsAssets extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private Long companyId; - private Instant clearingDate; - private Long accountId; - private String accountType; - private String account; - private BigDecimal liabilitiesQuantity; - private BigDecimal claimsQuantity; - private String currency; - private Instant settlementDate; - private Instant tradingDate; - private Instant refundDate; - private BigDecimal price; - private Long securityId; - private String tradingCode; - private String clearingCode; - private String shortName; - private String contract; - private String comment; - private String fullName; - private Long parentId; - private Long liabilitiesClaimsMoneyId; - private Long clearingStatus; - private Long paymentId; - private Long refundPaymentId; - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long value) { - this.companyId = value; - } - - public Instant getClearingDate() { - return clearingDate; - } - - public void setClearingDate(Instant value) { - this.clearingDate = value; - } - - public Long getAccountId() { - return accountId; - } - - public void setAccountId(Long value) { - this.accountId = value; - } - - public String getAccountType() { - return accountType; - } - - public void setAccountType(String value) { - this.accountType = value; - } - - public String getAccount() { - return account; - } - - public void setAccount(String value) { - this.account = value; - } - - public BigDecimal getLiabilitiesQuantity() { - return liabilitiesQuantity; - } - - public void setLiabilitiesQuantity(BigDecimal value) { - this.liabilitiesQuantity = value; - } - - public BigDecimal getClaimsQuantity() { - return claimsQuantity; - } - - public void setClaimsQuantity(BigDecimal value) { - this.claimsQuantity = value; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String value) { - this.currency = value; - } - - public Instant getSettlementDate() { - return settlementDate; - } - - public void setSettlementDate(Instant value) { - this.settlementDate = value; - } - - public Instant getTradingDate() { - return tradingDate; - } - - public void setTradingDate(Instant value) { - this.tradingDate = value; - } - - public Instant getRefundDate() { - return refundDate; - } - - public void setRefundDate(Instant value) { - this.refundDate = value; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal value) { - this.price = value; - } - - public Long getSecurityId() { - return securityId; - } - - public void setSecurityId(Long value) { - this.securityId = value; - } - - public String getTradingCode() { - return tradingCode; - } - - public void setTradingCode(String value) { - this.tradingCode = value; - } - - public String getClearingCode() { - return clearingCode; - } - - public void setClearingCode(String value) { - this.clearingCode = value; - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String value) { - this.shortName = value; - } - - public String getContract() { - return contract; - } - - public void setContract(String value) { - this.contract = value; - } - - public String getComment() { - return comment; - } - - public void setComment(String value) { - this.comment = value; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String value) { - this.fullName = value; - } - - public Long getParentId() { - return parentId; - } - - public void setParentId(Long value) { - this.parentId = value; - } - - public Long getLiabilitiesClaimsMoneyId() { - return liabilitiesClaimsMoneyId; - } - - public void setLiabilitiesClaimsMoneyId(Long value) { - this.liabilitiesClaimsMoneyId = value; - } - - public Long getClearingStatus() { - return clearingStatus; - } - - public void setClearingStatus(Long value) { - this.clearingStatus = value; - } - - public Long getPaymentId() { - return paymentId; - } - - public void setPaymentId(Long value) { - this.paymentId = value; - } - - public Long getRefundPaymentId() { - return refundPaymentId; - } - - public void setRefundPaymentId(Long value) { - this.refundPaymentId = value; - } - -} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/LiabilitiesClaimsAssetsMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/LiabilitiesClaimsAssetsMapStore.java index 9976d6db8..c940295bb 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/LiabilitiesClaimsAssetsMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/LiabilitiesClaimsAssetsMapStore.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.imdg.businessobject; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.platform.utils.time.TimeUtil; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java index 9dd7b0bb0..e7687ed87 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java @@ -1,6 +1,6 @@ package ru.spcex.clearing.reports.services; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.reports.reports.AbstractReport; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java index 37d1d334b..553afb7df 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P10; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java index cf4e18887..2c87bdf45 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P1; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_Collector.java index e3f501107..80a98b782 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P2; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_Collector.java index ecc9c9ad9..afbd0b0a5 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P3; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_Collector.java index ef88297a0..c80af2543 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P4; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_Collector.java index 6480b85d4..c309da1fe 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P5; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java index 5f277aefe..acd227d15 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P6; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_Collector.java index ff5651744..9e03ee953 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P7; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java index ddaeb3326..c3aafad83 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.CurrencyCodeDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P8; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java index 347c0e45c..025956f07 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java @@ -3,7 +3,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.CurrencyCodeDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P9; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java index bb90398c2..824ddfd32 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.ClearingStatusDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P1; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java index 20d520210..5c0ddb435 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; import ru.clearing.classes.statics.data.misc.Listing; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.ClearingStatusDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P1; @@ -16,11 +16,8 @@ import ru.spcex.platform.enumeration.ClearingStatus; import ru.spcex.platform.enumeration.Market; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import java.math.BigDecimal; -import java.time.Instant; import java.time.LocalDate; import java.util.*; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java index 31a0e8f4e..648f69cd0 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java @@ -3,17 +3,14 @@ package ru.spcex.clearing.reports.services.collector; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import java.math.BigDecimal; -import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.HashSet; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java index fc0db50b7..f1845f848 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java @@ -6,7 +6,7 @@ import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_3.ReportBR_0420318; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; @@ -21,8 +21,6 @@ import java.time.LocalDate; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; @Component public class ReportBR_0420318_Collector extends ReportWithPeriodCollector { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java index 36433430e..a5b84606e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_B; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java index b0b731b8f..627508028 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; -import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.ClearingStatusDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_IV;