From d9a1668f6a8a7266865b96bf0af416dd0811f031 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 11 Jan 2023 17:06:37 +0300 Subject: [PATCH] =?UTF-8?q?reports-service=20kafka=20-=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B8?= =?UTF-8?q?=D0=B4=D0=BE=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=20?= =?UTF-8?q?=D0=BE=D1=82=D1=87=D1=91=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clearing-parent/reports-service/readme.md | 4 ++++ .../ru/spcex/clearing/reports/services/QCommandExecutor.java | 4 +++- .../clearing/reports/services/ReportsServiceCommand.java | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/clearing-parent/reports-service/readme.md b/clearing-parent/reports-service/readme.md index d539d351f..995cd56a8 100644 --- a/clearing-parent/reports-service/readme.md +++ b/clearing-parent/reports-service/readme.md @@ -30,6 +30,10 @@ report-service "endDate":null }} +Параметр reportId определяет тип отчтов: +GREP - все ежемесчные +DAILY - все ежедневные +или можно указать по названию файла (пример: "REPBR.0420312_р1-1", см. enum ReportId) Настройки --------- diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java index e407c1caa..78adaec08 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java @@ -18,6 +18,7 @@ import ru.spcex.platform.utils.log.ExceptionUtils; import java.io.IOException; import java.time.LocalDate; +import static ru.spcex.clearing.reports.services.ReportsServiceCommand.QUEUE_RUN_DAILY_REPORT_COMMAND; import static ru.spcex.clearing.reports.services.ReportsServiceCommand.QUEUE_RUN_REPORT_COMMAND; @Service @@ -64,7 +65,8 @@ public class QCommandExecutor extends QueueConsumer implements InitializingBean throw new IllegalStateException("StartDate > EndDate"); try { - if (QUEUE_RUN_REPORT_COMMAND.equals(request.getReportId())) { + if (QUEUE_RUN_REPORT_COMMAND.equals(request.getReportId()) + || QUEUE_RUN_DAILY_REPORT_COMMAND.equals(request.getReportId())) { log.info("Generate all report by command {}", request.getReportId()); reportsServiceCommand.generateReportAll(request.getReportId(), startDate, endDate); } else { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java index d04b5d789..659a9a131 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java @@ -28,6 +28,7 @@ import java.util.Map; @Service public class ReportsServiceCommand implements InitializingBean { public static final String QUEUE_RUN_REPORT_COMMAND = "GREP"; // см. Task.createReport + public static final String QUEUE_RUN_DAILY_REPORT_COMMAND = "DAILY"; private final Logger log = LoggerFactory.getLogger(getClass()); @@ -77,7 +78,7 @@ public class ReportsServiceCommand implements InitializingBean { } } for (SimpleReportCollector reportDataCollector : allSimpleReports) { - if (reportGroup == null || QUEUE_RUN_REPORT_COMMAND.equals(reportGroup)) { + if (reportGroup == null || QUEUE_RUN_DAILY_REPORT_COMMAND.equals(reportGroup)) { makeSingleReport(reportDataCollector); } }