diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportWithPeriod.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportWithPeriod.java index 07caffd69..77a00ec6e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportWithPeriod.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportWithPeriod.java @@ -11,7 +11,7 @@ import java.time.LocalDate; /** * Шапка для отчётов, содержащих startDate и endDate */ -public class ReportWithPeriod extends AbstractReport { +public abstract class ReportWithPeriod extends AbstractReport { @XStreamAsAttribute @XStreamAlias("startDate") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java index df56feb45..2c56605e1 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java @@ -3,10 +3,15 @@ package ru.spcex.clearing.reports.reports; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + /** * Общая шапка (атрибуты) для всех отчетов */ public abstract class AbstractReport { + public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy"); + public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy'T'HH:mm:ss"); @XStreamAsAttribute @XStreamAlias("version") @@ -28,4 +33,6 @@ public abstract class AbstractReport { this.name = name; } + abstract public String getReportName(LocalDateTime reportDateTime); + } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_B.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_B.java index c527ee2b5..ac062d5fb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_B.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_B.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("netPositionBank") public class ReportPA_BT2_B extends ReportWithPeriod { @@ -93,6 +94,15 @@ public class ReportPA_BT2_B extends ReportWithPeriod { this.total = new Total(claimsAmount, liabilitiesAmount, paymentAmount); } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPPA.BT12.2.B.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } + @XStreamAlias("total") public static class Total { @XStreamAlias("claimsAmount") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_IV.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_IV.java index 04ddbdc22..e10ac91bb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_IV.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_BT2_IV.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("netPositionInitiator") public class ReportPA_BT2_IV extends ReportWithPeriod { @@ -93,6 +94,15 @@ public class ReportPA_BT2_IV extends ReportWithPeriod { this.total = new Total(claimsAmount, liabilitiesAmount, paymentAmount); } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPPA.BT12.2.IV.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } + @XStreamAlias("total") public static class Total { @XStreamAlias("claimsAmount") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_11.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_11.java index 0bb6fce3f..893c204ab 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_11.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_11.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.reports.AbstractReport; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.LocalTime; @XStreamAlias("incomingDocuments") @@ -91,4 +92,10 @@ public class Report_BT13_11 extends AbstractReport { this.inDocumentJournalReceiptDate = inDocumentJournalReceiptDate; } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "DOCIN.%s".formatted( + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_12.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_12.java index 9e7a36639..de765fe63 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_12.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/Report_BT13_12.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.reports.AbstractReport; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.LocalTime; @XStreamAlias("outgoingDocuments") @@ -119,4 +120,11 @@ public class Report_BT13_12 extends AbstractReport { this.outDocumentJournalDossierNumber = outDocumentJournalDossierNumber; this.outDocumentJournalPostDate = outDocumentJournalPostDate; } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "DOCOUT.%s".formatted( + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_16_5/Report_BT16_5.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_16_5/Report_BT16_5.java index 0b3db0ccc..3dc1d5737 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_16_5/Report_BT16_5.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_16_5/Report_BT16_5.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.reports.AbstractReport; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.LocalTime; @XStreamAlias("accountBalanceInfo") @@ -69,4 +70,11 @@ public class Report_BT16_5 extends AbstractReport { this.accountBalanceCloseAmount = accountBalanceCloseAmount; } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "INACCNT.%s.%s".formatted( + companyClearingCode, + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java index ab2700296..47600c673 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.reports.ReportWithClearingStatus; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -76,4 +77,13 @@ public class ReportBR_0420315_P1 extends ReportWithClearingStatus { } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420315.P1.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java index 450b87e0f..a7c87f98d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearedLiabilitiesTotal") public class ReportBR_0420315_P2 extends ReportWithPeriod { @@ -68,4 +69,13 @@ public class ReportBR_0420315_P2 extends ReportWithPeriod { } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420315.P2.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } + } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java index 8ad1f2bcd..2357530a0 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -89,4 +90,13 @@ public class ReportBR_0420317 extends ReportWithPeriod { this.relationComment = relationComment; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420317.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java index c48422636..73dc19c81 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.reports.ReportWithClearingStatus; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -114,4 +115,13 @@ public class ReportBR_0420318 extends ReportWithClearingStatus { this.liabilitiesClaimsAssetsFullNames = liabilitiesClaimsAssetsFullNames; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420318.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java index cc6dfed89..0940041db 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.reports.ReportWithClearingStatus; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -90,4 +91,13 @@ public class ReportBR_0420314_P1 extends ReportWithClearingStatus { this.liabilitiesClaimsAssetsLiabilitiesQuantity = liabilitiesClaimsAssetsLiabilitiesQuantity; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420314.P1.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java index 6c924222a..478698b15 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -83,4 +84,13 @@ public class ReportBR_0420314_P2 extends ReportWithPeriod { } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420314.P2.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java index a19956e75..af4884919 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage1") public class ReportBR_0420312_P1 extends ReportWithPeriod { @@ -87,4 +88,13 @@ public class ReportBR_0420312_P1 extends ReportWithPeriod { } } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р1-1.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } + } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java index e7196690b..0f79fe269 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage10") public class ReportBR_0420312_P10 extends ReportWithPeriod { @@ -37,4 +38,13 @@ public class ReportBR_0420312_P10 extends ReportWithPeriod { this.liabilitiesAmount = liabilitiesAmount; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р3-3.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java index 0cf73c838..84dbf562d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage2") public class ReportBR_0420312_P2 extends ReportWithPeriod { @@ -45,4 +46,13 @@ public class ReportBR_0420312_P2 extends ReportWithPeriod { } } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р1-2.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } + } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java index 0c92c0676..97442b1a9 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage3") public class ReportBR_0420312_P3 extends ReportWithPeriod { @@ -46,4 +47,12 @@ public class ReportBR_0420312_P3 extends ReportWithPeriod { } } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р1-3.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java index ee1d00f29..d4725b978 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage4") public class ReportBR_0420312_P4 extends ReportWithPeriod { @@ -38,4 +39,12 @@ public class ReportBR_0420312_P4 extends ReportWithPeriod { } } + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р1-4.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java index 57318d940..1af1850eb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage5") public class ReportBR_0420312_P5 extends ReportWithPeriod { @@ -37,4 +38,13 @@ public class ReportBR_0420312_P5 extends ReportWithPeriod { this.liabilitiesAmount = liabilitiesAmount; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р1-5.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java index b03bf0069..6b5126f7e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage6") public class ReportBR_0420312_P6 extends ReportWithPeriod { @@ -37,4 +38,13 @@ public class ReportBR_0420312_P6 extends ReportWithPeriod { this.liabilitiesAmount = liabilitiesAmount; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р1-6.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } 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 72a57f10b..81b539868 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 @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage7") public class ReportBR_0420312_P7 extends ReportWithPeriod { @@ -37,4 +38,13 @@ public class ReportBR_0420312_P7 extends ReportWithPeriod { this.liabilitiesAmount = liabilitiesAmount; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р1-7.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java index 8f6f431a5..563ffc599 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage8") public class ReportBR_0420312_P8 extends ReportWithPeriod { @@ -85,4 +86,13 @@ public class ReportBR_0420312_P8 extends ReportWithPeriod { this.clearingMemberCategoryClearingMemberCategory = clearingMemberCategoryClearingMemberCategory; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return " REPBR.0420312_р3-1.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java index d508df865..3438b9d05 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import ru.spcex.clearing.reports.ReportWithPeriod; import java.time.LocalDate; +import java.time.LocalDateTime; @XStreamAlias("clearingCoverage9") public class ReportBR_0420312_P9 extends ReportWithPeriod { @@ -61,4 +62,13 @@ public class ReportBR_0420312_P9 extends ReportWithPeriod { this.liabilitiesClaimsAssetsLiabilities = liabilitiesClaimsAssetsLiabilities; } } + + @Override + public String getReportName(LocalDateTime reportDateTime) { + return "REPBR.0420312_р3-2.%s-%s.%s".formatted( + DATE_FORMATTER.format(startDate), + DATE_FORMATTER.format(endDate), + DATE_TIME_FORMATTER.format(reportDateTime) + ); + } }