From 2b0167803b7b34a4613056eba15a4587ae2db768 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 26 Dec 2022 18:26:48 +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=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=B1=D0=B0=D0=B3=D0=B8,=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B8=D0=BB=D1=81=D1=8F=20=D0=BA=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=BC=D1=83=20=D1=81=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/reports/ReportsServiceApplication.java | 5 +++-- .../clearing/reports/services/builders/XMLReportBuilder.java | 2 +- .../reports/services/collector/Bt17_1_P1_collector.java | 2 +- .../src/main/resources/application.properties | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportsServiceApplication.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportsServiceApplication.java index 19185ae84..113de634c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportsServiceApplication.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportsServiceApplication.java @@ -28,15 +28,16 @@ public class ReportsServiceApplication { imdg.waitAvailable(); log.info("Run generate report."); Map allReports = context.getBeansOfType(ReportDataCollector.class); - System.out.println(allReports); + log.info("Report types: {}", allReports); for (ReportDataCollector collector:allReports.values()) { + log.info("Make report {}", collector); XMLReportBuilder xmlReportBuilder = new XMLReportBuilder(collector.getReportClass(), collector); LocalDate date2 = LocalDate.now(); LocalDate date1 = LocalDate.of(date2.getYear(), date2.getMonth(), 1);//date2.minusMonths(1); xmlReportBuilder.createReport(date1, date2); } } catch (Throwable e) { - LoggerFactory.getLogger(ReportsServiceApplication.class).error("DBF-Loader start failed: {} -> {}", e.getClass().getSimpleName(), ExceptionUtils.getStackTrace(e)); + LoggerFactory.getLogger(ReportsServiceApplication.class).error("Report-service start failed: {} -> {}", e.getClass().getSimpleName(), ExceptionUtils.getStackTrace(e)); System.exit(-1); } ReportsService reportsService = new ReportsService(); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java index a1b2e0849..ed8ac24bf 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java @@ -32,7 +32,7 @@ public class XMLReportBuilder extends FileReportBuilde R report = collector.collectReportWithPeriod(startDate, endDate); String reportName = report.getReportName(LocalDateTime.now()); - if (System.getProperty("os.name").contains("windows")) reportName = reportName.replace(":", "_"); + if (System.getProperty("os.name").toLowerCase().contains("windows")) reportName = reportName.replace(":", "_"); String reportFileName = reportName + ".xml"; File reportFile = new File(reportFileName); 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 a81b79c22..229eb2a8a 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 @@ -71,7 +71,7 @@ public class Bt17_1_P1_collector extends ReportDataCollector liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql); diff --git a/clearing-parent/reports-service/src/main/resources/application.properties b/clearing-parent/reports-service/src/main/resources/application.properties index 6c2158643..52d18bea7 100644 --- a/clearing-parent/reports-service/src/main/resources/application.properties +++ b/clearing-parent/reports-service/src/main/resources/application.properties @@ -2,7 +2,7 @@ server.port=8080 server.servlet.context-path=/reports_service spring.main.web-application-type=servlet -reports-service.hazelcast.cluster-members=127.0.0.1:5701 +reports-service.hazelcast.cluster-members=127.0.0.1:5701,10.200.200.181:5701 reports-service.hazelcast.login=dev reports-service.hazelcast.password=dev-pass reports-service.ReportModuleOut=./report_out