diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java index 8f01d09f1..3ea1f442f 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java @@ -1,13 +1,10 @@ package ru.spcex.clearing.reports.services; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import ru.spcex.clearing.reports.reports.AbstractReport; import java.time.LocalDate; public abstract class ReportWithPeriodCollector extends AbstractReportCollector { - protected final Logger log = LoggerFactory.getLogger(getClass()); /** * Подготовка отчета на период startDate..endDate diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java index 721231f80..431e28627 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java @@ -266,22 +266,22 @@ public class ReportsService { /* ========= БТ 13 ========== */ - ReportDOCIN report_bt13_11 = new ReportDOCIN(LocalDate.now(), - LocalTime.now(), - "inDocumentJournalRegistrationDate", - "inDocumentJournalRegistrationTime", - "inDocumentJournalRegistrationNumber", - "inDocumentJournalDocumentName" , - "inDocumentJournalSender", - "inDocumentJournalQuality", - "inDocumentJournalClearingCode", - "inDocumentJournalCourierType", - "inDocumentJournalEmailDate", - "inDocumentJournalAmount", - "inDocumentJournalDossierNumber", - "inDocumentJournalComment", - "inDocumentJournalReceiptDate"); - log.info("Report_BT13_11:\n{}\n", xStream.toXML(report_bt13_11)); +// ReportDOCIN report_bt13_11 = new ReportDOCIN(LocalDate.now(), +// LocalTime.now(), +// "inDocumentJournalRegistrationDate", +// "inDocumentJournalRegistrationTime", +// "inDocumentJournalRegistrationNumber", +// "inDocumentJournalDocumentName" , +// "inDocumentJournalSender", +// "inDocumentJournalQuality", +// "inDocumentJournalClearingCode", +// "inDocumentJournalCourierType", +// "inDocumentJournalEmailDate", +// "inDocumentJournalAmount", +// "inDocumentJournalDossierNumber", +// "inDocumentJournalComment", +// "inDocumentJournalReceiptDate"); +// log.info("Report_BT13_11:\n{}\n", xStream.toXML(report_bt13_11)); Report_BT13_12 report_bt13_12 = new Report_BT13_12(LocalDate.now(), LocalTime.now(), diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/SimpleReportCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/SimpleReportCollector.java new file mode 100644 index 000000000..7f637d611 --- /dev/null +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/SimpleReportCollector.java @@ -0,0 +1,10 @@ +package ru.spcex.clearing.reports.services; + +import ru.spcex.clearing.reports.reports.AbstractReport; + +public abstract class SimpleReportCollector extends AbstractReportCollector { + /** + * Подготовка отчета (без входных параметров) + */ + abstract public T collectReport(); +} 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/ReportDOCIN_Collector.java new file mode 100644 index 000000000..8f62f81d4 --- /dev/null +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportDOCIN_Collector.java @@ -0,0 +1,21 @@ +package ru.spcex.clearing.reports.services.collector; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import ru.spcex.clearing.reports.reports.bt_13.ReportDOCIN; +import ru.spcex.clearing.reports.services.SimpleReportCollector; + +public class ReportDOCIN_Collector extends SimpleReportCollector { + protected final Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public ReportDOCIN collectReport() { + return null; + } + + @Override + public Class getReportClass() { + return ReportDOCIN.class; + } + +}