From 4f7b529fcb73f3f89cc25939806040ded6c23b49 Mon Sep 17 00:00:00 2001 From: akulikov Date: Wed, 11 Jan 2023 11:47:44 +0300 Subject: [PATCH] cls29 collector6/7 fix --- .../reports/bt_17_5/ReportBR_0420312_P7.java | 6 +- ...ava => ReportBR_0420312_P6_Collector.java} | 24 +--- ...ava => ReportBR_0420312_P7_Collector.java} | 111 ++++++++---------- 3 files changed, 56 insertions(+), 85 deletions(-) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ReportBR_0420312_P6_collector.java => ReportBR_0420312_P6_Collector.java} (55%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ReportBR_0420312_P7_collector.java => ReportBR_0420312_P7_Collector.java} (53%) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java index c22ddc714..c35b4230c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java @@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.reports.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import ru.spcex.clearing.reports.reports.Destination; import ru.spcex.clearing.reports.reports.ReportId; import ru.spcex.clearing.reports.reports.ReportWithPeriod; @@ -20,15 +21,14 @@ public class ReportBR_0420312_P7 extends ReportWithPeriod { private final List rows = new ArrayList<>(); public ReportBR_0420312_P7(LocalDate startDate, - LocalDate endDate, - String destination) { + LocalDate endDate) { super(ReportId.BR_0420312_P7, "0.0.5", "0420312", "Сведения о клиринговом обеспечении, часть 7", startDate, endDate); - this.destination = destination; + this.destination = Destination.BR.getKey(); } @Override 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 similarity index 55% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java index 68a7b896b..5f277aefe 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 @@ -8,41 +8,26 @@ import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P6; 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.Objects; @Component -public class ReportBR_0420312_P6_collector extends ReportWithPeriodCollector { +public class ReportBR_0420312_P6_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public ReportBR_0420312_P6_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P6_Collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); } - Collection searchLiabilitiesClaimsAssets(LocalDate startDate, LocalDate endDate) { -// String ql = String.format("'%s' <= refundDate and refundDate <= '%s'", formatToIMDGInstant(startDate), formatToIMDGInstant(endDate)); -// Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql); - - ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder(); - Instant dateTimeLo = toInstantStartDay(startDate); - Instant dateTimeHi = toInstantStartDay(endDate); - ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi)); - Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p); - return liabilities; - } - @Override public ReportBR_0420312_P6 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { validateDateRange(startDate, endDate); - Collection liabilities = searchLiabilitiesClaimsAssets(startDate, endDate); + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); BigDecimal liabilitiesQuantitySum = liabilities.stream() .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) @@ -50,7 +35,8 @@ public class ReportBR_0420312_P6_collector extends ReportWithPeriodCollector { - private Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420312_P7_collector(ImdgProvider imdgProvider) { - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - } - - Collection searchLiabilitiesClaimsAssets(LocalDate startDate, LocalDate endDate) { -// String ql = String.format("'%s' <= refundDate and refundDate <= '%s'", formatToIMDGInstant(startDate), formatToIMDGInstant(endDate)); -// Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql); - - ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder(); - Instant dateTimeLo = toInstantStartDay(startDate); - Instant dateTimeHi = toInstantStartDay(endDate); - ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi)); - Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p); - return liabilities; - } - - @Override - public ReportBR_0420312_P7 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - Collection liabilities = searchLiabilitiesClaimsAssets(startDate, endDate); - - BigDecimal liabilitiesQuantitySum = liabilities.stream() - .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) - .filter(Objects::nonNull) - .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); - - ReportBR_0420312_P7 reportBR_0420312P5 = new ReportBR_0420312_P7(startDate, endDate, - "BR"); - reportBR_0420312P5.getRows().add(new ReportBR_0420312_P7.Info_0420312_P7(toString(liabilitiesQuantitySum))); - - return reportBR_0420312P5; - } - - @Override - public Class getReportClass() { - return ReportBR_0420312_P7.class; - } -} +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.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P7; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.Objects; + +@Component +public class ReportBR_0420312_P7_Collector extends ReportWithPeriodCollector { + private Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420312_P7_Collector(ImdgProvider imdgProvider) { + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + } + + @Override + public ReportBR_0420312_P7 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + + BigDecimal liabilitiesQuantitySum = liabilities.stream() + .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) + .filter(Objects::nonNull) + .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + + ReportBR_0420312_P7 reportBR_0420312P5 = new ReportBR_0420312_P7(startDate, endDate); + ReportBR_0420312_P7.Info_0420312_P7 reportInfo = new ReportBR_0420312_P7.Info_0420312_P7(toString(liabilitiesQuantitySum)); + reportBR_0420312P5.getRows().add(reportInfo); + + return reportBR_0420312P5; + } + + @Override + public Class getReportClass() { + return ReportBR_0420312_P7.class; + } +}