From 18b8e6d81f699bb2a2484296cc923c190d71051f Mon Sep 17 00:00:00 2001 From: akulikov Date: Wed, 10 May 2023 11:45:28 +0300 Subject: [PATCH] repackage old reports --- .../reports/ReportsServiceApplication.java | 6 - .../reports/{ => bt}/bt_12_2/ReportPA_B.java | 2 +- .../reports/{ => bt}/bt_12_2/ReportPA_IV.java | 2 +- .../reports/{ => bt}/bt_13/ReportDOCIN.java | 2 +- .../reports/{ => bt}/bt_13/ReportDOCOUT.java | 2 +- .../{ => bt}/bt_16_5/ReportINACCNT.java | 2 +- .../{ => bt}/bt_17_1/ReportBR_0420315_P1.java | 2 +- .../{ => bt}/bt_17_1/ReportBR_0420315_P2.java | 2 +- .../{ => bt}/bt_17_2/ReportBR_0420317.java | 2 +- .../{ => bt}/bt_17_3/ReportBR_0420318.java | 2 +- .../{ => bt}/bt_17_4/ReportBR_0420314_P1.java | 2 +- .../{ => bt}/bt_17_4/ReportBR_0420314_P2.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P1.java | 2 +- .../bt_17_5/ReportBR_0420312_P10.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P2.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P3.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P4.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P5.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P6.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P7.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P8.java | 2 +- .../{ => bt}/bt_17_5/ReportBR_0420312_P9.java | 2 +- .../bt_12_2}/ReportPA_B_Collector.java | 4 +- .../bt_12_2}/ReportPA_IV_Collector.java | 4 +- .../{ => bt/bt_13}/ReportDOCIN_Collector.java | 4 +- .../bt_13}/ReportDOCOUT_Collector.java | 4 +- .../bt_16_5}/ReportINACCNT_Collector.java | 4 +- .../ReportBR_0420315_P1_Collector.java | 9 +- .../ReportBR_0420315_P2_collector.java | 112 ++++---- .../bt_17_2}/ReportBR_0420317_Collector.java | 4 +- .../bt_17_3}/ReportBR_0420318_Collector.java | 9 +- .../ReportBR_0420314_P1_Collector.java | 199 +++++++------- .../ReportBR_0420314_P2_Collector.java | 257 +++++++++--------- .../ReportBR_0420312_P10_Collector.java | 96 +++---- .../ReportBR_0420312_P1_Collector.java | 167 ++++++------ .../ReportBR_0420312_P2_Collector.java | 123 ++++----- .../ReportBR_0420312_P3_Collector.java | 5 +- .../ReportBR_0420312_P4_Collector.java | 96 +++---- .../ReportBR_0420312_P5_Collector.java | 96 +++---- .../ReportBR_0420312_P6_Collector.java | 96 +++---- .../ReportBR_0420312_P7_Collector.java | 4 +- .../ReportBR_0420312_P8_Collector.java | 197 +++++++------- .../ReportBR_0420312_P9_Collector.java | 161 +++++------ 43 files changed, 851 insertions(+), 848 deletions(-) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_12_2/ReportPA_B.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_12_2/ReportPA_IV.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_13/ReportDOCIN.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_13/ReportDOCOUT.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_16_5/ReportINACCNT.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_1/ReportBR_0420315_P1.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_1/ReportBR_0420315_P2.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_2/ReportBR_0420317.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_3/ReportBR_0420318.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_4/ReportBR_0420314_P1.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_4/ReportBR_0420314_P2.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P1.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P10.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P2.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P3.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P4.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P5.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P6.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P7.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P8.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/{ => bt}/bt_17_5/ReportBR_0420312_P9.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_12_2}/ReportPA_B_Collector.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_12_2}/ReportPA_IV_Collector.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_13}/ReportDOCIN_Collector.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_13}/ReportDOCOUT_Collector.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_16_5}/ReportINACCNT_Collector.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_1}/ReportBR_0420315_P1_Collector.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_1}/ReportBR_0420315_P2_collector.java (92%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_2}/ReportBR_0420317_Collector.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_3}/ReportBR_0420318_Collector.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_4}/ReportBR_0420314_P1_Collector.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_4}/ReportBR_0420314_P2_Collector.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P10_Collector.java (91%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P1_Collector.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P2_Collector.java (92%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P3_Collector.java (92%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P4_Collector.java (91%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P5_Collector.java (91%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P6_Collector.java (91%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P7_Collector.java (93%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P8_Collector.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ => bt/bt_17_5}/ReportBR_0420312_P9_Collector.java (95%) 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 627e9bbf1..06efcbe60 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 @@ -1,8 +1,5 @@ package ru.spcex.clearing.reports; -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.naming.NoNameCoder; -import com.thoughtworks.xstream.io.xml.XppDriver; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,11 +7,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; import ru.spcex.clearing.reports.config.ReportCmdParser; -import ru.spcex.clearing.reports.reports.bt_16_5.ReportINACCNT; import ru.spcex.clearing.reports.services.QCommandExecutor; import ru.spcex.clearing.reports.services.ReportsServiceCommand; -import ru.spcex.clearing.reports.services.collector.ReportINACCNT_Collector; -import ru.spcex.platform.imdg.api.ImdgProvider; @SpringBootApplication public class ReportsServiceApplication { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_B.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_B.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_B.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_B.java index 1f3c7ae98..b4e020fee 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_B.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_B.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_12_2; +package ru.spcex.clearing.reports.reports.bt.bt_12_2; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_IV.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_IV.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_IV.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_IV.java index 12d124dc7..781602111 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_12_2/ReportPA_IV.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_IV.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_12_2; +package ru.spcex.clearing.reports.reports.bt.bt_12_2; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCIN.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCIN.java index 3b8a7171b..5205c1155 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCIN.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCIN.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_13; +package ru.spcex.clearing.reports.reports.bt.bt_13; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCOUT.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCOUT.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCOUT.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCOUT.java index 05f22cc48..dae9330e3 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_13/ReportDOCOUT.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCOUT.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_13; +package ru.spcex.clearing.reports.reports.bt.bt_13; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_16_5/ReportINACCNT.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_16_5/ReportINACCNT.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_16_5/ReportINACCNT.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_16_5/ReportINACCNT.java index 3b1221020..fe67d73f8 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_16_5/ReportINACCNT.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_16_5/ReportINACCNT.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_16_5; +package ru.spcex.clearing.reports.reports.bt.bt_16_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P1.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P1.java index 67aafde5b..ec2c5bb72 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P1.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_1; +package ru.spcex.clearing.reports.reports.bt.bt_17_1; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P2.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P2.java index 7520ed7f0..33f54524d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P2.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_1; +package ru.spcex.clearing.reports.reports.bt.bt_17_1; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_2/ReportBR_0420317.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_2/ReportBR_0420317.java index 94009f5c6..fd6fe1cfb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_2/ReportBR_0420317.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_2; +package ru.spcex.clearing.reports.reports.bt.bt_17_2; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_3/ReportBR_0420318.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_3/ReportBR_0420318.java index e42c06933..63f5b88e0 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_3/ReportBR_0420318.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_3; +package ru.spcex.clearing.reports.reports.bt.bt_17_3; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P1.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P1.java index a72ecca3b..e50ceef0d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P1.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_4; +package ru.spcex.clearing.reports.reports.bt.bt_17_4; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P2.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P2.java index f4019dfdd..368cd90ed 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P2.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_4; +package ru.spcex.clearing.reports.reports.bt.bt_17_4; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P1.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P1.java index 03e5cbc05..b93fd7cce 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P1.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P10.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P10.java index 08a428309..c2be21c02 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P10.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P2.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P2.java index 22706fb9d..dea3c98f7 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P2.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P3.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P3.java index 4b78a1b87..1b856c186 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P3.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P4.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P4.java index d7aa87a9f..45386395e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P4.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P5.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P5.java index 9132d81db..f152b141f 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P5.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P6.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P6.java index 00a273649..d473dc3f6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P6.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P7.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P7.java index c35b4230c..f6cedeb16 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P7.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P8.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P8.java index eff2fb7a7..97680fce5 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P8.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P9.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P9.java index 92c5e7f68..e8358e88c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P9.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bt_17_5; +package ru.spcex.clearing.reports.reports.bt.bt_17_5; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_B_Collector.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_B_Collector.java index 22f76e2b2..5694273ad 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_B_Collector.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_12_2; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_B; +import ru.spcex.clearing.reports.reports.bt.bt_12_2.ReportPA_B; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; import ru.spcex.platform.enumeration.ClearingCategory; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_IV_Collector.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_IV_Collector.java index c7620a313..3a09f9491 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_IV_Collector.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_12_2; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.ClearingStatusDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_IV; +import ru.spcex.clearing.reports.reports.bt.bt_12_2.ReportPA_IV; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; import ru.spcex.platform.enumeration.ClearingCategory; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCIN_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCIN_Collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCIN_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCIN_Collector.java index d0f6a9723..2766dac66 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCIN_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCIN_Collector.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_13; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.journal.InDocumentJournal; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_13.ReportDOCIN; +import ru.spcex.clearing.reports.reports.bt.bt_13.ReportDOCIN; import ru.spcex.clearing.reports.services.SimpleReportCollector; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCOUT_Collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCOUT_Collector.java index 012000faf..539b4931e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCOUT_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCOUT_Collector.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_13; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.journal.OutDocumentJournal; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_13.ReportDOCOUT; +import ru.spcex.clearing.reports.reports.bt.bt_13.ReportDOCOUT; import ru.spcex.clearing.reports.services.SimpleReportCollector; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportINACCNT_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_16_5/ReportINACCNT_Collector.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportINACCNT_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_16_5/ReportINACCNT_Collector.java index 8ec532b53..8e7297bf8 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportINACCNT_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_16_5/ReportINACCNT_Collector.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_16_5; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.account.AccountBalance; import ru.clearing.classes.statics.data.company.Company; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_16_5.ReportINACCNT; +import ru.spcex.clearing.reports.reports.bt.bt_16_5.ReportINACCNT; import ru.spcex.clearing.reports.services.ReportForClearingCodeCollector; import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P1_Collector.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P1_Collector.java index 3f4f9f381..9a2cecf52 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P1_Collector.java @@ -1,16 +1,17 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_17_1; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.ClearingMemberCategory; -import ru.clearing.classes.statics.data.misc.Listing; +import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.misc.Listing; import ru.clearing.platform.dictionary.ClearingStatusDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P1; +import ru.spcex.clearing.reports.reports.bt.bt_17_1.ReportBR_0420315_P1; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; import ru.spcex.platform.enumeration.ClearingCategory; import ru.spcex.platform.enumeration.ClearingStatus; import ru.spcex.platform.enumeration.Market; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P2_collector.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P2_collector.java index 648f69cd0..eb199191b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P2_collector.java @@ -1,56 +1,56 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.Collection; -import java.util.HashSet; - -@Component -public class ReportBR_0420315_P2_collector extends ReportWithPeriodCollector { - private Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420315_P2_collector(ImdgProvider imdgProvider) { - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - } - - @Override - public ReportBR_0420315_P2 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - - long liabilitiesAmount; - BigDecimal contractorQty = BigDecimal.ZERO; - { - HashSet collectedToSumm = new HashSet<>(); - for (LiabilitiesClaimsAssets lContract : liabilities) { - if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())) { - collectedToSumm.add(lContract.getContract()); - contractorQty = contractorQty.add(lContract.getLiabilitiesQuantity()); - } - } - liabilitiesAmount = collectedToSumm.size(); - } - - ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate); - reportBR_0420315_p2.setRows(new ReportBR_0420315_P2.Info_0420315_P2(toString(contractorQty), - toString(liabilitiesAmount))); - - return reportBR_0420315_p2; - } - - @Override - public Class getReportClass() { - return ReportBR_0420315_P2.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_1; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_1.ReportBR_0420315_P2; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.HashSet; + +@Component +public class ReportBR_0420315_P2_collector extends ReportWithPeriodCollector { + private Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420315_P2_collector(ImdgProvider imdgProvider) { + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + } + + @Override + public ReportBR_0420315_P2 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + + long liabilitiesAmount; + BigDecimal contractorQty = BigDecimal.ZERO; + { + HashSet collectedToSumm = new HashSet<>(); + for (LiabilitiesClaimsAssets lContract : liabilities) { + if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())) { + collectedToSumm.add(lContract.getContract()); + contractorQty = contractorQty.add(lContract.getLiabilitiesQuantity()); + } + } + liabilitiesAmount = collectedToSumm.size(); + } + + ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate); + reportBR_0420315_p2.setRows(new ReportBR_0420315_P2.Info_0420315_P2(toString(contractorQty), + toString(liabilitiesAmount))); + + return reportBR_0420315_p2; + } + + @Override + public Class getReportClass() { + return ReportBR_0420315_P2.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_2/ReportBR_0420317_Collector.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_2/ReportBR_0420317_Collector.java index c0d7748b0..320a10668 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_2/ReportBR_0420317_Collector.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_17_2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -6,7 +6,7 @@ import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.company.relation.Relation; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_2.ReportBR_0420317; +import ru.spcex.clearing.reports.reports.bt.bt_17_2.ReportBR_0420317; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; import ru.spcex.platform.enumeration.DocumentTypes; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_3/ReportBR_0420318_Collector.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_3/ReportBR_0420318_Collector.java index fa512d506..b6046bb5b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_3/ReportBR_0420318_Collector.java @@ -1,15 +1,16 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_17_3; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.company.ClearingMemberCategory; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_3.ReportBR_0420318; +import ru.spcex.clearing.reports.reports.bt.bt_17_3.ReportBR_0420318; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; import ru.spcex.platform.enumeration.ClearingCategory; import ru.spcex.platform.enumeration.DocumentTypes; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P1_Collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P1_Collector.java index 75e0d3f0c..b7e5c0ab2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P1_Collector.java @@ -1,99 +1,100 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.company.ClearingMemberCategory; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.clearing.platform.dictionary.ClearingStatusDictionary; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P1; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.enumeration.ClearingStatus; -import ru.spcex.platform.enumeration.DocumentTypes; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.time.LocalDate; -import java.util.Collection; -import java.util.Map; - -/** - * accountTransactionLiabilities - */ -@Component -public class ReportBR_0420314_P1_Collector extends ReportWithPeriodCollector { - private Imdg companyImdg; - private Imdg companySymbolsImdg; - private Imdg clearingMemberCategoryImdg; - private Imdg liabilitiesClaimsAssetsImdg; - private Imdg clearingStatusDictionaryImdg; - - protected static final String ALLOW_CLEARING_STATUS = ClearingStatus.OK.getKey(); - - @Autowired - public ReportBR_0420314_P1_Collector(ImdgProvider imdgProvider) { - companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); - clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); - clearingStatusDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingStatusDictionary, ClearingStatusDictionary.class); - } - - protected CompanySymbols findSymbol(DocumentTypes docType, Long companyId) { - CompanySymbols companySymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( - "companySymbol", docType.getKey(), - "companyId", companyId - )); - return companySymbol; - } - - - @Override - public ReportBR_0420314_P1 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - ReportBR_0420314_P1 reportBR_0420312P1 = new ReportBR_0420314_P1(startDate, endDate, "BR", - ALLOW_CLEARING_STATUS //clearingStatus.getCode() "OK" - ); - final Long allowClearingStatusId = MapUtil.getDictionaryIdByCode(clearingStatusDictionaryImdg, ALLOW_CLEARING_STATUS); // "OK" - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate, allowClearingStatusId); - - for (LiabilitiesClaimsAssets liability: liabilities) { - final Long companyId = liability.getCompanyId(); - Company company = companyImdg.getSingleObjectByID(companyId); - if (company == null) { - log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); - continue; - } - Collection cmcLst = clearingMemberCategoryImdg.getCollectionObjectsByFieldValues(Map.of("companyId", companyId)); - String cleanMemberCategories = MapUtil.joinMultiString(cmcLst, ClearingMemberCategory::getClearingMemberCategory); - - CompanySymbols companySymbolCntr = findSymbol(DocumentTypes.cntr, company.getId()); - CompanySymbols companySymbolINN = findSymbol(DocumentTypes.inn, company.getId()); - CompanySymbols companySymbolOGRN = findSymbol(DocumentTypes.ogrn, company.getId()); - - ReportBR_0420314_P1.Info_0420314_P1 info_0420314P1 = new ReportBR_0420314_P1.Info_0420314_P1( - toString(company.getClearingCode()), - toString(companySymbolCntr == null? null : companySymbolCntr.getId()), - toString(company.getFullName()), - toString(companySymbolINN == null ? null : companySymbolINN.getCompanySymbolValue()), - toString(companySymbolOGRN == null? null : companySymbolOGRN.getCompanySymbolValue()), - toString(cleanMemberCategories), // может быть несколько, тогда через запятую перечислить - toString(liability.getRefundPaymentId()), - toString(liability.getTradingDate()), - toString(liability.getLiabilitiesQuantity()) - ); - reportBR_0420312P1.getRows().add(info_0420314P1); - } - - return reportBR_0420312P1; - } - - @Override - public Class getReportClass() { - return ReportBR_0420314_P1.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_4; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.company.CompanySymbols; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.clearing.platform.dictionary.ClearingStatusDictionary; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_4.ReportBR_0420314_P1; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; +import ru.spcex.platform.enumeration.ClearingStatus; +import ru.spcex.platform.enumeration.DocumentTypes; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.time.LocalDate; +import java.util.Collection; +import java.util.Map; + +/** + * accountTransactionLiabilities + */ +@Component +public class ReportBR_0420314_P1_Collector extends ReportWithPeriodCollector { + private Imdg companyImdg; + private Imdg companySymbolsImdg; + private Imdg clearingMemberCategoryImdg; + private Imdg liabilitiesClaimsAssetsImdg; + private Imdg clearingStatusDictionaryImdg; + + protected static final String ALLOW_CLEARING_STATUS = ClearingStatus.OK.getKey(); + + @Autowired + public ReportBR_0420314_P1_Collector(ImdgProvider imdgProvider) { + companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); + clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); + clearingStatusDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingStatusDictionary, ClearingStatusDictionary.class); + } + + protected CompanySymbols findSymbol(DocumentTypes docType, Long companyId) { + CompanySymbols companySymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( + "companySymbol", docType.getKey(), + "companyId", companyId + )); + return companySymbol; + } + + + @Override + public ReportBR_0420314_P1 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + ReportBR_0420314_P1 reportBR_0420312P1 = new ReportBR_0420314_P1(startDate, endDate, "BR", + ALLOW_CLEARING_STATUS //clearingStatus.getCode() "OK" + ); + final Long allowClearingStatusId = MapUtil.getDictionaryIdByCode(clearingStatusDictionaryImdg, ALLOW_CLEARING_STATUS); // "OK" + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate, allowClearingStatusId); + + for (LiabilitiesClaimsAssets liability: liabilities) { + final Long companyId = liability.getCompanyId(); + Company company = companyImdg.getSingleObjectByID(companyId); + if (company == null) { + log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); + continue; + } + Collection cmcLst = clearingMemberCategoryImdg.getCollectionObjectsByFieldValues(Map.of("companyId", companyId)); + String cleanMemberCategories = MapUtil.joinMultiString(cmcLst, ClearingMemberCategory::getClearingMemberCategory); + + CompanySymbols companySymbolCntr = findSymbol(DocumentTypes.cntr, company.getId()); + CompanySymbols companySymbolINN = findSymbol(DocumentTypes.inn, company.getId()); + CompanySymbols companySymbolOGRN = findSymbol(DocumentTypes.ogrn, company.getId()); + + ReportBR_0420314_P1.Info_0420314_P1 info_0420314P1 = new ReportBR_0420314_P1.Info_0420314_P1( + toString(company.getClearingCode()), + toString(companySymbolCntr == null? null : companySymbolCntr.getId()), + toString(company.getFullName()), + toString(companySymbolINN == null ? null : companySymbolINN.getCompanySymbolValue()), + toString(companySymbolOGRN == null? null : companySymbolOGRN.getCompanySymbolValue()), + toString(cleanMemberCategories), // может быть несколько, тогда через запятую перечислить + toString(liability.getRefundPaymentId()), + toString(liability.getTradingDate()), + toString(liability.getLiabilitiesQuantity()) + ); + reportBR_0420312P1.getRows().add(info_0420314P1); + } + + return reportBR_0420312P1; + } + + @Override + public Class getReportClass() { + return ReportBR_0420314_P1.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java index 367d11525..73d0ea0af 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java @@ -1,128 +1,129 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.account.AccountBalance; -import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.payment.PaymentInstruction; -import ru.clearing.classes.statics.data.profile.ProfileDocument; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P2; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.enumeration.AccountType; -import ru.spcex.platform.enumeration.DocumentTypes; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; - -import java.time.Instant; -import java.time.LocalDate; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * accountTransactionLiabilities - */ -@Component -public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector { - private Imdg companyImdg; - private Imdg paymentInstructionImdg; - private Imdg accountBalanceImdg; - private Imdg profileDocumentImdg; - - @Autowired - public ReportBR_0420314_P2_Collector(ImdgProvider imdgProvider) { - companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); - paymentInstructionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class); - accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class); - profileDocumentImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ProfileDocument, ProfileDocument.class); - } - - Collection searchPaymentInstruction(LocalDate startDate, LocalDate endDate) { - ImdgPredicateBuilder pb = paymentInstructionImdg.predicateBuilder(); - Instant dateTimeLo = toInstantStartDay(startDate); - Instant dateTimeHi = toInstantEndDay(endDate); - ImdgPredicate p = pb.and(pb.greatEqual("created", dateTimeLo), pb.lessEqual("created", dateTimeHi)); - Collection paymentInstructionsAll = paymentInstructionImdg.getCollectionObjectsByPredicate(p); - return paymentInstructionsAll; - } - - @Override - public ReportBR_0420314_P2 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - ReportBR_0420314_P2 reportBR_0420312P2 = new ReportBR_0420314_P2(startDate, endDate, - "", "BR" - ); - - Collection paymentInstructionsAll = searchPaymentInstruction(startDate, endDate); - - Map> companyIdPyPaymtInstruction = - MapUtil.indexList(paymentInstructionsAll, PaymentInstruction::getSenderId); - - for (Map.Entry> entry : companyIdPyPaymtInstruction.entrySet()) { - final Long companyId = entry.getKey(); - List paymentInstructionsByCompany = entry.getValue(); - Company company = companyImdg.getSingleObjectByID(companyId); - if (company == null) { - log.warn("Company not found, id={}", companyId); - continue; - } - ProfileDocument profileDocumentCntr = profileDocumentImdg.getSingleObjectByFieldValues(Map.of( - "companyId", companyId, - "documentType", DocumentTypes.cntr.getKey() - )); - AccountBalance accountBalance = accountBalanceImdg.getSingleObjectByFieldValues(Map.of( - "accountType", AccountType.Clrn.getKey(), - "companyId", companyId - )); - - String documentTypeStr = null; - if (profileDocumentCntr != null) { - documentTypeStr = profileDocumentCntr.getNumber(); - if (profileDocumentCntr.getValidFromDate() != null) { - if (StringUtils.isEmpty(documentTypeStr)) { - documentTypeStr = ""; - } else { - documentTypeStr += " "; - } - documentTypeStr += toString(profileDocumentCntr.getValidFromDate()); - } - } - - Long paymentInstruction_creditLeg_amount = paymentInstructionsByCompany.stream() - .map(PaymentInstruction::getCreditLegAmount) - .filter(Objects::nonNull) - .reduce(Long::sum) - .orElse(0L); - Long paymentInstructiont_debitLeg_amount = paymentInstructionsByCompany.stream() - .map(PaymentInstruction::getDebitLegAmount) - .filter(Objects::nonNull) - .reduce(Long::sum) - .orElse(0L); - - - ReportBR_0420314_P2.Info_0420314_P2 info_0420314P2 = new ReportBR_0420314_P2.Info_0420314_P2( - toString(company.getClearingCode()), - toString(documentTypeStr), - toString(accountBalance == null ? null : accountBalance.getOpenBalanceAmount()), - toString(paymentInstruction_creditLeg_amount), - toString(paymentInstructiont_debitLeg_amount), - toString(accountBalance == null ? null : accountBalance.getCloseBalanceAmount()) - ); - - reportBR_0420312P2.getRows().add(info_0420314P2); - } - - return reportBR_0420312P2; - } - - @Override - public Class getReportClass() { - return ReportBR_0420314_P2.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_4; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.account.AccountBalance; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.payment.PaymentInstruction; +import ru.clearing.classes.statics.data.profile.ProfileDocument; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_4.ReportBR_0420314_P2; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; +import ru.spcex.platform.enumeration.AccountType; +import ru.spcex.platform.enumeration.DocumentTypes; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; +import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; +import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; + +import java.time.Instant; +import java.time.LocalDate; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * accountTransactionLiabilities + */ +@Component +public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector { + private Imdg companyImdg; + private Imdg paymentInstructionImdg; + private Imdg accountBalanceImdg; + private Imdg profileDocumentImdg; + + @Autowired + public ReportBR_0420314_P2_Collector(ImdgProvider imdgProvider) { + companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + paymentInstructionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class); + accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class); + profileDocumentImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ProfileDocument, ProfileDocument.class); + } + + Collection searchPaymentInstruction(LocalDate startDate, LocalDate endDate) { + ImdgPredicateBuilder pb = paymentInstructionImdg.predicateBuilder(); + Instant dateTimeLo = toInstantStartDay(startDate); + Instant dateTimeHi = toInstantEndDay(endDate); + ImdgPredicate p = pb.and(pb.greatEqual("created", dateTimeLo), pb.lessEqual("created", dateTimeHi)); + Collection paymentInstructionsAll = paymentInstructionImdg.getCollectionObjectsByPredicate(p); + return paymentInstructionsAll; + } + + @Override + public ReportBR_0420314_P2 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + ReportBR_0420314_P2 reportBR_0420312P2 = new ReportBR_0420314_P2(startDate, endDate, + "", "BR" + ); + + Collection paymentInstructionsAll = searchPaymentInstruction(startDate, endDate); + + Map> companyIdPyPaymtInstruction = + MapUtil.indexList(paymentInstructionsAll, PaymentInstruction::getSenderId); + + for (Map.Entry> entry : companyIdPyPaymtInstruction.entrySet()) { + final Long companyId = entry.getKey(); + List paymentInstructionsByCompany = entry.getValue(); + Company company = companyImdg.getSingleObjectByID(companyId); + if (company == null) { + log.warn("Company not found, id={}", companyId); + continue; + } + ProfileDocument profileDocumentCntr = profileDocumentImdg.getSingleObjectByFieldValues(Map.of( + "companyId", companyId, + "documentType", DocumentTypes.cntr.getKey() + )); + AccountBalance accountBalance = accountBalanceImdg.getSingleObjectByFieldValues(Map.of( + "accountType", AccountType.Clrn.getKey(), + "companyId", companyId + )); + + String documentTypeStr = null; + if (profileDocumentCntr != null) { + documentTypeStr = profileDocumentCntr.getNumber(); + if (profileDocumentCntr.getValidFromDate() != null) { + if (StringUtils.isEmpty(documentTypeStr)) { + documentTypeStr = ""; + } else { + documentTypeStr += " "; + } + documentTypeStr += toString(profileDocumentCntr.getValidFromDate()); + } + } + + Long paymentInstruction_creditLeg_amount = paymentInstructionsByCompany.stream() + .map(PaymentInstruction::getCreditLegAmount) + .filter(Objects::nonNull) + .reduce(Long::sum) + .orElse(0L); + Long paymentInstructiont_debitLeg_amount = paymentInstructionsByCompany.stream() + .map(PaymentInstruction::getDebitLegAmount) + .filter(Objects::nonNull) + .reduce(Long::sum) + .orElse(0L); + + + ReportBR_0420314_P2.Info_0420314_P2 info_0420314P2 = new ReportBR_0420314_P2.Info_0420314_P2( + toString(company.getClearingCode()), + toString(documentTypeStr), + toString(accountBalance == null ? null : accountBalance.getOpenBalanceAmount()), + toString(paymentInstruction_creditLeg_amount), + toString(paymentInstructiont_debitLeg_amount), + toString(accountBalance == null ? null : accountBalance.getCloseBalanceAmount()) + ); + + reportBR_0420312P2.getRows().add(info_0420314P2); + } + + return reportBR_0420312P2; + } + + @Override + public Class getReportClass() { + return ReportBR_0420314_P2.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P10_Collector.java similarity index 91% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P10_Collector.java index 553afb7df..1f65b2cef 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P10_Collector.java @@ -1,48 +1,48 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P10; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.Collection; -import java.util.Objects; - -@Component -public class ReportBR_0420312_P10_Collector extends ReportWithPeriodCollector { - private Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420312_P10_Collector(ImdgProvider imdgProvider) { - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - } - - @Override - public ReportBR_0420312_P10 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - - BigDecimal liabilitiesQuantitySum = liabilities.stream() - .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) - .filter(Objects::nonNull) - .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); - - ReportBR_0420312_P10 reportBR_0420312P10 = new ReportBR_0420312_P10(startDate, endDate); - ReportBR_0420312_P10.Info_0420312_P10 reportInfo = new ReportBR_0420312_P10.Info_0420312_P10(toString(liabilitiesQuantitySum)); - reportBR_0420312P10.getRows().add(reportInfo); - - return reportBR_0420312P10; - } - - @Override - public Class getReportClass() { - return ReportBR_0420312_P10.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P10; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.Objects; + +@Component +public class ReportBR_0420312_P10_Collector extends ReportWithPeriodCollector { + private Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420312_P10_Collector(ImdgProvider imdgProvider) { + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + } + + @Override + public ReportBR_0420312_P10 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + + BigDecimal liabilitiesQuantitySum = liabilities.stream() + .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) + .filter(Objects::nonNull) + .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + + ReportBR_0420312_P10 reportBR_0420312P10 = new ReportBR_0420312_P10(startDate, endDate); + ReportBR_0420312_P10.Info_0420312_P10 reportInfo = new ReportBR_0420312_P10.Info_0420312_P10(toString(liabilitiesQuantitySum)); + reportBR_0420312P10.getRows().add(reportInfo); + + return reportBR_0420312P10; + } + + @Override + public Class getReportClass() { + return ReportBR_0420312_P10.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P1_Collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P1_Collector.java index 2daa9d14c..686abd725 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P1_Collector.java @@ -1,83 +1,84 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.company.ClearingMemberCategory; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P1; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.enumeration.DocumentTypes; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.time.LocalDate; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -@Component -public class ReportBR_0420312_P1_Collector extends ReportWithPeriodCollector { - private final Imdg companyImdg; - private final Imdg companySymbolsImdg; - private final Imdg clearingMemberCategoryImdg; - private final Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420312_P1_Collector(ImdgProvider imdgProvider) { - companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); - clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); - } - - protected CompanySymbols findSymbol(DocumentTypes docType, Long companyId) { - CompanySymbols companySymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( - "companySymbol", docType.getKey(), - "companyId", companyId - )); - return companySymbol; - } - - @Override - public ReportBR_0420312_P1 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - ReportBR_0420312_P1 reportBR_0420312P1 = new ReportBR_0420312_P1(startDate, endDate, "BR"); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); - - for (Map.Entry> companyEntry : indexByCompany.entrySet()) { - final Long companyId = companyEntry.getKey(); - Company company = companyImdg.getSingleObjectByID(companyId); - if (company == null) { - log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); - continue; - } - CompanySymbols companySymbolINN = findSymbol(DocumentTypes.inn, company.getId()); - CompanySymbols companySymbolOGRN = findSymbol(DocumentTypes.ogrn, company.getId()); - ClearingMemberCategory cmc = clearingMemberCategoryImdg.getSingleObjectByFieldValues(Map.of("companyId", companyId)); - String clearingMemberCategory = cmc == null ? null : cmc.getClearingMemberCategory(); - ReportBR_0420312_P1.Info_0420312_P1 info_0420312_p1 = new ReportBR_0420312_P1.Info_0420312_P1( - toString(company.getClearingCode()), - toString(companyId), - toString(company.getFullName()), - companySymbolINN == null ? null : toString(companySymbolINN.getCompanySymbolValue()), - companySymbolOGRN == null ? null : toString(companySymbolOGRN.getCompanySymbolValue()), - toString(company.getProfile().getCountryCode()), - toString(clearingMemberCategory)); - reportBR_0420312P1.getRows().add(info_0420312_p1); - } - - return reportBR_0420312P1; - } - - - @Override - public Class getReportClass() { - return ReportBR_0420312_P1.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.company.CompanySymbols; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P1; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; +import ru.spcex.platform.enumeration.DocumentTypes; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.time.LocalDate; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +@Component +public class ReportBR_0420312_P1_Collector extends ReportWithPeriodCollector { + private final Imdg companyImdg; + private final Imdg companySymbolsImdg; + private final Imdg clearingMemberCategoryImdg; + private final Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420312_P1_Collector(ImdgProvider imdgProvider) { + companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); + clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); + } + + protected CompanySymbols findSymbol(DocumentTypes docType, Long companyId) { + CompanySymbols companySymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( + "companySymbol", docType.getKey(), + "companyId", companyId + )); + return companySymbol; + } + + @Override + public ReportBR_0420312_P1 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + ReportBR_0420312_P1 reportBR_0420312P1 = new ReportBR_0420312_P1(startDate, endDate, "BR"); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); + + for (Map.Entry> companyEntry : indexByCompany.entrySet()) { + final Long companyId = companyEntry.getKey(); + Company company = companyImdg.getSingleObjectByID(companyId); + if (company == null) { + log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); + continue; + } + CompanySymbols companySymbolINN = findSymbol(DocumentTypes.inn, company.getId()); + CompanySymbols companySymbolOGRN = findSymbol(DocumentTypes.ogrn, company.getId()); + ClearingMemberCategory cmc = clearingMemberCategoryImdg.getSingleObjectByFieldValues(Map.of("companyId", companyId)); + String clearingMemberCategory = cmc == null ? null : cmc.getClearingMemberCategory(); + ReportBR_0420312_P1.Info_0420312_P1 info_0420312_p1 = new ReportBR_0420312_P1.Info_0420312_P1( + toString(company.getClearingCode()), + toString(companyId), + toString(company.getFullName()), + companySymbolINN == null ? null : toString(companySymbolINN.getCompanySymbolValue()), + companySymbolOGRN == null ? null : toString(companySymbolOGRN.getCompanySymbolValue()), + toString(company.getProfile().getCountryCode()), + toString(clearingMemberCategory)); + reportBR_0420312P1.getRows().add(info_0420312_p1); + } + + return reportBR_0420312P1; + } + + + @Override + public Class getReportClass() { + return ReportBR_0420312_P1.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P2_Collector.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P2_Collector.java index 80a98b782..a8495f52b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P2_Collector.java @@ -1,61 +1,62 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P2; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -@Component -public class ReportBR_0420312_P2_Collector extends ReportWithPeriodCollector { - private Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420312_P2_Collector(ImdgProvider imdgProvider) { - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - } - - @Override - public ReportBR_0420312_P2 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - ReportBR_0420312_P2 reportBR_0420312P1 = new ReportBR_0420312_P2(startDate, endDate, "BR"); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); - - for (Map.Entry> companyEntry : indexByCompany.entrySet()) { - final Long companyId = companyEntry.getKey(); - List companyLiabilities=companyEntry.getValue(); - - BigDecimal liabilitiesQuantitySum = companyLiabilities.stream() - .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) - .filter(Objects::nonNull) - .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); - - ReportBR_0420312_P2.Info_0420312_P2 info_0420312_p2 = new ReportBR_0420312_P2.Info_0420312_P2( - toString(companyId), - toString(liabilitiesQuantitySum) - ); - reportBR_0420312P1.getRows().add(info_0420312_p2); - } - - return reportBR_0420312P1; - } - - - @Override - public Class getReportClass() { - return ReportBR_0420312_P2.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P2; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@Component +public class ReportBR_0420312_P2_Collector extends ReportWithPeriodCollector { + private Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420312_P2_Collector(ImdgProvider imdgProvider) { + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + } + + @Override + public ReportBR_0420312_P2 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + ReportBR_0420312_P2 reportBR_0420312P1 = new ReportBR_0420312_P2(startDate, endDate, "BR"); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); + + for (Map.Entry> companyEntry : indexByCompany.entrySet()) { + final Long companyId = companyEntry.getKey(); + List companyLiabilities=companyEntry.getValue(); + + BigDecimal liabilitiesQuantitySum = companyLiabilities.stream() + .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) + .filter(Objects::nonNull) + .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + + ReportBR_0420312_P2.Info_0420312_P2 info_0420312_p2 = new ReportBR_0420312_P2.Info_0420312_P2( + toString(companyId), + toString(liabilitiesQuantitySum) + ); + reportBR_0420312P1.getRows().add(info_0420312_p2); + } + + return reportBR_0420312P1; + } + + + @Override + public Class getReportClass() { + return ReportBR_0420312_P2.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P3_Collector.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P3_Collector.java index afbd0b0a5..0cb625184 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P3_Collector.java @@ -1,11 +1,12 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P3; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P3; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P4_Collector.java similarity index 91% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P4_Collector.java index c80af2543..b3bed29c7 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P4_Collector.java @@ -1,48 +1,48 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P4; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.Collection; -import java.util.Objects; - -@Component -public class ReportBR_0420312_P4_Collector extends ReportWithPeriodCollector { - private Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420312_P4_Collector(ImdgProvider imdgProvider) { - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - } - - @Override - public ReportBR_0420312_P4 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - - BigDecimal liabilitiesQuantitySum = liabilities.stream() - .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) - .filter(Objects::nonNull) - .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); - - ReportBR_0420312_P4 reportBR_0420312P4 = new ReportBR_0420312_P4(startDate, endDate); - ReportBR_0420312_P4.Info_0420312_P4 reportInfo = new ReportBR_0420312_P4.Info_0420312_P4(toString(liabilitiesQuantitySum)); - reportBR_0420312P4.getRows().add(reportInfo); - - return reportBR_0420312P4; - } - - @Override - public Class getReportClass() { - return ReportBR_0420312_P4.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P4; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.Objects; + +@Component +public class ReportBR_0420312_P4_Collector extends ReportWithPeriodCollector { + private Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420312_P4_Collector(ImdgProvider imdgProvider) { + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + } + + @Override + public ReportBR_0420312_P4 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + + BigDecimal liabilitiesQuantitySum = liabilities.stream() + .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) + .filter(Objects::nonNull) + .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + + ReportBR_0420312_P4 reportBR_0420312P4 = new ReportBR_0420312_P4(startDate, endDate); + ReportBR_0420312_P4.Info_0420312_P4 reportInfo = new ReportBR_0420312_P4.Info_0420312_P4(toString(liabilitiesQuantitySum)); + reportBR_0420312P4.getRows().add(reportInfo); + + return reportBR_0420312P4; + } + + @Override + public Class getReportClass() { + return ReportBR_0420312_P4.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P5_Collector.java similarity index 91% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P5_Collector.java index c309da1fe..e65107aaf 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P5_Collector.java @@ -1,48 +1,48 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P5; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.Collection; -import java.util.Objects; - -@Component -public class ReportBR_0420312_P5_Collector extends ReportWithPeriodCollector { - private Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420312_P5_Collector(ImdgProvider imdgProvider) { - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - } - - @Override - public ReportBR_0420312_P5 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - - BigDecimal liabilitiesQuantitySum = liabilities.stream() - .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) - .filter(Objects::nonNull) - .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); - - ReportBR_0420312_P5 reportBR_0420312P5 = new ReportBR_0420312_P5(startDate, endDate); - ReportBR_0420312_P5.Info_0420312_P5 reportInfo = new ReportBR_0420312_P5.Info_0420312_P5(toString(liabilitiesQuantitySum)); - reportBR_0420312P5.getRows().add(reportInfo); - - return reportBR_0420312P5; - } - - @Override - public Class getReportClass() { - return ReportBR_0420312_P5.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P5; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.Objects; + +@Component +public class ReportBR_0420312_P5_Collector extends ReportWithPeriodCollector { + private Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420312_P5_Collector(ImdgProvider imdgProvider) { + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + } + + @Override + public ReportBR_0420312_P5 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + + BigDecimal liabilitiesQuantitySum = liabilities.stream() + .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) + .filter(Objects::nonNull) + .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + + ReportBR_0420312_P5 reportBR_0420312P5 = new ReportBR_0420312_P5(startDate, endDate); + ReportBR_0420312_P5.Info_0420312_P5 reportInfo = new ReportBR_0420312_P5.Info_0420312_P5(toString(liabilitiesQuantitySum)); + reportBR_0420312P5.getRows().add(reportInfo); + + return reportBR_0420312P5; + } + + @Override + public Class getReportClass() { + return ReportBR_0420312_P5.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P6_Collector.java similarity index 91% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P6_Collector.java index acd227d15..23522d0d2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P6_Collector.java @@ -1,48 +1,48 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P6; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.Collection; -import java.util.Objects; - -@Component -public class ReportBR_0420312_P6_Collector extends ReportWithPeriodCollector { - private Imdg liabilitiesClaimsAssetsImdg; - - @Autowired - public ReportBR_0420312_P6_Collector(ImdgProvider imdgProvider) { - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - } - - @Override - public ReportBR_0420312_P6 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - - BigDecimal liabilitiesQuantitySum = liabilities.stream() - .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) - .filter(Objects::nonNull) - .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); - - ReportBR_0420312_P6 reportBR_0420312P5 = new ReportBR_0420312_P6(startDate, endDate); - ReportBR_0420312_P6.Info_0420312_P6 reportInfo = new ReportBR_0420312_P6.Info_0420312_P6(toString(liabilitiesQuantitySum)); - reportBR_0420312P5.getRows().add(reportInfo); - - return reportBR_0420312P5; - } - - @Override - public Class getReportClass() { - return ReportBR_0420312_P6.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P6; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.Objects; + +@Component +public class ReportBR_0420312_P6_Collector extends ReportWithPeriodCollector { + private Imdg liabilitiesClaimsAssetsImdg; + + @Autowired + public ReportBR_0420312_P6_Collector(ImdgProvider imdgProvider) { + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + } + + @Override + public ReportBR_0420312_P6 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + + BigDecimal liabilitiesQuantitySum = liabilities.stream() + .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) + .filter(Objects::nonNull) + .reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + + ReportBR_0420312_P6 reportBR_0420312P5 = new ReportBR_0420312_P6(startDate, endDate); + ReportBR_0420312_P6.Info_0420312_P6 reportInfo = new ReportBR_0420312_P6.Info_0420312_P6(toString(liabilitiesQuantitySum)); + reportBR_0420312P5.getRows().add(reportInfo); + + return reportBR_0420312P5; + } + + @Override + public Class getReportClass() { + return ReportBR_0420312_P6.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P7_Collector.java similarity index 93% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P7_Collector.java index 9e03ee953..ce5d112d0 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P7_Collector.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.reports.services.collector; +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P7; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P7; import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P8_Collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P8_Collector.java index 76f53b9fc..d04fa1156 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P8_Collector.java @@ -1,98 +1,99 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.company.ClearingMemberCategory; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.clearing.platform.dictionary.CurrencyCodeDictionary; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P8; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.enumeration.DocumentTypes; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.time.LocalDate; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -@Component -public class ReportBR_0420312_P8_Collector extends ReportWithPeriodCollector { - private Imdg companyImdg; - private Imdg companySymbolsImdg; - private Imdg clearingMemberCategoryImdg; - private Imdg liabilitiesClaimsAssetsImdg; - private Imdg currencyCodeDictionaryImdg; - - @Autowired - public ReportBR_0420312_P8_Collector(ImdgProvider imdgProvider) { - companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); - clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); - currencyCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class); - } - - protected CompanySymbols findSymbol(DocumentTypes docType, Long companyId) { - CompanySymbols companySymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( - "companySymbol", docType.getKey(), - "companyId", companyId - )); - return companySymbol; - } - - @Override - public ReportBR_0420312_P8 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - ReportBR_0420312_P8 reportBR_0420312P8 = new ReportBR_0420312_P8(startDate, endDate); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); - - for (Map.Entry> companyEntry : indexByCompany.entrySet()) { - final Long companyId = companyEntry.getKey(); - Company company = companyImdg.getSingleObjectByID(companyId); - if (company == null) { - log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); - continue; - } - CompanySymbols companySymbolINN = findSymbol(DocumentTypes.inn, company.getId()); - CompanySymbols companySymbolOGRN = findSymbol(DocumentTypes.ogrn, company.getId()); - ClearingMemberCategory cmc = clearingMemberCategoryImdg.getSingleObjectByFieldValues(Map.of("companyId", companyId)); - String clearingMemberCategory = cmc == null ? null : cmc.getClearingMemberCategory(); - - - List companyLiabilities = companyEntry.getValue(); - Map> indexByCurrency = MapUtil.indexList(companyLiabilities, LiabilitiesClaimsAssets::getCurrency); - for (Map.Entry> currencyEntry : indexByCurrency.entrySet()) { - String currencyCode = currencyEntry.getKey(); - Long currencyId = MapUtil.getDictionaryIdByCode(currencyCodeDictionaryImdg, currencyCode); - if (currencyId == null) { - log.warn("No currency found for code \"{}\"", currencyEntry.getKey()); - } - ReportBR_0420312_P8.Info_0420312_P8 info_0420312_p8 = new ReportBR_0420312_P8.Info_0420312_P8( - toString(currencyId), - toString(companyId), - toString(company.getFullName()), - companySymbolINN == null ? null : toString(companySymbolINN.getCompanySymbolValue()), - companySymbolOGRN == null ? null : toString(companySymbolOGRN.getCompanySymbolValue()), - toString(company.getProfile().getCountryCode()), - toString(clearingMemberCategory) - ); - reportBR_0420312P8.getRows().add(info_0420312_p8); - } - } - - return reportBR_0420312P8; - } - - - @Override - public Class getReportClass() { - return ReportBR_0420312_P8.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.company.CompanySymbols; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.clearing.platform.dictionary.CurrencyCodeDictionary; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P8; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; +import ru.spcex.platform.enumeration.DocumentTypes; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.time.LocalDate; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +@Component +public class ReportBR_0420312_P8_Collector extends ReportWithPeriodCollector { + private Imdg companyImdg; + private Imdg companySymbolsImdg; + private Imdg clearingMemberCategoryImdg; + private Imdg liabilitiesClaimsAssetsImdg; + private Imdg currencyCodeDictionaryImdg; + + @Autowired + public ReportBR_0420312_P8_Collector(ImdgProvider imdgProvider) { + companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); + clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); + currencyCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class); + } + + protected CompanySymbols findSymbol(DocumentTypes docType, Long companyId) { + CompanySymbols companySymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( + "companySymbol", docType.getKey(), + "companyId", companyId + )); + return companySymbol; + } + + @Override + public ReportBR_0420312_P8 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + ReportBR_0420312_P8 reportBR_0420312P8 = new ReportBR_0420312_P8(startDate, endDate); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); + + for (Map.Entry> companyEntry : indexByCompany.entrySet()) { + final Long companyId = companyEntry.getKey(); + Company company = companyImdg.getSingleObjectByID(companyId); + if (company == null) { + log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); + continue; + } + CompanySymbols companySymbolINN = findSymbol(DocumentTypes.inn, company.getId()); + CompanySymbols companySymbolOGRN = findSymbol(DocumentTypes.ogrn, company.getId()); + ClearingMemberCategory cmc = clearingMemberCategoryImdg.getSingleObjectByFieldValues(Map.of("companyId", companyId)); + String clearingMemberCategory = cmc == null ? null : cmc.getClearingMemberCategory(); + + + List companyLiabilities = companyEntry.getValue(); + Map> indexByCurrency = MapUtil.indexList(companyLiabilities, LiabilitiesClaimsAssets::getCurrency); + for (Map.Entry> currencyEntry : indexByCurrency.entrySet()) { + String currencyCode = currencyEntry.getKey(); + Long currencyId = MapUtil.getDictionaryIdByCode(currencyCodeDictionaryImdg, currencyCode); + if (currencyId == null) { + log.warn("No currency found for code \"{}\"", currencyEntry.getKey()); + } + ReportBR_0420312_P8.Info_0420312_P8 info_0420312_p8 = new ReportBR_0420312_P8.Info_0420312_P8( + toString(currencyId), + toString(companyId), + toString(company.getFullName()), + companySymbolINN == null ? null : toString(companySymbolINN.getCompanySymbolValue()), + companySymbolOGRN == null ? null : toString(companySymbolOGRN.getCompanySymbolValue()), + toString(company.getProfile().getCountryCode()), + toString(clearingMemberCategory) + ); + reportBR_0420312P8.getRows().add(info_0420312_p8); + } + } + + return reportBR_0420312P8; + } + + + @Override + public Class getReportClass() { + return ReportBR_0420312_P8.class; + } +} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P9_Collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P9_Collector.java index 025956f07..9138693bc 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P9_Collector.java @@ -1,80 +1,81 @@ -package ru.spcex.clearing.reports.services.collector; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; -import ru.clearing.platform.dictionary.CurrencyCodeDictionary; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P9; -import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -@Component -public class ReportBR_0420312_P9_Collector extends ReportWithPeriodCollector { - private Imdg companyImdg; - private Imdg liabilitiesClaimsAssetsImdg; - private Imdg currencyCodeDictionaryImdg; - - @Autowired - public ReportBR_0420312_P9_Collector(ImdgProvider imdgProvider) { - companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); - liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); - currencyCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class); - } - - @Override - public ReportBR_0420312_P9 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - validateDateRange(startDate, endDate); - - ReportBR_0420312_P9 reportBR_0420312P9 = new ReportBR_0420312_P9(startDate, endDate); - - Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); - Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); - - for (Map.Entry> companyEntry : indexByCompany.entrySet()) { - final Long companyId = companyEntry.getKey(); - Company company = companyImdg.getSingleObjectByID(companyId); - if (company == null) { - log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); - continue; - } - List companyLiabilities = companyEntry.getValue(); - Map> indexByCurrency = MapUtil.indexList(companyLiabilities, LiabilitiesClaimsAssets::getCurrency); - for (Map.Entry> currencyEntry : indexByCurrency.entrySet()) { - String currencyCode = currencyEntry.getKey(); - Long currencyId = MapUtil.getDictionaryIdByCode(currencyCodeDictionaryImdg, currencyCode); - if (currencyId == null) { - log.warn("No currency found for code \"{}\"", currencyEntry.getKey()); - } - BigDecimal sumOfLiabilities = currencyEntry.getValue().stream() - .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) - .filter(Objects::nonNull) - .reduce(BigDecimal::add) - .orElse(BigDecimal.ZERO); - ReportBR_0420312_P9.Info_0420312_P9 info_0420312_p9 = new ReportBR_0420312_P9.Info_0420312_P9( - toString(currencyId), - toString(companyId), - toString(currencyCode), - toString(sumOfLiabilities) - ); - reportBR_0420312P9.getRows().add(info_0420312_p9); - } - } - - return reportBR_0420312P9; - } - - @Override - public Class getReportClass() { - return ReportBR_0420312_P9.class; - } -} +package ru.spcex.clearing.reports.services.collector.bt.bt_17_5; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; +import ru.clearing.platform.dictionary.CurrencyCodeDictionary; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.reports.reports.bt.bt_17_5.ReportBR_0420312_P9; +import ru.spcex.clearing.reports.services.ReportWithPeriodCollector; +import ru.spcex.clearing.reports.services.collector.MapUtil; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@Component +public class ReportBR_0420312_P9_Collector extends ReportWithPeriodCollector { + private Imdg companyImdg; + private Imdg liabilitiesClaimsAssetsImdg; + private Imdg currencyCodeDictionaryImdg; + + @Autowired + public ReportBR_0420312_P9_Collector(ImdgProvider imdgProvider) { + companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); + currencyCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class); + } + + @Override + public ReportBR_0420312_P9 collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { + validateDateRange(startDate, endDate); + + ReportBR_0420312_P9 reportBR_0420312P9 = new ReportBR_0420312_P9(startDate, endDate); + + Collection liabilities = searchLiabilitiesClaimsAssets(liabilitiesClaimsAssetsImdg, startDate, endDate); + Map> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId); + + for (Map.Entry> companyEntry : indexByCompany.entrySet()) { + final Long companyId = companyEntry.getKey(); + Company company = companyImdg.getSingleObjectByID(companyId); + if (company == null) { + log.warn("Company not found by LiabilitiesClaimsAssets.CompanyId={}", companyId); + continue; + } + List companyLiabilities = companyEntry.getValue(); + Map> indexByCurrency = MapUtil.indexList(companyLiabilities, LiabilitiesClaimsAssets::getCurrency); + for (Map.Entry> currencyEntry : indexByCurrency.entrySet()) { + String currencyCode = currencyEntry.getKey(); + Long currencyId = MapUtil.getDictionaryIdByCode(currencyCodeDictionaryImdg, currencyCode); + if (currencyId == null) { + log.warn("No currency found for code \"{}\"", currencyEntry.getKey()); + } + BigDecimal sumOfLiabilities = currencyEntry.getValue().stream() + .map(LiabilitiesClaimsAssets::getLiabilitiesQuantity) + .filter(Objects::nonNull) + .reduce(BigDecimal::add) + .orElse(BigDecimal.ZERO); + ReportBR_0420312_P9.Info_0420312_P9 info_0420312_p9 = new ReportBR_0420312_P9.Info_0420312_P9( + toString(currencyId), + toString(companyId), + toString(currencyCode), + toString(sumOfLiabilities) + ); + reportBR_0420312P9.getRows().add(info_0420312_p9); + } + } + + return reportBR_0420312P9; + } + + @Override + public Class getReportClass() { + return ReportBR_0420312_P9.class; + } +}