From 801b1d88f776850dc8dbba76f4febafdc15d5bd3 Mon Sep 17 00:00:00 2001 From: akulikov Date: Tue, 10 Jan 2023 16:40:41 +0300 Subject: [PATCH] . --- .../reports/reports/bt_13/ReportDOCIN.java | 7 +- .../services/AbstractReportCollector.java | 22 +- .../reports/services/ReportsService.java | 616 +++++++++--------- .../Repbr0420314_P1_bt_17_4_collector.java | 3 +- .../ReportBR_0420312_P10_collector.java | 9 +- .../ReportBR_0420312_P4_collector.java | 11 +- .../ReportBR_0420312_P5_collector.java | 9 +- .../ReportBR_0420312_P6_collector.java | 9 +- .../ReportBR_0420312_P7_collector.java | 9 +- .../ReportBR_0420312_P8_collector.java | 7 +- .../ReportBR_0420312_P9_collector.java | 7 +- .../ReportBR_0420315_P2_collector.java | 11 +- .../collector/ReportDOCIN_Collector.java | 28 +- .../collector/ReportDOCOUT_Collector.java | 29 +- 14 files changed, 399 insertions(+), 378 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java index 47329d965..3b8a7171b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java @@ -8,7 +8,6 @@ import ru.spcex.clearing.reports.reports.ReportId; import ru.spcex.clearing.reports.xml_test.FormattedLocalDateConverter; import ru.spcex.clearing.reports.xml_test.FormattedLocalTimeConverter; -import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -62,14 +61,14 @@ public class ReportDOCIN extends AbstractReport { @XStreamAsAttribute @XStreamAlias("id") String id, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_registrationDate") String inDocumentJournalRegistrationDate, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_registrationTime") String inDocumentJournalRegistrationTime, - @XStreamAsAttribute @XStreamAlias("inDocumentJournal_registrationNumber") Long inDocumentJournalRegistrationNumber, + @XStreamAsAttribute @XStreamAlias("inDocumentJournal_registrationNumber") String inDocumentJournalRegistrationNumber, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_documentName") String inDocumentJournalDocumentName, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_sender") String inDocumentJournalSender, - @XStreamAsAttribute @XStreamAlias("inDocumentJournal_quantity") Long inDocumentJournalQuantity, + @XStreamAsAttribute @XStreamAlias("inDocumentJournal_quantity") String inDocumentJournalQuantity, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_clearingCode") String inDocumentJournalClearingCode, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_courierType") String inDocumentJournalCourierType, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_emailDate") String inDocumentJournal_emailDate, - @XStreamAsAttribute @XStreamAlias("inDocumentJournal_Amount") BigDecimal inDocumentJournalAmount, + @XStreamAsAttribute @XStreamAlias("inDocumentJournal_Amount") String inDocumentJournalAmount, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_dossierNumber") String inDocumentJournalDossierNumber, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_Comment") String inDocumentJournalComment, @XStreamAsAttribute @XStreamAlias("inDocumentJournal_receiptDate") String inDocumentJournalReceiptDate diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/AbstractReportCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/AbstractReportCollector.java index 170be172f..6ae81d529 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/AbstractReportCollector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/AbstractReportCollector.java @@ -12,12 +12,14 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Instant; import java.time.LocalDate; +import java.time.LocalTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Locale; public abstract class AbstractReportCollector { public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy"); + public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss"); public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy'T'HH:mm:ss"); protected final Logger log = LoggerFactory.getLogger(getClass()); @@ -55,8 +57,13 @@ public abstract class AbstractReportCollector { return date.plusDays(1).atStartOfDay(TimeUtil.zone).minusSeconds(1).toInstant(); } + protected String toString(String str) { + if (str == null) return ""; + return str; + } + protected String toString(Long val) { - if (val == null) return null; + if (val == null) return ""; return val.toString(); } @@ -64,7 +71,7 @@ public abstract class AbstractReportCollector { * Обеспечивает точность 2 знака после запятой */ protected String toString(Double val) { - if (val == null) return null; + if (val == null) return ""; return String.format(Locale.US, "%.2f", val.doubleValue()); } @@ -72,18 +79,23 @@ public abstract class AbstractReportCollector { * Обеспечивает точность 2 знака после запятой */ protected String toString(BigDecimal val) { - if (val == null) return null; + if (val == null) return ""; return val.setScale(2, RoundingMode.HALF_UP).toString(); } protected String toString(Instant val) { - if (val == null) return null; + if (val == null) return ""; return DATE_TIME_FORMATTER.format(val.atZone(ZoneId.systemDefault())); } protected String toString(LocalDate date) { - if (date == null) return null; + if (date == null) return ""; return DATE_FORMATTER.format(date); } + protected String toString(LocalTime date) { + if (date == null) return ""; + return TIME_FORMATTER.format(date); + } + } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java index 431e28627..1339fcdb2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java @@ -1,320 +1,320 @@ -package ru.spcex.clearing.reports.services; - -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.naming.NoNameCoder; -import com.thoughtworks.xstream.io.xml.XppDriver; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_BT2_B; -import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_BT2_IV; -import ru.spcex.clearing.reports.reports.bt_13.ReportDOCIN; -import ru.spcex.clearing.reports.reports.bt_13.Report_BT13_12; -import ru.spcex.clearing.reports.reports.bt_16_5.Report_BT16_5; -import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P1; -import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2; -import ru.spcex.clearing.reports.reports.bt_17_2.ReportBR_0420317; -import ru.spcex.clearing.reports.reports.bt_17_3.ReportBR_0420318; -import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P1; -import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P2; -import ru.spcex.clearing.reports.reports.bt_17_5.*; - -import java.time.LocalDate; -import java.time.LocalTime; - -@Deprecated -public class ReportsService { - private final Logger log = LoggerFactory.getLogger(getClass()); - - public void writeXML() { - XStream xStream = new XStream(new XppDriver(new NoNameCoder())); - - xStream.processAnnotations(ReportBR_0420315_P1.class); - xStream.processAnnotations(ReportBR_0420315_P2.class); - xStream.processAnnotations(ReportBR_0420317.class); - xStream.processAnnotations(ReportBR_0420318.class); - xStream.processAnnotations(ReportBR_0420314_P1.class); - xStream.processAnnotations(ReportBR_0420314_P2.class); - xStream.processAnnotations(ReportBR_0420312_P1.class); - xStream.processAnnotations(ReportBR_0420312_P2.class); - xStream.processAnnotations(ReportBR_0420312_P3.class); - xStream.processAnnotations(ReportBR_0420312_P4.class); - xStream.processAnnotations(ReportBR_0420312_P5.class); - xStream.processAnnotations(ReportBR_0420312_P6.class); - xStream.processAnnotations(ReportBR_0420312_P7.class); - xStream.processAnnotations(ReportBR_0420312_P8.class); - xStream.processAnnotations(ReportBR_0420312_P9.class); - xStream.processAnnotations(ReportBR_0420312_P10.class); - xStream.processAnnotations(ReportPA_BT2_IV.class); - xStream.processAnnotations(ReportPA_BT2_B.class); - xStream.processAnnotations(Report_BT16_5.class); - xStream.processAnnotations(ReportDOCIN.class); - xStream.processAnnotations(Report_BT13_12.class); - - - - /* ========= БТ 17.1 ========== */ - // todo see ReportDataCollector - ReportBR_0420315_P1 reportBR_0420315_p1 = new ReportBR_0420315_P1(LocalDate.now(), - LocalDate.now()); - ReportBR_0420315_P1.Info_0420315_P1 info_0420315_p1 = new ReportBR_0420315_P1.Info_0420315_P1("companyId", - "companyFullName", - "listingMarket", - "contractorQty", - "liabilitiesAmount"); - reportBR_0420315_p1.getRows().add(info_0420315_p1); - log.info("ReportBR_0420315_P1:\n{}\n", xStream.toXML(reportBR_0420315_p1)); - - - -// ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(LocalDate.now(), -// LocalDate.now(), -// "BR", +//package ru.spcex.clearing.reports.services; +// +//import com.thoughtworks.xstream.XStream; +//import com.thoughtworks.xstream.io.naming.NoNameCoder; +//import com.thoughtworks.xstream.io.xml.XppDriver; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_BT2_B; +//import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_BT2_IV; +//import ru.spcex.clearing.reports.reports.bt_13.ReportDOCIN; +////import ru.spcex.clearing.reports.reports.bt_13.Report_BT13_12; +//import ru.spcex.clearing.reports.reports.bt_16_5.Report_BT16_5; +//import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P1; +//import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2; +//import ru.spcex.clearing.reports.reports.bt_17_2.ReportBR_0420317; +//import ru.spcex.clearing.reports.reports.bt_17_3.ReportBR_0420318; +//import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P1; +//import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P2; +//import ru.spcex.clearing.reports.reports.bt_17_5.*; +// +//import java.time.LocalDate; +//import java.time.LocalTime; +// +//@Deprecated +//public class ReportsService { +// private final Logger log = LoggerFactory.getLogger(getClass()); +// +// public void writeXML() { +// XStream xStream = new XStream(new XppDriver(new NoNameCoder())); +// +// xStream.processAnnotations(ReportBR_0420315_P1.class); +// xStream.processAnnotations(ReportBR_0420315_P2.class); +// xStream.processAnnotations(ReportBR_0420317.class); +// xStream.processAnnotations(ReportBR_0420318.class); +// xStream.processAnnotations(ReportBR_0420314_P1.class); +// xStream.processAnnotations(ReportBR_0420314_P2.class); +// xStream.processAnnotations(ReportBR_0420312_P1.class); +// xStream.processAnnotations(ReportBR_0420312_P2.class); +// xStream.processAnnotations(ReportBR_0420312_P3.class); +// xStream.processAnnotations(ReportBR_0420312_P4.class); +// xStream.processAnnotations(ReportBR_0420312_P5.class); +// xStream.processAnnotations(ReportBR_0420312_P6.class); +// xStream.processAnnotations(ReportBR_0420312_P7.class); +// xStream.processAnnotations(ReportBR_0420312_P8.class); +// xStream.processAnnotations(ReportBR_0420312_P9.class); +// xStream.processAnnotations(ReportBR_0420312_P10.class); +// xStream.processAnnotations(ReportPA_BT2_IV.class); +// xStream.processAnnotations(ReportPA_BT2_B.class); +// xStream.processAnnotations(Report_BT16_5.class); +// xStream.processAnnotations(ReportDOCIN.class); +//// xStream.processAnnotations(Report_BT13_12.class); +// +// +// +// /* ========= БТ 17.1 ========== */ +// // todo see ReportDataCollector +// ReportBR_0420315_P1 reportBR_0420315_p1 = new ReportBR_0420315_P1(LocalDate.now(), +// LocalDate.now()); +// ReportBR_0420315_P1.Info_0420315_P1 info_0420315_p1 = new ReportBR_0420315_P1.Info_0420315_P1("companyId", +// "companyFullName", +// "listingMarket", // "contractorQty", // "liabilitiesAmount"); -// log.info("ReportBR_0420315_P2:\n{}\n", xStream.toXML(reportBR_0420315_p2)); - - - - /* ========= БТ 17.2 ========== */ - ReportBR_0420317 reportBR_0420317 = new ReportBR_0420317(LocalDate.now(), LocalDate.now()); - ReportBR_0420317.Info_0420317 info_0420317 = new ReportBR_0420317.Info_0420317("companyClearingCode", - "relationSupplierId", - "relationServiceId", - "relationServiceStatus", - "relationUpdatedAt", - "companyFullName", - "companySymbolCode", - "companyInfoCountryCode", - "relationComment"); - reportBR_0420317.getRows().add(info_0420317); - log.info("ReportBR_0420317:\n{}\n", xStream.toXML(reportBR_0420317)); - - - - /* ========= БТ 17.3 ========== */ - ReportBR_0420318 reportBR_0420318 = new ReportBR_0420318(LocalDate.now(), LocalDate.now()); - ReportBR_0420318.Info_0420318 info_0420318 = new ReportBR_0420318.Info_0420318( - "liabilitiesClaimsAssetsFullName", - "companySymbolsCode", - "liabilitiesClaimsAssetsCountryCode", - "liabilitiesClaimsAssetsSettlementDate", - "liabilitiesClaimsAssetsAccountType", - "liabilitiesClaimsAssetsContract", - "liabilitiesClaimsMoneyCurrencyCode", - "liabilitiesAmountAmount", - "liabilitiesClaimsMoneyName", - "liabilitiesClaimsAssetsLiabilities", - "liabilitiesClaimsAssetsComment", - "companySymbolValue", - "liabilitiesClaimsAssetsFullNames"); - reportBR_0420318.getRows().add(info_0420318); - log.info("ReportBR_0420318:\n{}\n", xStream.toXML(reportBR_0420318)); - - - - /* ========= БТ 17.4 ========== */ - ReportBR_0420314_P1 reportBR_0420314P1 = new ReportBR_0420314_P1(LocalDate.now(), LocalDate.now(), "clearingStatus", "BR"); - ReportBR_0420314_P1.Info_0420314_P1 info_0420314P1 = new ReportBR_0420314_P1.Info_0420314_P1("companyClearingCode", - "paymentInstructionSenderId", - "profileDocumentId", - "companyFullName", - "companySymbolCode", - "companySymbolValue", - "clearingMemberCategoryClearingMemberCategory", - LocalDate.of(2022,11,10), - "liabilitiesClaimsAssetsLiabilitiesQuantity" - ); - reportBR_0420314P1.getRows().add(info_0420314P1); - log.info("ReportBR_0420314_P1:\n{}\n", xStream.toXML(reportBR_0420314P1)); - - - - ReportBR_0420314_P2 reportBR_0420314P2 = new ReportBR_0420314_P2(LocalDate.now(), LocalDate.now(), "transactionStatus", "BR"); - ReportBR_0420314_P2.Info_0420314_P2 info_0420314P2 = new ReportBR_0420314_P2.Info_0420314_P2("companyClearingCode", - "profileDocumentId", - "accountBalanceOpenBalanceAmt", - "paymentInstructionCreditLegAmount", - "paymentInstructionDebitLegAmount", - "accountBalanceCloseBalanceAmount" - ); - reportBR_0420314P2.getRows().add(info_0420314P2); - log.info("ReportBR_0420314_P2:\n{}\n", xStream.toXML(reportBR_0420314P2)); - - +// reportBR_0420315_p1.getRows().add(info_0420315_p1); +// log.info("ReportBR_0420315_P1:\n{}\n", xStream.toXML(reportBR_0420315_p1)); // -// /* ========= БТ 17.5 ========== */ -// ReportBR_0420312_P1 reportBR_0420312P1 = new ReportBR_0420312_P1(LocalDate.now(), -// LocalDate.now(), -// "companyClearingCode", -// "BR", -// "liabilitesClaimsAssetsCompanyId", -// "liabilitesClaimsAssetsFullName", +// +// +//// ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "contractorQty", +//// "liabilitiesAmount"); +//// log.info("ReportBR_0420315_P2:\n{}\n", xStream.toXML(reportBR_0420315_p2)); +// +// +// +// /* ========= БТ 17.2 ========== */ +// ReportBR_0420317 reportBR_0420317 = new ReportBR_0420317(LocalDate.now(), LocalDate.now()); +// ReportBR_0420317.Info_0420317 info_0420317 = new ReportBR_0420317.Info_0420317("companyClearingCode", +// "relationSupplierId", +// "relationServiceId", +// "relationServiceStatus", +// "relationUpdatedAt", +// "companyFullName", // "companySymbolCode", -// "companySymbolValue", // "companyInfoCountryCode", -// "clearingMemberCategory"); -// log.info("ReportBR_0420312_P1:\n{}\n", xStream.toXML(reportBR_0420312P1)); +// "relationComment"); +// reportBR_0420317.getRows().add(info_0420317); +// log.info("ReportBR_0420317:\n{}\n", xStream.toXML(reportBR_0420317)); // -// ReportBR_0420312_P2 reportBR_0420312P2 = new ReportBR_0420312_P2(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "liabilitiesClaimsAssetsCompanyId", -// "liabilitiesClaimsAssetsLiabilities"); -// log.info("ReportBR_0420312_P2:\n{}\n", xStream.toXML(reportBR_0420312P2)); // -// ReportBR_0420312_P3 reportBR_0420312P3 = new ReportBR_0420312_P3(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "liabilitiesClaimsAssetsCompanyId", -// "liabilitiesClaimsAssetsLiabilities"); -// log.info("ReportBR_0420312_P3:\n{}\n", xStream.toXML(reportBR_0420312P3)); // -// ReportBR_0420312_P4 reportBR_0420312P4 = new ReportBR_0420312_P4(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "liabilitiesAmount"); -// log.info("ReportBR_0420312_P4:\n{}\n", xStream.toXML(reportBR_0420312P4)); -// -// ReportBR_0420312_P5 reportBR_0420312P5 = new ReportBR_0420312_P5(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "liabilitiesAmount"); -// log.info("ReportBR_0420312_P5:\n{}\n", xStream.toXML(reportBR_0420312P5)); -// -// ReportBR_0420312_P6 reportBR_0420312P6 = new ReportBR_0420312_P6(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "liabilitiesAmount"); -// log.info("ReportBR_0420312_P6:\n{}\n", xStream.toXML(reportBR_0420312P6)); -// -// ReportBR_0420312_P7 reportBR_0420312P7 = new ReportBR_0420312_P7(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "liabilitiesAmount"); -// log.info("ReportBR_0420312_P7:\n{}\n", xStream.toXML(reportBR_0420312P7)); -// -// ReportBR_0420312_P8 reportBR_0420312P8 = new ReportBR_0420312_P8(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "currencyId", -// "liabilitiesClaimsAssetsCompanyId", +// /* ========= БТ 17.3 ========== */ +// ReportBR_0420318 reportBR_0420318 = new ReportBR_0420318(LocalDate.now(), LocalDate.now()); +// ReportBR_0420318.Info_0420318 info_0420318 = new ReportBR_0420318.Info_0420318( // "liabilitiesClaimsAssetsFullName", -// "companySymbolCode", -// "companySymbolValue", -// "companyInfoCountryCode", -// "clearingMemberCategory"); -// log.info("ReportBR_0420312_P8:\n{}\n", xStream.toXML(reportBR_0420312P8)); -// -// ReportBR_0420312_P9 reportBR_0420312P9 = new ReportBR_0420312_P9(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "currencyId", -// "liabilitiesClaimsAssetsCompanyId", +// "companySymbolsCode", +// "liabilitiesClaimsAssetsCountryCode", +// "liabilitiesClaimsAssetsSettlementDate", +// "liabilitiesClaimsAssetsAccountType", +// "liabilitiesClaimsAssetsContract", // "liabilitiesClaimsMoneyCurrencyCode", -// "liabilitiesClaimsAssetsLiabilities"); -// log.info("ReportBR_0420312_P9:\n{}\n", xStream.toXML(reportBR_0420312P9)); -// -// ReportBR_0420312_P10 reportBR_0420312P10 = new ReportBR_0420312_P10(LocalDate.now(), -// LocalDate.now(), -// "BR", -// "liabilitiesAmount"); -// log.info("ReportBR_0420312_P10:\n{}\n", xStream.toXML(reportBR_0420312P10)); -// - - - /* ========= БТ 12.2 ========== */ -// ReportPA_BT2_IV reportPA_bt2_iv = new ReportPA_BT2_IV(LocalDate.now(), -// LocalDate.now(), -// "clearingMemberCategory", -// "liabilitiesClaimsAssetsFullName", -// "companyClearingCode", -// "liabilitiesClaimsAssetsSettlementDate", -// "liabilitiesClaimsAssetsRefundDate", -// "liabilitiesClaimsAssetsTradingDate", -// "liabilitiesClaimsAssetsContract", -// "liabilitiesClaimsAssetsLiabilitiesQuantity", -// "chargeCommission", -// "liabilitiesClaimsAssetsClaimsQuantity", -// "liabilitiesClaimsAssetsRefundPaymentId", -// "liabilitiesClaimsAssetsClearingStatus", +// "liabilitiesAmountAmount", +// "liabilitiesClaimsMoneyName", +// "liabilitiesClaimsAssetsLiabilities", // "liabilitiesClaimsAssetsComment", -// "claimsAmount", -// "liabilitiesAmount", -// "paymentAmount"); -// log.info("ReportPA_BT2_IV:\n{}\n", xStream.toXML(reportPA_bt2_iv)); - -// ReportPA_BT2_B reportPA_bt2_b = new ReportPA_BT2_B(LocalDate.now(), -// LocalDate.now(), -// "clearingMemberCategory", -// "liabilitiesClaimsAssetsFullName", -// "companyClearingCode", -// "liabilitiesClaimsAssetsSettlementDate", -// "liabilitiesClaimsAssetsRefundDate", -// "liabilitiesClaimsAssetsTradingDate", -// "liabilitiesClaimsAssetsContract", -// "liabilitiesClaimsAssetsLiabilitiesQuantity", -// "chargeCommission", -// "liabilitiesClaimsAssetsClaimsQuantity", -// "liabilitiesClaimsAssetsRefundPaymentId", -// "liabilitiesClaimsAssetsClearingStatus", -// "liabilitiesClaimsAssetsComment", -// "claimsAmount", -// "liabilitiesAmount", -// "paymentAmount"); -// log.info("ReportPA_BT2_B:\n{}\n", xStream.toXML(reportPA_bt2_b)); - - - - /* ========= БТ 13 ========== */ -// ReportDOCIN report_bt13_11 = new ReportDOCIN(LocalDate.now(), +// "companySymbolValue", +// "liabilitiesClaimsAssetsFullNames"); +// reportBR_0420318.getRows().add(info_0420318); +// log.info("ReportBR_0420318:\n{}\n", xStream.toXML(reportBR_0420318)); +// +// +// +// /* ========= БТ 17.4 ========== */ +// ReportBR_0420314_P1 reportBR_0420314P1 = new ReportBR_0420314_P1(LocalDate.now(), LocalDate.now(), "clearingStatus", "BR"); +// ReportBR_0420314_P1.Info_0420314_P1 info_0420314P1 = new ReportBR_0420314_P1.Info_0420314_P1("companyClearingCode", +// "paymentInstructionSenderId", +// "profileDocumentId", +// "companyFullName", +// "companySymbolCode", +// "companySymbolValue", +// "clearingMemberCategoryClearingMemberCategory", +//// LocalDate.of(2022,11,10), +// "liabilitiesClaimsAssetsLiabilitiesQuantity" +// ); +// reportBR_0420314P1.getRows().add(info_0420314P1); +// log.info("ReportBR_0420314_P1:\n{}\n", xStream.toXML(reportBR_0420314P1)); +// +// +// +// ReportBR_0420314_P2 reportBR_0420314P2 = new ReportBR_0420314_P2(LocalDate.now(), LocalDate.now(), "transactionStatus", "BR"); +// ReportBR_0420314_P2.Info_0420314_P2 info_0420314P2 = new ReportBR_0420314_P2.Info_0420314_P2("companyClearingCode", +// "profileDocumentId", +// "accountBalanceOpenBalanceAmt", +// "paymentInstructionCreditLegAmount", +// "paymentInstructionDebitLegAmount", +// "accountBalanceCloseBalanceAmount" +// ); +// reportBR_0420314P2.getRows().add(info_0420314P2); +// log.info("ReportBR_0420314_P2:\n{}\n", xStream.toXML(reportBR_0420314P2)); +// +// +//// +//// /* ========= БТ 17.5 ========== */ +//// ReportBR_0420312_P1 reportBR_0420312P1 = new ReportBR_0420312_P1(LocalDate.now(), +//// LocalDate.now(), +//// "companyClearingCode", +//// "BR", +//// "liabilitesClaimsAssetsCompanyId", +//// "liabilitesClaimsAssetsFullName", +//// "companySymbolCode", +//// "companySymbolValue", +//// "companyInfoCountryCode", +//// "clearingMemberCategory"); +//// log.info("ReportBR_0420312_P1:\n{}\n", xStream.toXML(reportBR_0420312P1)); +//// +//// ReportBR_0420312_P2 reportBR_0420312P2 = new ReportBR_0420312_P2(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "liabilitiesClaimsAssetsCompanyId", +//// "liabilitiesClaimsAssetsLiabilities"); +//// log.info("ReportBR_0420312_P2:\n{}\n", xStream.toXML(reportBR_0420312P2)); +//// +//// ReportBR_0420312_P3 reportBR_0420312P3 = new ReportBR_0420312_P3(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "liabilitiesClaimsAssetsCompanyId", +//// "liabilitiesClaimsAssetsLiabilities"); +//// log.info("ReportBR_0420312_P3:\n{}\n", xStream.toXML(reportBR_0420312P3)); +//// +//// ReportBR_0420312_P4 reportBR_0420312P4 = new ReportBR_0420312_P4(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "liabilitiesAmount"); +//// log.info("ReportBR_0420312_P4:\n{}\n", xStream.toXML(reportBR_0420312P4)); +//// +//// ReportBR_0420312_P5 reportBR_0420312P5 = new ReportBR_0420312_P5(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "liabilitiesAmount"); +//// log.info("ReportBR_0420312_P5:\n{}\n", xStream.toXML(reportBR_0420312P5)); +//// +//// ReportBR_0420312_P6 reportBR_0420312P6 = new ReportBR_0420312_P6(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "liabilitiesAmount"); +//// log.info("ReportBR_0420312_P6:\n{}\n", xStream.toXML(reportBR_0420312P6)); +//// +//// ReportBR_0420312_P7 reportBR_0420312P7 = new ReportBR_0420312_P7(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "liabilitiesAmount"); +//// log.info("ReportBR_0420312_P7:\n{}\n", xStream.toXML(reportBR_0420312P7)); +//// +//// ReportBR_0420312_P8 reportBR_0420312P8 = new ReportBR_0420312_P8(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "currencyId", +//// "liabilitiesClaimsAssetsCompanyId", +//// "liabilitiesClaimsAssetsFullName", +//// "companySymbolCode", +//// "companySymbolValue", +//// "companyInfoCountryCode", +//// "clearingMemberCategory"); +//// log.info("ReportBR_0420312_P8:\n{}\n", xStream.toXML(reportBR_0420312P8)); +//// +//// ReportBR_0420312_P9 reportBR_0420312P9 = new ReportBR_0420312_P9(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "currencyId", +//// "liabilitiesClaimsAssetsCompanyId", +//// "liabilitiesClaimsMoneyCurrencyCode", +//// "liabilitiesClaimsAssetsLiabilities"); +//// log.info("ReportBR_0420312_P9:\n{}\n", xStream.toXML(reportBR_0420312P9)); +//// +//// ReportBR_0420312_P10 reportBR_0420312P10 = new ReportBR_0420312_P10(LocalDate.now(), +//// LocalDate.now(), +//// "BR", +//// "liabilitiesAmount"); +//// log.info("ReportBR_0420312_P10:\n{}\n", xStream.toXML(reportBR_0420312P10)); +//// +// +// +// /* ========= БТ 12.2 ========== */ +//// ReportPA_BT2_IV reportPA_bt2_iv = new ReportPA_BT2_IV(LocalDate.now(), +//// LocalDate.now(), +//// "clearingMemberCategory", +//// "liabilitiesClaimsAssetsFullName", +//// "companyClearingCode", +//// "liabilitiesClaimsAssetsSettlementDate", +//// "liabilitiesClaimsAssetsRefundDate", +//// "liabilitiesClaimsAssetsTradingDate", +//// "liabilitiesClaimsAssetsContract", +//// "liabilitiesClaimsAssetsLiabilitiesQuantity", +//// "chargeCommission", +//// "liabilitiesClaimsAssetsClaimsQuantity", +//// "liabilitiesClaimsAssetsRefundPaymentId", +//// "liabilitiesClaimsAssetsClearingStatus", +//// "liabilitiesClaimsAssetsComment", +//// "claimsAmount", +//// "liabilitiesAmount", +//// "paymentAmount"); +//// log.info("ReportPA_BT2_IV:\n{}\n", xStream.toXML(reportPA_bt2_iv)); +// +//// ReportPA_BT2_B reportPA_bt2_b = new ReportPA_BT2_B(LocalDate.now(), +//// LocalDate.now(), +//// "clearingMemberCategory", +//// "liabilitiesClaimsAssetsFullName", +//// "companyClearingCode", +//// "liabilitiesClaimsAssetsSettlementDate", +//// "liabilitiesClaimsAssetsRefundDate", +//// "liabilitiesClaimsAssetsTradingDate", +//// "liabilitiesClaimsAssetsContract", +//// "liabilitiesClaimsAssetsLiabilitiesQuantity", +//// "chargeCommission", +//// "liabilitiesClaimsAssetsClaimsQuantity", +//// "liabilitiesClaimsAssetsRefundPaymentId", +//// "liabilitiesClaimsAssetsClearingStatus", +//// "liabilitiesClaimsAssetsComment", +//// "claimsAmount", +//// "liabilitiesAmount", +//// "paymentAmount"); +//// log.info("ReportPA_BT2_B:\n{}\n", xStream.toXML(reportPA_bt2_b)); +// +// +// +// /* ========= БТ 13 ========== */ +//// ReportDOCIN report_bt13_11 = new ReportDOCIN(LocalDate.now(), +//// LocalTime.now(), +//// "inDocumentJournalRegistrationDate", +//// "inDocumentJournalRegistrationTime", +//// "inDocumentJournalRegistrationNumber", +//// "inDocumentJournalDocumentName" , +//// "inDocumentJournalSender", +//// "inDocumentJournalQuality", +//// "inDocumentJournalClearingCode", +//// "inDocumentJournalCourierType", +//// "inDocumentJournalEmailDate", +//// "inDocumentJournalAmount", +//// "inDocumentJournalDossierNumber", +//// "inDocumentJournalComment", +//// "inDocumentJournalReceiptDate"); +//// log.info("Report_BT13_11:\n{}\n", xStream.toXML(report_bt13_11)); +// +// Report_BT13_12 report_bt13_12 = new Report_BT13_12(LocalDate.now(), // LocalTime.now(), -// "inDocumentJournalRegistrationDate", -// "inDocumentJournalRegistrationTime", -// "inDocumentJournalRegistrationNumber", -// "inDocumentJournalDocumentName" , -// "inDocumentJournalSender", -// "inDocumentJournalQuality", -// "inDocumentJournalClearingCode", -// "inDocumentJournalCourierType", -// "inDocumentJournalEmailDate", -// "inDocumentJournalAmount", -// "inDocumentJournalDossierNumber", -// "inDocumentJournalComment", -// "inDocumentJournalReceiptDate"); -// log.info("Report_BT13_11:\n{}\n", xStream.toXML(report_bt13_11)); - - Report_BT13_12 report_bt13_12 = new Report_BT13_12(LocalDate.now(), - LocalTime.now(), - "outDocumentJournalRegistrationDate", - "outDocumentJournalRegistrationTime", - "outDocumentJournalRegistrationNumber", - "outDocumentJournalDocumentName" , - "outDocumentJournalAddress", - "outDocumentJournalQuality", - "outDocumentJournalClearingCode", - "outDocumentJournalCourierType", - "outDocumentJournalEmailDate", - "outDocumentJournalAmount", - "outDocumentJournalDossierNumber", - "outDocumentJournalPostDate"); - log.info("Report_BT13_12:\n{}\n", xStream.toXML(report_bt13_12)); - - - - /* ========= БТ 16.5 ========== */ - Report_BT16_5 report_bt16_5 = new Report_BT16_5(LocalDate.now(), - LocalTime.now(), - "clearingHouse", - "companyClearingCode", - "companyFullName", - "accountBalanceAccount", - "accountBalanceOpenAmount", - "accountBalanceDebitAmount", - "accountBalanceCreditAmount", - "accountBalanceCloseAmount"); - log.info("Report_BT16_5:\n{}\n", xStream.toXML(report_bt16_5)); - - - - } -} +// "outDocumentJournalRegistrationDate", +// "outDocumentJournalRegistrationTime", +// "outDocumentJournalRegistrationNumber", +// "outDocumentJournalDocumentName" , +// "outDocumentJournalAddress", +// "outDocumentJournalQuality", +// "outDocumentJournalClearingCode", +// "outDocumentJournalCourierType", +// "outDocumentJournalEmailDate", +// "outDocumentJournalAmount", +// "outDocumentJournalDossierNumber", +// "outDocumentJournalPostDate"); +// log.info("Report_BT13_12:\n{}\n", xStream.toXML(report_bt13_12)); +// +// +// +// /* ========= БТ 16.5 ========== */ +// Report_BT16_5 report_bt16_5 = new Report_BT16_5(LocalDate.now(), +// LocalTime.now(), +// "clearingHouse", +// "companyClearingCode", +// "companyFullName", +// "accountBalanceAccount", +// "accountBalanceOpenAmount", +// "accountBalanceDebitAmount", +// "accountBalanceCreditAmount", +// "accountBalanceCloseAmount"); +// log.info("Report_BT16_5:\n{}\n", xStream.toXML(report_bt16_5)); +// +// +// +// } +//} 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/Repbr0420314_P1_bt_17_4_collector.java index 185566225..6265a73ee 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/Repbr0420314_P1_bt_17_4_collector.java @@ -16,7 +16,6 @@ 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 ru.spcex.platform.utils.time.TimeUtil; import java.time.Instant; import java.time.LocalDate; @@ -107,7 +106,7 @@ public class Repbr0420314_P1_bt_17_4_collector extends ReportWithPeriodCollector (companySymbolOGRN == null? null : companySymbolOGRN.getCompanySymbolValue()), cleanMemberCategories, // может быть несколько, тогда через запятую перечислить toString(liability.getRefundPaymentId()), - TimeUtil.toLocalDate(liability.getTradingDate()), + toString(liability.getTradingDate()), toString(liability.getLiabilitiesQuantity()) ); reportBR_0420312P1.getRows().add(info_0420314P1); 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 bfc301ef1..9b8acb7a8 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 @@ -49,11 +49,12 @@ public class ReportBR_0420312_P10_collector extends ReportWithPeriodCollector liabilities = searchLiabilitiesClaimsAssets(startDate, endDate); Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); @@ -98,11 +98,12 @@ public class ReportBR_0420312_P8_collector extends ReportWithPeriodCollector liabilities = searchLiabilitiesClaimsAssets(startDate, endDate); Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); @@ -82,11 +82,12 @@ public class ReportBR_0420312_P9_collector extends ReportWithPeriodCollector { ReportDOCIN reportDOCIN = new ReportDOCIN(LocalDate.now(), LocalTime.now()); for (InDocumentJournal inDocumentJournal : inDocumentsJournal) { ReportDOCIN.Info_DOCIN infoDOCIN = new ReportDOCIN.Info_DOCIN( - inDocumentJournal.getRegistrationDate(), - inDocumentJournal.getRegistrationTime(), - inDocumentJournal.getRegistrationNumber(), - inDocumentJournal.getDocumentName(), - inDocumentJournal.getSender(), - inDocumentJournal.getQuantity(), - inDocumentJournal.getClearingCode(), - inDocumentJournal.getCourierType(), - inDocumentJournal.getEmailDate(), - inDocumentJournal.getAmount(), - inDocumentJournal.getDossierNumber(), - inDocumentJournal.getComment(), - inDocumentJournal.getReceiptDate()); + toString(inDocumentJournal.getId()), + toString(inDocumentJournal.getRegistrationDate()), + toString(inDocumentJournal.getRegistrationTime()), + toString(inDocumentJournal.getRegistrationNumber()), + toString(inDocumentJournal.getDocumentName()), + toString(inDocumentJournal.getSender()), + toString(inDocumentJournal.getQuantity()), + toString(inDocumentJournal.getClearingCode()), + toString(inDocumentJournal.getCourierType()), + toString(inDocumentJournal.getEmailDate()), + toString(inDocumentJournal.getAmount()), + toString(inDocumentJournal.getDossierNumber()), + toString(inDocumentJournal.getComment()), + toString(inDocumentJournal.getReceiptDate()) + ); reportDOCIN.getRows().add(infoDOCIN); } return reportDOCIN; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java index 875b53b42..13e46b4f9 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java @@ -32,22 +32,23 @@ public class ReportDOCOUT_Collector extends SimpleReportCollector LocalDate currentDate = LocalDate.now(); ImdgPredicateBuilder pb = inDocumentJournalImdg.predicateBuilder(); ImdgPredicate p = pb.equals("registrationDate", currentDate); - Collection inDocumentsJournal = inDocumentJournalImdg.getCollectionObjectsByPredicate(p); + Collection outDocumentsJournal = inDocumentJournalImdg.getCollectionObjectsByPredicate(p); ReportDOCOUT reportDOCOUT = new ReportDOCOUT(LocalDate.now(), LocalTime.now()); - for (OutDocumentJournal inDocumentJournal : inDocumentsJournal) { + for (OutDocumentJournal outDocumentJournal : outDocumentsJournal) { ReportDOCOUT.Info_DOCOUT infoDOCOUT = new ReportDOCOUT.Info_DOCOUT( - inDocumentJournal.getRegistrationDate(), - inDocumentJournal.getRegistrationTime(), - inDocumentJournal.getRegistrationNumber(), - inDocumentJournal.getDocumentName(), - inDocumentJournal.getAddressee(), - inDocumentJournal.getQuantity(), - inDocumentJournal.getClearingCode(), - inDocumentJournal.getCourierType(), - inDocumentJournal.getEmailDate(), - inDocumentJournal.getAmount(), - inDocumentJournal.getDossierNumber(), - inDocumentJournal.getPostDate()); + toString(outDocumentJournal.getId()), + toString(outDocumentJournal.getRegistrationDate()), + toString(outDocumentJournal.getRegistrationTime()), + toString(outDocumentJournal.getRegistrationNumber()), + toString(outDocumentJournal.getDocumentName()), + toString(outDocumentJournal.getAddressee()), + toString(outDocumentJournal.getQuantity()), + toString(outDocumentJournal.getClearingCode()), + toString(outDocumentJournal.getCourierType()), + toString(outDocumentJournal.getEmailDate()), + toString(outDocumentJournal.getAmount()), + toString(outDocumentJournal.getDossierNumber()), + toString(outDocumentJournal.getPostDate())); reportDOCOUT.getRows().add(infoDOCOUT); } return reportDOCOUT;