From c6c44b4549b17d4d039fc46d5057fb7384d55eba Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 27 Dec 2022 15:25:37 +0300 Subject: [PATCH] =?UTF-8?q?reports-service=20=D0=BC=D0=B5=D0=BB=D0=BA?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/reports/ReportsServiceApplication.java | 2 +- .../reports/services/collector/Bt17_1_P1_collector.java | 2 +- .../reports/services/collector/Bt17_1_P2_collector.java | 2 +- .../reports-service/src/main/resources/application.properties | 1 + 4 files changed, 4 insertions(+), 3 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 9d5ddc570..99a580de8 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 @@ -32,7 +32,7 @@ public class ReportsServiceApplication { log.info("Report types: {}", allReports); for (ReportDataCollector collector:allReports.values()) { log.info("Make report {}", collector); - XMLReportBuilder xmlReportBuilder = new XMLReportBuilder<>(collector.getReportClass()); + XMLReportBuilder xmlReportBuilder = new XMLReportBuilder(collector.getReportClass()); LocalDate date2 = LocalDate.now(); LocalDate date1 = LocalDate.of(date2.getYear(), date2.getMonth(), 1);//date2.minusMonths(1); AbstractReport report = collector.collectReportWithPeriod(date1, date2); 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 824306394..c2a42a5bf 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 @@ -103,7 +103,7 @@ public class Bt17_1_P1_collector extends ReportDataCollector collectedToSumm = new HashSet<>(); for (LiabilitiesClaimsAssets lContract : liabilities) { - if (lContract.getPrice() != null && StringUtils.isNotEmpty(lContract.getContract()) + if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract()) && !collectedToSumm.contains(lContract.getContract())) { collectedToSumm.add(lContract.getContract()); liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue(); diff --git a/clearing-parent/reports-service/src/main/resources/application.properties b/clearing-parent/reports-service/src/main/resources/application.properties index c7765a7fe..f4aec6b47 100644 --- a/clearing-parent/reports-service/src/main/resources/application.properties +++ b/clearing-parent/reports-service/src/main/resources/application.properties @@ -19,6 +19,7 @@ reports-service.kafka-consumer.buffer-memory=33554432 #reports-service.kafka-producer.buffer-memory=33554432 reports-service.hazelcast.cluster-members=127.0.0.1:5701,10.200.200.181:5701 + #,10.200.200.181:5701 reports-service.hazelcast.login=dev reports-service.hazelcast.password=dev-pass