.

2023-01-10 14:02:38 +03:00 · 2023-01-10 14:02:38 +03:00 · f2ec40d3c4
commit f2ec40d3c4
parent 2c74e24232
6 changed files with 59 additions and 249 deletions
--- 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_17_2/ReportBR_0420317.java
@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.reports.bt_17_2;

 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithPeriod;

@ -19,7 +20,7 @@ public class ReportBR_0420317 extends ReportWithPeriod {
    @XStreamAlias("rows")
    private final List<Info_0420317> rows = new ArrayList<>();

-    public ReportBR_0420317(LocalDate startDate, LocalDate endDate, String destination) {
+    public ReportBR_0420317(LocalDate startDate, LocalDate endDate) {
        super(ReportId.BR_0420317,
                "0.0.1",
                "0420317",
@ -27,72 +28,13 @@ public class ReportBR_0420317 extends ReportWithPeriod {
                        " возобновлении допуска к клиринговому обслуживанию",
                startDate,
                endDate);
-        this.destination = destination;
+        this.destination = Destination.BR.getKey();
    }

    public List<Info_0420317> getRows() {
        return rows;
    }

-    @XStreamAlias("row")
-    public static class Info_0420317 {
-        @XStreamAsAttribute
-        @XStreamAlias("company_clearingCode")
-        protected String companyClearingCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("relation_supplierId")
-        private String relationSupplierId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("relation_serviceId")
-        private String relationServiceId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("relation_serviceStatus")
-        private String relationServiceStatus;
-
-        @XStreamAsAttribute
-        @XStreamAlias("relation_updatedAt")
-        private String relationUpdatedAt;
-
-        @XStreamAsAttribute
-        @XStreamAlias("company_fullName")
-        private String companyFullName;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_code")
-        private String companySymbolCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companyInfo_countryCode")
-        private String companyInfoCountryCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("relation_comment")
-        private String relationComment;
-
-        public Info_0420317(String companyClearingCode,
-                            String relationSupplierId,
-                            String relationServiceId,
-                            String relationServiceStatus,
-                            String relationUpdatedAt,
-                            String companyFullName,
-                            String companySymbolCode,
-                            String companyInfoCountryCode,
-                            String relationComment) {
-            this.companyClearingCode = companyClearingCode;
-            this.relationSupplierId = relationSupplierId;
-            this.relationServiceId = relationServiceId;
-            this.relationServiceStatus = relationServiceStatus;
-            this.relationUpdatedAt = relationUpdatedAt;
-            this.companyFullName = companyFullName;
-            this.companySymbolCode = companySymbolCode;
-            this.companyInfoCountryCode = companyInfoCountryCode;
-            this.relationComment = relationComment;
-        }
-    }
-
    @Override
    public String getReportName(LocalDateTime reportDateTime) {
        return "REPBR.0420317.%s-%s.%s".formatted(
@ -101,4 +43,17 @@ public class ReportBR_0420317 extends ReportWithPeriod {
                DATE_TIME_FORMATTER.format(reportDateTime)
        );
    }
+
+    @XStreamAlias("row")
+    public record Info_0420317(
+            @XStreamAsAttribute @XStreamAlias("company_clearingCode") String companyClearingCode,
+            @XStreamAsAttribute @XStreamAlias("relation_supplierId") String relationSupplierId,
+            @XStreamAsAttribute @XStreamAlias("relation_serviceId") String relationServiceId,
+            @XStreamAsAttribute @XStreamAlias("relation_serviceStatus") String relationServiceStatus,
+            @XStreamAsAttribute @XStreamAlias("relation_updatedAt") String relationUpdatedAt,
+            @XStreamAsAttribute @XStreamAlias("company_fullName") String companyFullName,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_code") String companySymbolCode,
+            @XStreamAsAttribute @XStreamAlias("companyInfo_countryCode") String companyInfoCountryCode,
+            @XStreamAsAttribute @XStreamAlias("relation_comment") String relationComment) {
+    }
 }
--- 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_17_3/ReportBR_0420318.java
@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.reports.bt_17_3;

 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithClearingStatus;
 import ru.spcex.platform.enumeration.ClearingStatus;
@ -28,97 +29,13 @@ public class ReportBR_0420318 extends ReportWithClearingStatus {
                startDate,
                endDate,
                ClearingStatus.FAIL.getKey());
-        this.destination = "BR";
+        this.destination = Destination.BR.getKey();
    }

    public List<Info_0420318> getRows() {
        return rows;
    }

-
-    @XStreamAlias("row")
-    public static class Info_0420318 {
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_fullName")
-        private String liabilitiesClaimsAssetsFullName;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbols_code")
-        private String companySymbolsCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_countryCode")
-        private String liabilitiesClaimsAssetsCountryCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_settlementDate")
-        private String liabilitiesClaimsAssetsSettlementDate;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_accountType")
-        private String liabilitiesClaimsAssetsAccountType;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_Contract")
-        private String liabilitiesClaimsAssetsContract;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsMoney_currencyCode")
-        private String liabilitiesClaimsMoneyCurrencyCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesAmount_amount")
-        private String liabilitiesAmountAmount;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsMoney_name")
-        private String liabilitiesClaimsMoneyName;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_liabilities")
-        private String liabilitiesClaimsAssetsLiabilities;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_comment")
-        private String liabilitiesClaimsAssetsComment;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_value")
-        private String companySymbolValue;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_fullNames")
-        private String liabilitiesClaimsAssetsFullNames;
-
-        public Info_0420318(String liabilitiesClaimsAssetsFullName,
-                            String companySymbolsCode,
-                            String liabilitiesClaimsAssetsCountryCode,
-                            String liabilitiesClaimsAssetsSettlementDate,
-                            String liabilitiesClaimsAssetsAccountType,
-                            String liabilitiesClaimsAssetsContract,
-                            String liabilitiesClaimsMoneyCurrencyCode,
-                            String liabilitiesAmountAmount,
-                            String liabilitiesClaimsMoneyName,
-                            String liabilitiesClaimsAssetsLiabilities,
-                            String liabilitiesClaimsAssetsComment,
-                            String companySymbolValue,
-                            String liabilitiesClaimsAssetsFullNames) {
-            this.liabilitiesClaimsAssetsFullName = liabilitiesClaimsAssetsFullName;
-            this.companySymbolsCode = companySymbolsCode;
-            this.liabilitiesClaimsAssetsCountryCode = liabilitiesClaimsAssetsCountryCode;
-            this.liabilitiesClaimsAssetsSettlementDate = liabilitiesClaimsAssetsSettlementDate;
-            this.liabilitiesClaimsAssetsAccountType = liabilitiesClaimsAssetsAccountType;
-            this.liabilitiesClaimsAssetsContract = liabilitiesClaimsAssetsContract;
-            this.liabilitiesClaimsMoneyCurrencyCode = liabilitiesClaimsMoneyCurrencyCode;
-            this.liabilitiesAmountAmount = liabilitiesAmountAmount;
-            this.liabilitiesClaimsMoneyName = liabilitiesClaimsMoneyName;
-            this.liabilitiesClaimsAssetsLiabilities = liabilitiesClaimsAssetsLiabilities;
-            this.liabilitiesClaimsAssetsComment = liabilitiesClaimsAssetsComment;
-            this.companySymbolValue = companySymbolValue;
-            this.liabilitiesClaimsAssetsFullNames = liabilitiesClaimsAssetsFullNames;
-        }
-    }
-
    @Override
    public String getReportName(LocalDateTime reportDateTime) {
        return "REPBR.0420318.%s-%s.%s".formatted(
@ -127,4 +44,21 @@ public class ReportBR_0420318 extends ReportWithClearingStatus {
                DATE_TIME_FORMATTER.format(reportDateTime)
        );
    }
+
+    @XStreamAlias("row")
+    public record Info_0420318(
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_fullName") String liabilitiesClaimsAssetsFullName,
+            @XStreamAsAttribute @XStreamAlias("companySymbols_code") String companySymbolsCode,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_countryCode") String liabilitiesClaimsAssetsCountryCode,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_settlementDate") String liabilitiesClaimsAssetsSettlementDate,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_accountType") String liabilitiesClaimsAssetsAccountType,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_Contract") String liabilitiesClaimsAssetsContract,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsMoney_currencyCode") String liabilitiesClaimsMoneyCurrencyCode,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesAmount_amount") String liabilitiesAmountAmount,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsMoney_name") String liabilitiesClaimsMoneyName,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_liabilities") String liabilitiesClaimsAssetsLiabilities,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_comment") String liabilitiesClaimsAssetsComment,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_value") String companySymbolValue,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_fullNames") String liabilitiesClaimsAssetsFullNames) {
+    }
 }
--- 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_17_4/ReportBR_0420314_P1.java
@ -3,6 +3,7 @@ package ru.spcex.clearing.reports.reports.bt_17_4;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
+import ru.spcex.clearing.reports.reports.Destination;
 import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.reports.ReportWithClearingStatus;
 import ru.spcex.clearing.reports.xml_test.FormattedLocalDateConverter;
@ -29,74 +30,13 @@ public class ReportBR_0420314_P1 extends ReportWithClearingStatus {
                startDate,
                endDate,
                clearingStatus);
-        this.destination = destination;
+        this.destination = Destination.BR.getKey();
    }

    public List<Info_0420314_P1> getRows() {
        return rows;
    }

-
-    @XStreamAlias("partOne")
-    public static class Info_0420314_P1 {
-        @XStreamAsAttribute
-        @XStreamAlias("company_clearingCode")
-        protected String companyClearingCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("profileDocument_id")
-        private String profileDocumentId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("company_fullName")
-        private String companyFullName;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_code")
-        private String companySymbolCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("companySymbol_value")
-        private String companySymbolValue;
-
-        @XStreamAsAttribute
-        @XStreamAlias("clearingMemberCategory_clearingMemberCategory")
-        private String clearingMemberCategoryClearingMemberCategory;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_contract")
-        private String liabilitiesClaimsAssets_contract;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssets_tradingDate")
-        @XStreamConverter(value = FormattedLocalDateConverter.class, strings = {"dd.MM.yyyy"})
-        private LocalDate liabilitiesClaimsAssets_tradingDate;
-
-        @XStreamAsAttribute
-        @XStreamAlias("liabilitiesClaimsAssests_liabilitiesQuantity")
-        private String liabilitiesClaimsAssests_liabilitiesQuantity;
-
-        public Info_0420314_P1(String companyClearingCode,
-                               String profileDocumentId,
-                               String companyFullName,
-                               String companySymbolCode,
-                               String companySymbolValue,
-                               String clearingMemberCategoryClearingMemberCategory,
-                               String liabilitiesClaimsAssets_contract,
-                               LocalDate liabilitiesClaimsAssets_tradingDate,
-                               String liabilitiesClaimsAssets_comment) {
-            this.companyClearingCode = companyClearingCode;
-            this.profileDocumentId = profileDocumentId;
-            this.companyFullName = companyFullName;
-            this.companySymbolCode = companySymbolCode;
-            this.companySymbolValue = companySymbolValue;
-            this.clearingMemberCategoryClearingMemberCategory = clearingMemberCategoryClearingMemberCategory;
-            this.liabilitiesClaimsAssets_contract = liabilitiesClaimsAssets_contract;
-            this.liabilitiesClaimsAssets_tradingDate = liabilitiesClaimsAssets_tradingDate;
-            this.liabilitiesClaimsAssests_liabilitiesQuantity = liabilitiesClaimsAssests_liabilitiesQuantity;
-        }
-    }
-
    @Override
    public String getReportName(LocalDateTime reportDateTime) {
        return "REPBR.0420314.P1.%s-%s.%s".formatted(
@ -105,4 +45,17 @@ public class ReportBR_0420314_P1 extends ReportWithClearingStatus {
                DATE_TIME_FORMATTER.format(reportDateTime)
        );
    }
+
+    @XStreamAlias("partOne")
+    public record Info_0420314_P1(
+            @XStreamAsAttribute @XStreamAlias("company_clearingCode") String companyClearingCode,
+            @XStreamAsAttribute @XStreamAlias("profileDocument_id") String profileDocumentId,
+            @XStreamAsAttribute @XStreamAlias("company_fullName") String companyFullName,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_code") String companySymbolCode,
+            @XStreamAsAttribute @XStreamAlias("companySymbol_value") String companySymbolValue,
+            @XStreamAsAttribute @XStreamAlias("clearingMemberCategory_clearingMemberCategory") String clearingMemberCategoryClearingMemberCategory,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_contract") String liabilitiesClaimsAssets_contract,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_tradingDate") @XStreamConverter(value = FormattedLocalDateConverter.class, strings = {"dd.MM.yyyy"}) LocalDate liabilitiesClaimsAssets_tradingDate,
+            @XStreamAsAttribute @XStreamAlias("liabilitiesClaimsAssets_liabilitiesQuantity") String liabilitiesClaimsAssetsLiabilitiesQuantity) {
+    }
 }
--- 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_17_4/ReportBR_0420314_P2.java
@ -40,45 +40,13 @@ public class ReportBR_0420314_P2 extends ReportWithPeriod {


    @XStreamAlias("partTwo")
-    public static class Info_0420314_P2 {
-        @XStreamAsAttribute
-        @XStreamAlias("company_clearingCode")
-        protected String companyClearingCode;
-
-        @XStreamAsAttribute
-        @XStreamAlias("profileDocument_id")
-        private String profileDocumentId;
-
-        @XStreamAsAttribute
-        @XStreamAlias("accountBalance_openBalanceAmount")
-        private String accountBalanceOpenBalanceAmount;
-
-        @XStreamAsAttribute
-        @XStreamAlias("paymentInstruction_creditLeg_amount")
-        private String paymentInstructionCreditLegAmount;
-
-        @XStreamAsAttribute
-        @XStreamAlias("paymentInstruction_debitLeg_amount")
-        private String paymentInstructionDebitLegAmount;
-
-        @XStreamAsAttribute
-        @XStreamAlias("accountBalance_closeBalanceAmount")
-        private String accountBalanceCloseBalanceAmount;
-
-        public Info_0420314_P2(String companyClearingCode,
-                               String profileDocumentId,
-                               String accountBalanceOpenBalanceAmount,
-                               String paymentInstructionCreditLegAmount,
-                               String paymentInstructionDebitLegAmount,
-                               String accountBalanceCloseBalanceAmount) {
-            this.companyClearingCode = companyClearingCode;
-            this.profileDocumentId = profileDocumentId;
-            this.accountBalanceOpenBalanceAmount = accountBalanceOpenBalanceAmount;
-            this.paymentInstructionCreditLegAmount = paymentInstructionCreditLegAmount;
-            this.paymentInstructionDebitLegAmount = paymentInstructionDebitLegAmount;
-            this.accountBalanceCloseBalanceAmount = accountBalanceCloseBalanceAmount;
-        }
-
+    public record Info_0420314_P2(
+            @XStreamAsAttribute @XStreamAlias("company_clearingCode") String companyClearingCode,
+            @XStreamAsAttribute @XStreamAlias("profileDocument_id") String profileDocumentId,
+            @XStreamAsAttribute @XStreamAlias("accountBalance_openBalanceAmount") String accountBalanceOpenBalanceAmount,
+            @XStreamAsAttribute @XStreamAlias("paymentInstruction_creditLeg_amount") String paymentInstructionCreditLegAmount,
+            @XStreamAsAttribute @XStreamAlias("paymentInstruction_debitLeg_amount") String paymentInstructionDebitLegAmount,
+            @XStreamAsAttribute @XStreamAlias("accountBalance_closeBalanceAmount") String accountBalanceCloseBalanceAmount) {
    }

    @Override
--- 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
@ -76,7 +76,7 @@ public class ReportsService {


        /* ========= БТ 17.2 ========== */
-        ReportBR_0420317 reportBR_0420317 = new ReportBR_0420317(LocalDate.now(), LocalDate.now(), "BR");
+        ReportBR_0420317 reportBR_0420317 = new ReportBR_0420317(LocalDate.now(), LocalDate.now());
        ReportBR_0420317.Info_0420317 info_0420317 = new ReportBR_0420317.Info_0420317("companyClearingCode",
                "relationSupplierId",
                "relationServiceId",
--- 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/ReportBR_0420317_collector.java
@ -50,7 +50,7 @@ public class ReportBR_0420317_collector extends ReportDataCollector<ReportBR_042

        Collection<Relation> relations = searchRelation(startDate, endDate, "MKR");

-        ReportBR_0420317 reportBR_0420317 = new ReportBR_0420317(startDate, endDate, "BR");
+        ReportBR_0420317 reportBR_0420317 = new ReportBR_0420317(startDate, endDate);
        for (Relation relation: relations) {
            Company company = relation.getConsumerId() == null ? null : companyImdg.getSingleObjectByID(relation.getConsumerId());
            if (company == null) {