From 3f2aa8faa3f75dd5353c0ed265dc3d3cb424ef9a Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 11 Jan 2023 12:10:21 +0300 Subject: [PATCH] =?UTF-8?q?reports-service=20=D1=80=D0=B5=D1=84=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20ReportBR=5F0420314?= =?UTF-8?q?=5FP*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/ReportWithPeriodCollector.java | 12 +++++++ ...ava => ReportBR_0420314_P1_collector.java} | 36 +++++-------------- ...ava => ReportBR_0420314_P2_collector.java} | 16 ++++----- 3 files changed, 26 insertions(+), 38 deletions(-) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Repbr0420314_P1_bt_17_4_collector.java => ReportBR_0420314_P1_collector.java} (67%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Repbr0420314_P2_bt_17_4_collector.java => ReportBR_0420314_P2_collector.java} (87%) 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 7ca3c049f..9dd7b0bb0 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 @@ -26,4 +26,16 @@ public abstract class ReportWithPeriodCollector extend Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p); return liabilities; } + + protected Collection searchLiabilitiesClaimsAssets(Imdg liabilitiesClaimsAssetsImdg, + LocalDate startDate, LocalDate endDate, + Long allowClearingStatusId) { + ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder(); + Instant dateTimeLo = toInstantStartDay(startDate); + Instant dateTimeHi = toInstantStartDay(endDate); + ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi), + pb.equals("clearingStatus", allowClearingStatusId)); + Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p); + return liabilities; + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Repbr0420314_P1_bt_17_4_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java similarity index 67% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Repbr0420314_P1_bt_17_4_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java index 6265a73ee..dc42e8d5d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Repbr0420314_P1_bt_17_4_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java @@ -26,7 +26,7 @@ import java.util.Map; * accountTransactionLiabilities */ @Component -public class Repbr0420314_P1_bt_17_4_collector extends ReportWithPeriodCollector { +public class ReportBR_0420314_P1_collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg companySymbolsImdg; private Imdg clearingMemberCategoryImdg; @@ -36,7 +36,7 @@ public class Repbr0420314_P1_bt_17_4_collector extends ReportWithPeriodCollector protected static final String ALLOW_CLEARING_STATUS = ClearingStatus.OK.getKey(); @Autowired - public Repbr0420314_P1_bt_17_4_collector(ImdgProvider imdgProvider) { + public ReportBR_0420314_P1_collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); @@ -52,19 +52,6 @@ public class Repbr0420314_P1_bt_17_4_collector extends ReportWithPeriodCollector return companySymbol; } - Collection searchLiabilitiesClaimsAssets(LocalDate startDate, LocalDate endDate, Long allowClearingStatusId) { - // String ql = String.format("'%s' <= refundDate and refundDate <= '%s' and clearingStatus=%s", -// formatToIMDGInstant(startDate), formatToIMDGInstant(endDate), allowClearingStatusId); -// 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), - pb.equals("clearingStatus", allowClearingStatusId)); - Collection liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p); - return liabilities; - } @Override public ReportBR_0420314_P1 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { @@ -75,7 +62,7 @@ public class Repbr0420314_P1_bt_17_4_collector extends ReportWithPeriodCollector ); final Long allowClearingStatusId = MapUtil.getDictionaryIdByCode(clearingStatusDictionaryImdg, ALLOW_CLEARING_STATUS); // "OK" - Collection liabilities = searchLiabilitiesClaimsAssets(startDate, endDate, allowClearingStatusId); + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate, allowClearingStatusId); for (LiabilitiesClaimsAssets liability: liabilities) { final Long companyId = liability.getCompanyId(); @@ -85,13 +72,6 @@ public class Repbr0420314_P1_bt_17_4_collector extends ReportWithPeriodCollector continue; } Collection cmcLst = clearingMemberCategoryImdg.getCollectionObjectsByFieldValues(Map.of("companyId", companyId)); -// boolean checkCategory = cmcLst.stream().anyMatch(cmc -> ALLOW_CLEARING_MEMBER_CATEGORY.contains(cmc.getClearingMemberCategory())); -// if (!checkCategory) { -// // фильтруются <> I, V -// log.trace("Filtered company[{}] ClearingMemberCategory no match: {}", -// companyId, cmcLst); -// continue company_for; -// } String cleanMemberCategories = MapUtil.joinMultiString(cmcLst, ClearingMemberCategory::getClearingMemberCategory); CompanySymbols companySymbolCntr = findSymbol(DocumentTypes.cntr, company.getId()); @@ -99,12 +79,12 @@ public class Repbr0420314_P1_bt_17_4_collector extends ReportWithPeriodCollector CompanySymbols companySymbolOGRN = findSymbol(DocumentTypes.ogrn, company.getId()); ReportBR_0420314_P1.Info_0420314_P1 info_0420314P1 = new ReportBR_0420314_P1.Info_0420314_P1( - company.getClearingCode(), + toString(company.getClearingCode()), toString(companySymbolCntr == null? null : companySymbolCntr.getId()), - company.getFullName(), - (companySymbolINN == null ? null : companySymbolINN.getCompanySymbolValue()), - (companySymbolOGRN == null? null : companySymbolOGRN.getCompanySymbolValue()), - cleanMemberCategories, // может быть несколько, тогда через запятую перечислить + toString(company.getFullName()), + toString(companySymbolINN == null ? null : companySymbolINN.getCompanySymbolValue()), + toString(companySymbolOGRN == null? null : companySymbolOGRN.getCompanySymbolValue()), + toString(cleanMemberCategories), // может быть несколько, тогда через запятую перечислить toString(liability.getRefundPaymentId()), toString(liability.getTradingDate()), toString(liability.getLiabilitiesQuantity()) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Repbr0420314_P2_bt_17_4_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_collector.java similarity index 87% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Repbr0420314_P2_bt_17_4_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_collector.java index 3174c59e9..5a058d0bd 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Repbr0420314_P2_bt_17_4_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_collector.java @@ -28,14 +28,14 @@ import java.util.Objects; * accountTransactionLiabilities */ @Component -public class Repbr0420314_P2_bt_17_4_collector extends ReportWithPeriodCollector { +public class ReportBR_0420314_P2_collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg paymentInstructionImdg; private Imdg accountBalanceImdg; private Imdg profileDocumentImdg; @Autowired - public Repbr0420314_P2_bt_17_4_collector(ImdgProvider imdgProvider) { + public ReportBR_0420314_P2_collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); paymentInstructionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class); accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class); @@ -43,10 +43,6 @@ public class Repbr0420314_P2_bt_17_4_collector extends ReportWithPeriodCollector } Collection searchPaymentInstruction(LocalDate startDate, LocalDate endDate) { -// String ql = String.format("'%s' <= created and created <= '%s'", -// formatToIMDGInstant(startDate), formatToIMDGInstant(endDate)); -// Collection paymentInstructionsAll = paymentInstructionImdg.getCollectionObjectsBySQL(ql); - ImdgPredicateBuilder pb = paymentInstructionImdg.predicateBuilder(); Instant dateTimeLo = toInstantStartDay(startDate); Instant dateTimeHi = toInstantStartDay(endDate); @@ -107,12 +103,12 @@ public class Repbr0420314_P2_bt_17_4_collector extends ReportWithPeriodCollector ReportBR_0420314_P2.Info_0420314_P2 info_0420314P2 = new ReportBR_0420314_P2.Info_0420314_P2( - company.getClearingCode(), - documentTypeStr, - accountBalance == null ? null : toString(accountBalance.getOpenBalanceAmount()), + toString(company.getClearingCode()), + toString(documentTypeStr), + toString(accountBalance == null ? null : accountBalance.getOpenBalanceAmount()), toString(paymentInstruction_creditLeg_amount), toString(paymentInstructiont_debitLeg_amount), - accountBalance == null ? null : toString(accountBalance.getCloseBalanceAmount()) + toString(accountBalance == null ? null : accountBalance.getCloseBalanceAmount()) ); reportBR_0420312P2.getRows().add(info_0420314P2);