treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reports-service мелкие правки

Browse source
This commit is contained in:
AKurakin 2022-12-27 15:25:37 +03:00
parent f38443ff55
commit c6c44b4549
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportsServiceApplication.java
View file

@ -32,7 +32,7 @@ public class ReportsServiceApplication {
log.info("Report types: {}", allReports); log.info("Report types: {}", allReports);
for (ReportDataCollector collector:allReports.values()) { for (ReportDataCollector collector:allReports.values()) {
log.info("Make report {}", collector); log.info("Make report {}", collector);
XMLReportBuilder<? extends AbstractReport> xmlReportBuilder = new XMLReportBuilder<>(collector.getReportClass()); XMLReportBuilder xmlReportBuilder = new XMLReportBuilder(collector.getReportClass());
LocalDate date2 = LocalDate.now(); LocalDate date2 = LocalDate.now();
LocalDate date1 = LocalDate.of(date2.getYear(), date2.getMonth(), 1);//date2.minusMonths(1); LocalDate date1 = LocalDate.of(date2.getYear(), date2.getMonth(), 1);//date2.minusMonths(1);
AbstractReport report = collector.collectReportWithPeriod(date1, date2); AbstractReport report = collector.collectReportWithPeriod(date1, date2);

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java
View file

@ -103,7 +103,7 @@ public class Bt17_1_P1_collector extends ReportDataCollector<ReportBR_0420315_P1
} }
onMarketSecurity.add(lContract.getSecurityId()); onMarketSecurity.add(lContract.getSecurityId());
} }
if (lContract.getPrice() != null && StringUtils.isNotEmpty(lContract.getContract()) if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())
&& !collectedToSumm.contains(lContract.getContract())) { && !collectedToSumm.contains(lContract.getContract())) {
collectedToSumm.add(lContract.getContract()); collectedToSumm.add(lContract.getContract());
liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue(); liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue();

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java
View file

@ -34,7 +34,7 @@ public class Bt17_1_P2_collector extends ReportDataCollector<ReportBR_0420315_P2
{ {
HashSet<String> collectedToSumm = new HashSet<>(); HashSet<String> collectedToSumm = new HashSet<>();
for (LiabilitiesClaimsAssets lContract : liabilities) { 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.contains(lContract.getContract())) {
collectedToSumm.add(lContract.getContract()); collectedToSumm.add(lContract.getContract());
liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue(); liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue();

1
clearing-parent/reports-service/src/main/resources/application.properties
View file

@ -19,6 +19,7 @@ reports-service.kafka-consumer.buffer-memory=33554432
#reports-service.kafka-producer.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 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.login=dev
reports-service.hazelcast.password=dev-pass reports-service.hazelcast.password=dev-pass