From 8f79cf6056718bd0a8c873ec443dffa0a3e9719f Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 26 Dec 2022 17:20:54 +0300 Subject: [PATCH] =?UTF-8?q?reports-service=20=D0=BF=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=82=D0=B8=D0=BF=20ReportDataColle?= =?UTF-8?q?ctor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/reports/services/ReportDataCollector.java | 10 ++++++---- .../services/collector/Bt17_1_P1_collector.java | 2 +- .../services/collector/Bt17_1_P2_collector.java | 2 +- .../reports/services/collector/Bt17_2_collector.java | 2 +- .../services/collector/Bt17_5_P1_collector.java | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java index 71c1b41f2..69101ef75 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java @@ -11,7 +11,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.List; -public abstract class ReportDataCollector { +public abstract class ReportDataCollector { 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"); @@ -22,7 +22,7 @@ public abstract class ReportDataCollector { * T extends ReportWithPeriod * @return */ - abstract public R collectReportWithPeriod(LocalDate startDate, LocalDate endDate); + abstract public T collectReportWithPeriod(LocalDate startDate, LocalDate endDate); // /** // * T extends ReportWithClearingStatus @@ -33,14 +33,16 @@ public abstract class ReportDataCollector { // abstract public List collectReportWithClearingStatus(LocalDate startDate, LocalDate endDate, String clearingStatus); /** - * + * todo убрать метод, он уже лишний * @param startDate * @param endDate * @param dateTimeNow LocalDateTime.now() * @return */ @Deprecated - abstract public String getFileName(LocalDate startDate, LocalDate endDate, LocalDateTime dateTimeNow); + public String getFileName(LocalDate startDate, LocalDate endDate, LocalDateTime dateTimeNow) { + throw new IllegalArgumentException("deprecated"); + } protected String toString(Long val) { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java index 33ddce3d0..073f8d7b2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java @@ -23,7 +23,7 @@ import java.util.*; import java.util.stream.Collectors; @Component -public class Bt17_1_P1_collector extends ReportDataCollector { +public class Bt17_1_P1_collector extends ReportDataCollector { protected static final List ALLOW_CLEARING_MEMBER_CATEGORY = Arrays.asList(ClearingCategory.I.getKey(), ClearingCategory.V.getKey()); protected static final String ALLOW_CLEARING_STATUS = ClearingStatus.OK.getKey(); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java index 02e5587e3..9c3db398c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; import java.util.*; @Component -public class Bt17_1_P2_collector extends ReportDataCollector { +public class Bt17_1_P2_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java index 6c7b61300..65aa7b0a8 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; import java.util.*; @Component -public class Bt17_2_collector extends ReportDataCollector { +public class Bt17_2_collector extends ReportDataCollector { private Imdg companyImdg; private Imdg relationImdg; private Imdg companySymbolsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java index fcf6c50a5..d89f4383b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java @@ -18,7 +18,7 @@ import java.util.Collection; import java.util.Map; @Component -public class Bt17_5_P1_collector extends ReportDataCollector { +public class Bt17_5_P1_collector extends ReportDataCollector { private Imdg companyImdg; private Imdg relationImdg; private Imdg companySymbolsImdg;