treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
akulikov 2023-01-10 16:40:41 +03:00
parent 953c448bed
commit 801b1d88f7
14 changed files with 399 additions and 378 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java
View file

@ -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

22
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/AbstractReportCollector.java
View file

@ -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<T extends AbstractReport> {
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<T extends AbstractReport> {
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<T extends AbstractReport> {
* Обеспечивает точность 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<T extends AbstractReport> {
* Обеспечивает точность 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);
}
}

616
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java
View file

@ -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));
//
//
//
// }
//}

3
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Repbr0420314_P1_bt_17_4_collector.java
View file

@ -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);

9
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_collector.java
View file

@ -49,11 +49,12 @@ public class ReportBR_0420312_P10_collector extends ReportWithPeriodCollector<Re
.filter(Objects::nonNull)
.reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
ReportBR_0420312_P10 reportBR_0420312P10 = new ReportBR_0420312_P10(startDate, endDate, "BR",
toString(liabilitiesQuantitySum)
);
// ReportBR_0420312_P10 reportBR_0420312P10 = new ReportBR_0420312_P10(startDate, endDate, "BR",
// toString(liabilitiesQuantitySum)
// );
return reportBR_0420312P10;
// return reportBR_0420312P10;
return null;
}
@Override

11
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_collector.java
View file

@ -49,11 +49,12 @@ public class ReportBR_0420312_P4_collector extends ReportWithPeriodCollector<Rep
.filter(Objects::nonNull)
.reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
ReportBR_0420312_P4 reportBR_0420312P4 = new ReportBR_0420312_P4(startDate, endDate,
"BR",
toString(liabilitiesQuantitySum));
return reportBR_0420312P4;
// ReportBR_0420312_P4 reportBR_0420312P4 = new ReportBR_0420312_P4(startDate, endDate,
// "BR",
// toString(liabilitiesQuantitySum));
//
// return reportBR_0420312P4;
return null;
}
@Override

9
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_collector.java
View file

@ -49,11 +49,12 @@ public class ReportBR_0420312_P5_collector extends ReportWithPeriodCollector<Rep
.filter(Objects::nonNull)
.reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
ReportBR_0420312_P5 reportBR_0420312P5 = new ReportBR_0420312_P5(startDate, endDate,
"BR",
toString(liabilitiesQuantitySum));
// ReportBR_0420312_P5 reportBR_0420312P5 = new ReportBR_0420312_P5(startDate, endDate,
// "BR",
// toString(liabilitiesQuantitySum));
return reportBR_0420312P5;
// return reportBR_0420312P5;
return null;
}
@Override

9
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_collector.java
View file

@ -49,11 +49,12 @@ public class ReportBR_0420312_P6_collector extends ReportWithPeriodCollector<Rep
.filter(Objects::nonNull)
.reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
ReportBR_0420312_P6 reportBR_0420312P5 = new ReportBR_0420312_P6(startDate, endDate,
"BR",
toString(liabilitiesQuantitySum));
// ReportBR_0420312_P6 reportBR_0420312P5 = new ReportBR_0420312_P6(startDate, endDate,
// "BR",
// toString(liabilitiesQuantitySum));
return reportBR_0420312P5;
// return reportBR_0420312P5;
return null;
}
@Override

9
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_collector.java
View file

@ -49,11 +49,12 @@ public class ReportBR_0420312_P7_collector extends ReportWithPeriodCollector<Rep
.filter(Objects::nonNull)
.reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
ReportBR_0420312_P7 reportBR_0420312P5 = new ReportBR_0420312_P7(startDate, endDate,
"BR",
toString(liabilitiesQuantitySum));
// ReportBR_0420312_P7 reportBR_0420312P5 = new ReportBR_0420312_P7(startDate, endDate,
// "BR",
// toString(liabilitiesQuantitySum));
return reportBR_0420312P5;
// return reportBR_0420312P5;
return null;
}
@Override

7
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_collector.java
View file

@ -63,7 +63,7 @@ public class ReportBR_0420312_P8_collector extends ReportWithPeriodCollector<Rep
public ReportBR_0420312_P8 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) {
validateDateRange(startDate, endDate);
ReportBR_0420312_P8 reportBR_0420312P8 = new ReportBR_0420312_P8(startDate, endDate, "BR");
// ReportBR_0420312_P8 reportBR_0420312P8 = new ReportBR_0420312_P8(startDate, endDate, "BR");
Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate);
Map<Long, List<LiabilitiesClaimsAssets>> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId);
@ -98,11 +98,12 @@ public class ReportBR_0420312_P8_collector extends ReportWithPeriodCollector<Rep
company.getProfile().getCountryCode(),
clearingMemberCategory
);
reportBR_0420312P8.getRows().add(info_0420312_p8);
// reportBR_0420312P8.getRows().add(info_0420312_p8);
}
}
return reportBR_0420312P8;
// return reportBR_0420312P8;
return null;
}

7
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java
View file

@ -51,7 +51,7 @@ public class ReportBR_0420312_P9_collector extends ReportWithPeriodCollector<Rep
public ReportBR_0420312_P9 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) {
validateDateRange(startDate, endDate);
ReportBR_0420312_P9 reportBR_0420312P9 = new ReportBR_0420312_P9(startDate, endDate, "BR");
// ReportBR_0420312_P9 reportBR_0420312P9 = new ReportBR_0420312_P9(startDate, endDate, "BR");
Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate);
Map<Long, List<LiabilitiesClaimsAssets>> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId);
@ -82,11 +82,12 @@ public class ReportBR_0420312_P9_collector extends ReportWithPeriodCollector<Rep
currencyCode,
toString(summOfLiabilities)
);
reportBR_0420312P9.getRows().add(info_0420312_p9);
// reportBR_0420312P9.getRows().add(info_0420312_p9);
}
}
return reportBR_0420312P9;
// return reportBR_0420312P9;
return null;
}
@Override

11
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java
View file

@ -57,12 +57,13 @@ public class ReportBR_0420315_P2_collector extends ReportWithPeriodCollector<Rep
contractorQty = collectedToSumm.size();
}
ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate,
"BR",
toString(contractorQty),
toString(liabilitiesAmount));
// ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate,
// "BR",
// toString(contractorQty),
// toString(liabilitiesAmount));
return reportBR_0420315_p2;
// return reportBR_0420315_p2;
return null;
}
@Override

28
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCIN_Collector.java
View file

@ -36,19 +36,21 @@ public class ReportDOCIN_Collector extends SimpleReportCollector<ReportDOCIN> {
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;

29
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java
View file

@ -32,22 +32,23 @@ public class ReportDOCOUT_Collector extends SimpleReportCollector<ReportDOCOUT>
LocalDate currentDate = LocalDate.now();
ImdgPredicateBuilder pb = inDocumentJournalImdg.predicateBuilder();
ImdgPredicate p = pb.equals("registrationDate", currentDate);
Collection<OutDocumentJournal> inDocumentsJournal = inDocumentJournalImdg.getCollectionObjectsByPredicate(p);
Collection<OutDocumentJournal> 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;