http://jira.mfd.msk:8088/browse/CLS-313

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFImporterConfig.java

@@ -58,8 +58,9 @@ public class DBFImporterConfig {
         Map<ETable, AbstractTable> map = new HashMap<>();
         map.put(ETable.DF_01, new SDf01Table());
         map.put(ETable.DF_04, new SDf04Table());
-        map.put(ETable.DF_09, new SDf09Table());
-        map.put(ETable.DF_16, new SDf16Table());
+        map.put(ETable.DF_06, new SDf06Table());
+        map.put(ETable.DF_52, new SDf52Table());
+        map.put(ETable.DF_55, new SDf55Table());
         map.put(ETable.DF_57, new SDf57Table());
         return map;
     }

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ETable.java

@@ -3,9 +3,12 @@ package ru.spcex.clearing.dbf.importer.logic.data.enums;
 public enum ETable {
     DF_01("DF-01"),
     DF_04("DF-04"),
-    DF_09("DF-09"),
+    DF_06("DF-06"),
+//    DF_09("DF-09"),
 //    DF_12("DF-12"),
-    DF_16("DF-16"),
+//    DF_16("DF-16"),
+    DF_52("DF-52"),
+    DF_55("DF-55"),
     DF_57("DF-57");
 
     private final String prefix;

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf06Table.java

@@ -0,0 +1,38 @@
+package ru.spcex.clearing.dbf.importer.logic.data.tables;
+
+import ru.clearing.classes.statics.data.sdf.SDf06;
+import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+
+public class SDf06Table extends AbstractTable<SDf06> {
+
+    private static final String PREFIX = ETable.DF_06.name();
+    private static final Class<SDf06> CLAZZ = SDf06.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf06;
+
+    public SDf06Table() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
+    @Override
+    public SDf06 getEntity(Object[] entity) {
+        SDf06 result = new SDf06();
+        result.setAccount((String) entity[0]);
+        result.setSum((BigDecimal) entity[1]);
+        result.setMarket((String) entity[2]);
+        result.setType((String) entity[3]);
+        result.setDeal((String) entity[4]);
+        result.setClientN((String) entity[5]);
+        result.setInn((BigDecimal) entity[6]);
+        result.setBic((BigDecimal) entity[7]);
+        result.setSpec((String) entity[8]);
+        result.setNumber((BigDecimal) entity[9]);
+        result.setFileName(filename);
+        result.setGenerationTime(Instant.now());
+        result.setGenerationId(fileId);
+        return result;
+    }
+}

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf09Table.java

@@ -4,9 +4,9 @@ import ru.clearing.classes.statics.data.sdf.SDf09;
 import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 
-import java.math.BigDecimal;
 import java.time.Instant;
 
+@Deprecated
 public class SDf09Table extends AbstractTable<SDf09> {
 
     private static final String PREFIX = ETable.DF_09.name();

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java

@@ -7,6 +7,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import java.math.BigDecimal;
 import java.time.Instant;
 
+@Deprecated
 public class SDf16Table extends AbstractTable<SDf16> {
 
     private static final String PREFIX = ETable.DF_16.name();

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf52Table.java

@@ -0,0 +1,32 @@
+package ru.spcex.clearing.dbf.importer.logic.data.tables;
+
+import ru.clearing.classes.statics.data.sdf.SDf52;
+import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+import java.time.Instant;
+
+public class SDf52Table extends AbstractTable<SDf52> {
+
+    private static final String PREFIX = ETable.DF_52.name();
+    private static final Class<SDf52> CLAZZ = SDf52.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57;
+
+    public SDf52Table() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
+    @Override
+    public SDf52 getEntity(Object[] entity) {
+        SDf52 result = new SDf52();
+        result.setAccount((String) entity[0]);
+        result.setAcc_name((String) entity[1]);
+        result.setDeal((String) entity[2]);
+        result.setDate((String) entity[3]);
+        result.setStatus((Long) entity[4]);
+        result.setFileName(filename);
+        result.setGenerationTime(Instant.now());
+        result.setGenerationId(fileId);
+        return result;
+    }
+}

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java

@@ -0,0 +1,65 @@
+package ru.spcex.clearing.dbf.importer.logic.data.tables;
+
+import ru.clearing.classes.statics.data.sdf.SDf55;
+import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+
+import java.time.Instant;
+
+public class SDf55Table extends AbstractTable<SDf55> {
+
+    private static final String PREFIX = ETable.DF_55.name();
+    private static final Class<SDf55> CLAZZ = SDf55.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57;
+
+    public SDf55Table() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
+    @Override
+    public SDf55 getEntity(Object[] entity) {
+        SDf55 result = new SDf55();
+        result.setSeg_type((String) entity[0]);
+        result.setDoc_type((String) entity[1]);
+        result.setDocnm_ref((String) entity[2]);
+        result.setDocnmprev((String) entity[4]);
+        result.setSbankcode((String) entity[5]);
+        result.setC_acc_deb((String) entity[6]);
+        result.setSbanknam1((String) entity[7]);
+        result.setSbanknam2((String) entity[8]);
+        result.setSbanknam3((String) entity[9]);
+        result.setSbanknam4((String) entity[10]);
+        result.setSbanknam5((String) entity[11]);
+        result.setRbankcode((String) entity[12]);
+        result.setC_acc_cred((String) entity[13]);
+        result.setRbanknam1((String) entity[14]);
+        result.setRbanknam2((String) entity[15]);
+        result.setRbanknam3((String) entity[16]);
+        result.setRbanknam4((String) entity[17]);
+        result.setRbanknam5((String) entity[18]);
+        result.setOp_type((String) entity[19]);
+        result.setPay_date((String) entity[20]);
+//        result.setExt_date((String) entity[21]);
+        result.setPay_val((String) entity[22]);
+        result.setSum_deb((String) entity[23]);
+        result.setSclientn1((String) entity[24]);
+        result.setSclientn2((String) entity[25]);
+        result.setSclientn3((String) entity[26]);
+        result.setSclientn4((String) entity[27]);
+        result.setInn_deb((String) entity[28]);
+        result.setKpp_deb((String) entity[29]);
+        result.setAcc_deb((String) entity[30]);
+        result.setRclientn1((String) entity[31]);
+        result.setRclientn2((String) entity[32]);
+        result.setRclientn3((String) entity[33]);
+        result.setRclientn4((String) entity[34]);
+//        result.setInn_cred((String) entity[]);
+//        result.setKpp_cred((String) entity[]);
+//        result.setAcc_kr((String) entity[]);
+//        result.setSpecif((String) entity[36]);
+        result.setFileName(filename);
+        result.setGenerationTime(Instant.now());
+        result.setGenerationId(fileId);
+        return result;
+    }
+}