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

http://jira.mfd.msk:8088/browse/CLS-497 rename package

Browse source
This commit is contained in:
akulikov 2023-10-04 17:04:56 +03:00
parent 1da3af6b7a
commit c10e41b29e
36 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/CSVReportBuilder.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports; package ru.spcex.clearing.reports.builders;
import com.opencsv.CSVWriterBuilder; import com.opencsv.CSVWriterBuilder;
import com.opencsv.ICSVWriter; import com.opencsv.ICSVWriter;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/EmptyParams.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/EmptyParams.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports; package ru.spcex.clearing.reports.builders;
/** /**
* Класс для формирования отчета без параметров * Класс для формирования отчета без параметров

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistry3Id.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistry3Id.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports; package ru.spcex.clearing.reports.builders;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistryId.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistryId.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports; package ru.spcex.clearing.reports.builders;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportInfo.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ReportInfo.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports; package ru.spcex.clearing.reports.builders;
public record ReportInfo(String reportKey, String section) { public record ReportInfo(String reportKey, String section) {
@Override @Override

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/SessionIdParam.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/SessionIdParam.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports; package ru.spcex.clearing.reports.builders;
import java.util.List; import java.util.List;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/ExecutedDealReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/ExecutedDealReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSCommissionTradesReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashNettoReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegisterSumsReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegistersReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegistersReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoNettoReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegistersReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegistersReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepFirmDetailsReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepFirmDetailsReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSSessionListReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSSessionListReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/UnfulfilledDealReport.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bean; package ru.spcex.clearing.reports.builders.bean;
import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByName;
import com.opencsv.bean.CsvBindByPosition; import com.opencsv.bean.CsvBindByPosition;

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilderCommon.java
View file

@ -1,12 +1,12 @@
package ru.spcex.clearing.reports.reports.bp; package ru.spcex.clearing.reports.builders.bp;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.clearing.classes.statics.data.misc.STrades; import ru.clearing.classes.statics.data.misc.STrades;
import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.misc.Session;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.bean.ExecutedDealReport; import ru.spcex.clearing.reports.builders.bean.ExecutedDealReport;
import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;

4
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java
View file

@ -1,8 +1,8 @@
package ru.spcex.clearing.reports.reports.bp; package ru.spcex.clearing.reports.builders.bp;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.platform.enumeration.CoverageStatus; import ru.spcex.platform.enumeration.CoverageStatus;
import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.MoneyFlowSide;
import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.ReportKeys;

4
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java
View file

@ -1,8 +1,8 @@
package ru.spcex.clearing.reports.reports.bp; package ru.spcex.clearing.reports.builders.bp;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.platform.enumeration.CoverageStatus; import ru.spcex.platform.enumeration.CoverageStatus;
import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.MoneyFlowSide;
import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.ReportKeys;

4
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java
View file

@ -1,8 +1,8 @@
package ru.spcex.clearing.reports.reports.bp; package ru.spcex.clearing.reports.builders.bp;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.MoneyFlowSide;
import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.ReportKeys;
import ru.spcex.platform.enumeration.Side; import ru.spcex.platform.enumeration.Side;

4
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java
View file

@ -1,8 +1,8 @@
package ru.spcex.clearing.reports.reports.bp; package ru.spcex.clearing.reports.builders.bp;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.platform.enumeration.Allowed; import ru.spcex.platform.enumeration.Allowed;
import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.MoneyFlowSide;
import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.ReportKeys;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.bp; package ru.spcex.clearing.reports.builders.bp;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
@ -6,9 +6,9 @@ import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.clearing.classes.statics.data.misc.STrades; import ru.clearing.classes.statics.data.misc.STrades;
import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.misc.Session;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.clearing.reports.reports.bean.UnfulfilledDealReport; import ru.spcex.clearing.reports.builders.bean.UnfulfilledDealReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
@ -6,9 +6,9 @@ import ru.clearing.classes.statics.data.company.CompanySymbols;
import ru.clearing.classes.statics.data.execution.ExecutionDeposit; import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSCommissionTradesReport; import ru.spcex.clearing.reports.builders.bean.KSCommissionTradesReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

10
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
View file

@ -1,13 +1,13 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.misc.Session;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.PairRegistryId; import ru.spcex.clearing.reports.builders.PairRegistryId;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.clearing.reports.reports.bean.KSRepCashNettoReport; import ru.spcex.clearing.reports.builders.bean.KSRepCashNettoReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java
View file

@ -1,12 +1,12 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSRepCashRegisterSumsReport; import ru.spcex.clearing.reports.builders.bean.KSRepCashRegisterSumsReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java
View file

@ -1,13 +1,13 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.clearing.platform.dictionary.RegistryCodeDictionary; import ru.clearing.platform.dictionary.RegistryCodeDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSRepCashRegistersReport; import ru.spcex.clearing.reports.builders.bean.KSRepCashRegistersReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

10
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java
View file

@ -1,13 +1,13 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.misc.Session;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.PairRegistry3Id; import ru.spcex.clearing.reports.builders.PairRegistry3Id;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.clearing.reports.reports.bean.KSRepDepoNettoReport; import ru.spcex.clearing.reports.builders.bean.KSRepDepoNettoReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
View file

@ -1,12 +1,12 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSRepDepoRegisterQuantitiesReport; import ru.spcex.clearing.reports.builders.bean.KSRepDepoRegisterQuantitiesReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java
View file

@ -1,13 +1,13 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.clearing.platform.dictionary.RegistryCodeDictionary; import ru.clearing.platform.dictionary.RegistryCodeDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSRepDepoRegistersReport; import ru.spcex.clearing.reports.builders.bean.KSRepDepoRegistersReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepFirmDetailsReportBuilder.java
View file

@ -1,13 +1,13 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.company.CompanySymbols;
import ru.clearing.classes.statics.data.profile.ProfileDocument; import ru.clearing.classes.statics.data.profile.ProfileDocument;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSRepFirmDetailsReport; import ru.spcex.clearing.reports.builders.bean.KSRepFirmDetailsReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
@ -10,9 +10,9 @@ import ru.clearing.classes.statics.data.misc.Session;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSRepTradesReport; import ru.spcex.clearing.reports.builders.bean.KSRepTradesReport;
import ru.spcex.platform.enumeration.*; import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSSessionListReportBuilder.java
View file

@ -1,11 +1,11 @@
package ru.spcex.clearing.reports.reports.ks; package ru.spcex.clearing.reports.builders.ks;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.misc.Session;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.bean.KSSessionListReport; import ru.spcex.clearing.reports.builders.bean.KSSessionListReport;
import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.ReportKeys;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;

12
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java
View file

@ -3,11 +3,11 @@ package ru.spcex.clearing.reports.config;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.clearing.reports.reports.bp.*; import ru.spcex.clearing.reports.builders.bp.*;
import ru.spcex.clearing.reports.reports.ks.*; import ru.spcex.clearing.reports.builders.ks.*;
import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.ReportBuilderType;
import java.util.HashMap; import java.util.HashMap;
@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Configuration @Configuration
@ComponentScan(basePackages = "ru.spcex.clearing.reports.reports") @ComponentScan(basePackages = "ru.spcex.clearing.reports.builders")
public class ReportBuildersConfig { public class ReportBuildersConfig {
@Bean("reportBuildersWithoutParams") @Bean("reportBuildersWithoutParams")
public Map<ReportBuilderType, List<CSVReportBuilder<EmptyParams, ?>>> reportBuildersWithoutParams( public Map<ReportBuilderType, List<CSVReportBuilder<EmptyParams, ?>>> reportBuildersWithoutParams(

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java
View file

@ -19,12 +19,12 @@ import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandR
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.builders.ReportInfo;
import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.clearing.reports.config.SFTPReportsConfig; import ru.spcex.clearing.reports.config.SFTPReportsConfig;
import ru.spcex.clearing.reports.config.settings.ReportsServiceSettings; import ru.spcex.clearing.reports.config.settings.ReportsServiceSettings;
import ru.spcex.clearing.reports.reports.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams;
import ru.spcex.clearing.reports.reports.ReportInfo;
import ru.spcex.clearing.reports.reports.SessionIdParam;
import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.clearing.validation.common.ValidationHelper;
import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.ReportBuilderType;