diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/ColumnType.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/ColumnType.java deleted file mode 100644 index 67fd51746..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/ColumnType.java +++ /dev/null @@ -1,47 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.logic.data.enums; - -import com.linuxense.javadbf.DBFDataType; - -import java.math.BigDecimal; -import java.time.LocalDate; - -/** - * Типы данных в таблицах. - * Ставит в соответствие типы PostGRE и DBF - */ -public enum ColumnType { - VARCHAR(DBFDataType.CHARACTER, String.class), - CHARACTER(DBFDataType.CHARACTER, Character.class), - NUMERIC(DBFDataType.NUMERIC, BigDecimal.class), - DATE(DBFDataType.DATE, LocalDate.class); - - private final DBFDataType dbfType; - private final Class javaType; - - ColumnType(DBFDataType dbfType, Class javaType) { - this.dbfType = dbfType; - this.javaType = javaType; - } - - public DBFDataType getDbfType() { - return dbfType; - } - - public Class getJavaType() { - return javaType; - } - - public static ColumnType getForSQLType(Class sqlType) { - for (ColumnType columnType : values()) { - if (columnType.javaType == sqlType) return columnType; - } - return null; - } - - public static ColumnType getForDBFType(DBFDataType dbfType) { - for (ColumnType columnType : values()) { - if (columnType.dbfType == dbfType) return columnType; - } - return null; - } -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java index b7ebb6e43..6a4bb6762 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java @@ -8,11 +8,7 @@ public enum Table { S_DF02("DF-02", IMDGDistributedNames.Map_SDf02, SDf02.class), S_DF08("DF-08", IMDGDistributedNames.Map_SDf08, SDf08.class), S_DF18("DF-18", IMDGDistributedNames.Map_SDf18, SDf18.class), - S_DF03("DF-03", IMDGDistributedNames.Map_SDf03, SDf03.class), - S_DF05("DF-05", IMDGDistributedNames.Map_SDf05, SDf05.class), S_DF10("DF-10", IMDGDistributedNames.Map_SDf10, SDf10.class), - S_DF11("DF-11", IMDGDistributedNames.Map_SDf11, SDf11.class), - S_DF13("DF-13", IMDGDistributedNames.Map_SDf13, SDf13.class), S_DF17("DF-17", IMDGDistributedNames.Map_SDf17, SDf17.class); /** diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java index 4c918245d..5ee1f3e07 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java @@ -35,11 +35,7 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { private final S_DF02_Converter s_df02_converter; private final S_DF08_Converter s_df08_converter; private final S_DF18_Converter s_df18_converter; - private final S_DF03_Converter s_df03_converter; - private final S_DF05_Converter s_df05_converter; private final S_DF10_Converter s_df10_converter; - private final S_DF11_Converter s_df11_converter; - private final S_DF13_Converter s_df13_converter; private final S_DF17_Converter s_df17_converter; private final Map dbfFieldsForTable = new HashMap<>(); @@ -50,22 +46,14 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { S_DF02_Converter s_df02_converter, S_DF08_Converter s_df08_converter, S_DF18_Converter s_df18_converter, - S_DF03_Converter s_df03_converter, - S_DF05_Converter s_df05_converter, S_DF10_Converter s_df10_converter, - S_DF11_Converter s_df11_converter, - S_DF13_Converter s_df13_converter, S_DF17_Converter s_df17_converter) { this.properties = properties; this.imdgProvider = imdgProvider; this.s_df02_converter = s_df02_converter; this.s_df08_converter = s_df08_converter; this.s_df18_converter = s_df18_converter; - this.s_df03_converter = s_df03_converter; - this.s_df05_converter = s_df05_converter; this.s_df10_converter = s_df10_converter; - this.s_df11_converter = s_df11_converter; - this.s_df13_converter = s_df13_converter; this.s_df17_converter = s_df17_converter; } @@ -93,11 +81,7 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { if (value instanceof SDf02 sDf02Value) values = s_df02_converter.toObjectArray(sDf02Value); else if (value instanceof SDf08 sDf08Value) values = s_df08_converter.toObjectArray(sDf08Value); else if (value instanceof SDf18 sDf18Value) values = s_df18_converter.toObjectArray(sDf18Value); - else if (value instanceof SDf03 sDf03Value) values = s_df03_converter.toObjectArray(sDf03Value); - else if (value instanceof SDf05 sDf05Value) values = s_df05_converter.toObjectArray(sDf05Value); else if (value instanceof SDf10 sDf10Value) values = s_df10_converter.toObjectArray(sDf10Value); - else if (value instanceof SDf11 sDf11Value) values = s_df11_converter.toObjectArray(sDf11Value); - else if (value instanceof SDf13 sDf13Value) values = s_df13_converter.toObjectArray(sDf13Value); else if (value instanceof SDf17 sDf17Value) values = s_df17_converter.toObjectArray(sDf17Value); else throw new Exception("Get unknown object from imdg. Class: " + value.getClass().getSimpleName()); dbfWriter.addRecord(values); @@ -136,11 +120,7 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { dbfFieldsForTable.put(Table.S_DF02, s_df02_converter.getDBFHeaders()); dbfFieldsForTable.put(Table.S_DF08, s_df08_converter.getDBFHeaders()); dbfFieldsForTable.put(Table.S_DF18, s_df18_converter.getDBFHeaders()); - dbfFieldsForTable.put(Table.S_DF03, s_df03_converter.getDBFHeaders()); - dbfFieldsForTable.put(Table.S_DF05, s_df05_converter.getDBFHeaders()); dbfFieldsForTable.put(Table.S_DF10, s_df10_converter.getDBFHeaders()); - dbfFieldsForTable.put(Table.S_DF11, s_df11_converter.getDBFHeaders()); - dbfFieldsForTable.put(Table.S_DF13, s_df13_converter.getDBFHeaders()); dbfFieldsForTable.put(Table.S_DF17, s_df17_converter.getDBFHeaders()); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java index 86b7ea82d..b4dcea1f2 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java @@ -74,12 +74,8 @@ public class PrepareDBFFile extends Stage implements InitializingBean { result.append(section); result.append('_'); result.append(time); - - if (table != Table.S_DF05) { - result.append('_'); - result.append(countSameFilesInDir(prefixOfTable, outDir) + 1); - } - + result.append('_'); + result.append(countSameFilesInDir(prefixOfTable, outDir) + 1); if (codeOfMember != null) { result.append('_'); result.append(codeOfMember); @@ -101,7 +97,6 @@ public class PrepareDBFFile extends Stage implements InitializingBean { if (prefix.equalsIgnoreCase(prefixOfTable) && timestamp.contains(timestampNow)) { String counter = splitName[3]; - //prepare for substring for counter int positionOfDot = counter.indexOf('.'); if (positionOfDot != -1) { counter = counter.substring(0, positionOfDot); diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java index d0accdf72..b5c99f71e 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java @@ -26,7 +26,6 @@ public class S_DF02_Converter extends DFConverter { values.add(typeMatch(entity.getSumunblock())); values.add(typeMatch(entity.getFile_type())); values.add(typeMatch(entity.getResult())); -// values.add(typeMatch(entity.getInSDf01Id())); return values.toArray(Object[]::new); } @@ -46,7 +45,6 @@ public class S_DF02_Converter extends DFConverter { dbfFields.add(new DBFField("SUMUNBLOCK", DBFDataType.CHARACTER, 22)); dbfFields.add(new DBFField("FILE_TYPE", DBFDataType.CHARACTER, 22)); dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 3)); -// dbfFields.add(new DBFField("INSDF01_ID", DBFDataType.NUMERIC)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF03_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF03_Converter.java deleted file mode 100644 index 4f7cb234b..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF03_Converter.java +++ /dev/null @@ -1,115 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import com.linuxense.javadbf.DBFDataType; -import com.linuxense.javadbf.DBFField; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf03; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class S_DF03_Converter extends DFConverter { - @Override - public Object[] toObjectArray(SDf03 entity) { - List values = new LinkedList<>(); - values.add(typeMatch(entity.getSeg_type())); - values.add(typeMatch(entity.getDoc_type())); - values.add(typeMatch(entity.getDocnm_ref())); - values.add(typeMatch(entity.getPriority())); - values.add(typeMatch(entity.getSbankcode())); - values.add(typeMatch(entity.getC_acc_deb())); - values.add(typeMatch(entity.getSbanknam1())); - values.add(typeMatch(entity.getSbanknam2())); - values.add(typeMatch(entity.getSbanknam3())); - values.add(typeMatch(entity.getSbanknam4())); - values.add(typeMatch(entity.getSbanknam5())); - values.add(typeMatch(entity.getRbankcode())); - values.add(typeMatch(entity.getC_acc_cred())); - values.add(typeMatch(entity.getRbanknam1())); - values.add(typeMatch(entity.getRbanknam2())); - values.add(typeMatch(entity.getRbanknam3())); - values.add(typeMatch(entity.getRbanknam4())); - values.add(typeMatch(entity.getRbanknam5())); - values.add(typeMatch(entity.getPay_date())); - values.add(typeMatch(entity.getExt_date())); - values.add(typeMatch(entity.getPay_val())); - values.add(typeMatch(entity.getSum_deb())); - values.add(typeMatch(entity.getSclientn1())); - values.add(typeMatch(entity.getSclientn2())); - values.add(typeMatch(entity.getSclientn3())); - values.add(typeMatch(entity.getSclientn4())); - values.add(typeMatch(entity.getSc_code())); - values.add(typeMatch(entity.getAcc_deb())); - values.add(typeMatch(entity.getRclientn1())); - values.add(typeMatch(entity.getRclientn2())); - values.add(typeMatch(entity.getRclientn3())); - values.add(typeMatch(entity.getRclientn4())); - values.add(typeMatch(entity.getAcc_kr_1())); - values.add(typeMatch(entity.getAcc_kr_2())); - values.add(typeMatch(entity.getSp_code())); - values.add(typeMatch(entity.getSpecif_1())); - values.add(typeMatch(entity.getSpecif_2())); - values.add(typeMatch(entity.getSpecif_3())); - values.add(typeMatch(entity.getSpecif_4())); - values.add(typeMatch(entity.getSpecif_5())); - values.add(typeMatch(entity.getSpecif_6())); - values.add(typeMatch(entity.getSend_type())); - values.add(typeMatch(entity.getServdate())); - values.add(typeMatch(entity.getDoc_result())); - values.add(typeMatch(entity.getImp_result())); - return values.toArray(Object[]::new); - } - - @Override - public DBFField[] getDBFHeaders() { - List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("SEG_TYPE", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("DOC_TYPE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("DOCNM_REF", DBFDataType.CHARACTER, 16)); - dbfFields.add(new DBFField("PRIORITY", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("SBANKCODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("C_ACC_DEB", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKCODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("C_ACC_CRED", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("PAY_DATE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("EXT_DATE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("SUM_DEB", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("SCLIENTN1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SCLIENTN2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SCLIENTN3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SCLIENTN4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SC_CODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("ACC_DEB", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("ACC_KR_1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("ACC_KR_2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SP_CODE", DBFDataType.CHARACTER, 2)); - dbfFields.add(new DBFField("SPECIF_1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_6", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); - dbfFields.add(new DBFField("SERVDATE", DBFDataType.CHARACTER, 8)); - dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); - dbfFields.add(new DBFField("IMP_RESULT", DBFDataType.CHARACTER, 3)); - return dbfFields.toArray(DBFField[]::new); - } - -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF05_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF05_Converter.java deleted file mode 100644 index f54b7c48f..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF05_Converter.java +++ /dev/null @@ -1,33 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import com.linuxense.javadbf.DBFDataType; -import com.linuxense.javadbf.DBFField; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf05; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class S_DF05_Converter extends DFConverter { - @Override - public Object[] toObjectArray(SDf05 entity) { - List values = new LinkedList<>(); - values.add(typeMatch(entity.getTp())); - values.add(typeMatch(entity.getDt())); - values.add(typeMatch(entity.getTm())); - values.add(typeMatch(entity.getPr())); - return values.toArray(Object[]::new); - } - - @Override - public DBFField[] getDBFHeaders() { - List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("TP", DBFDataType.NUMERIC, 32, 18)); - dbfFields.add(new DBFField("DT", DBFDataType.DATE)); - dbfFields.add(new DBFField("TM", DBFDataType.DATE)); - dbfFields.add(new DBFField("PR", DBFDataType.CHARACTER, 1)); - return dbfFields.toArray(DBFField[]::new); - } - -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java index 05cfaccd0..3a9f71749 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java @@ -20,7 +20,6 @@ public class S_DF10_Converter extends DFConverter { values.add(typeMatch(entity.getNumber())); values.add(typeMatch(entity.getINN())); values.add(typeMatch(entity.getResult())); -// values.add(typeMatch(entity.getIn_s_df09_id())); return values.toArray(Object[]::new); } @@ -34,7 +33,6 @@ public class S_DF10_Converter extends DFConverter { dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 32, 18)); dbfFields.add(new DBFField("_I_N_N", DBFDataType.NUMERIC, 32, 18)); dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 3)); -// dbfFields.add(new DBFField("INSDF09_ID", DBFDataType.NUMERIC)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF11_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF11_Converter.java deleted file mode 100644 index e54e55a00..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF11_Converter.java +++ /dev/null @@ -1,115 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import com.linuxense.javadbf.DBFDataType; -import com.linuxense.javadbf.DBFField; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf11; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class S_DF11_Converter extends DFConverter { - @Override - public Object[] toObjectArray(SDf11 entity) { - List values = new LinkedList<>(); - values.add(typeMatch(entity.getSeg_type())); - values.add(typeMatch(entity.getDoc_type())); - values.add(typeMatch(entity.getDocnm_ref())); - values.add(typeMatch(entity.getDocnmprev())); - values.add(typeMatch(entity.getPriority())); - values.add(typeMatch(entity.getSbankcode())); - values.add(typeMatch(entity.getC_acc_deb())); - values.add(typeMatch(entity.getSbanknam1())); - values.add(typeMatch(entity.getSbanknam2())); - values.add(typeMatch(entity.getSbanknam3())); - values.add(typeMatch(entity.getSbanknam4())); - values.add(typeMatch(entity.getSbanknam5())); - values.add(typeMatch(entity.getRbankcode())); - values.add(typeMatch(entity.getC_acc_cred())); - values.add(typeMatch(entity.getRbanknam1())); - values.add(typeMatch(entity.getRbanknam2())); - values.add(typeMatch(entity.getRbanknam3())); - values.add(typeMatch(entity.getRbanknam4())); - values.add(typeMatch(entity.getRbanknam5())); - values.add(typeMatch(entity.getPay_date())); - values.add(typeMatch(entity.getExt_date())); - values.add(typeMatch(entity.getPay_val())); - values.add(typeMatch(entity.getSum_deb())); - values.add(typeMatch(entity.getSclientn1())); - values.add(typeMatch(entity.getSclientn2())); - values.add(typeMatch(entity.getSclientn3())); - values.add(typeMatch(entity.getSclientn4())); - values.add(typeMatch(entity.getSc_code())); - values.add(typeMatch(entity.getAcc_deb())); - values.add(typeMatch(entity.getRclientn1())); - values.add(typeMatch(entity.getRclientn2())); - values.add(typeMatch(entity.getRclientn3())); - values.add(typeMatch(entity.getRclientn4())); - values.add(typeMatch(entity.getAcc_kr_1())); - values.add(typeMatch(entity.getAcc_kr_2())); - values.add(typeMatch(entity.getSp_code())); - values.add(typeMatch(entity.getSpecif_1())); - values.add(typeMatch(entity.getSpecif_2())); - values.add(typeMatch(entity.getSpecif_3())); - values.add(typeMatch(entity.getSpecif_4())); - values.add(typeMatch(entity.getSpecif_5())); - values.add(typeMatch(entity.getSpecif_6())); - values.add(typeMatch(entity.getSend_type())); - values.add(typeMatch(entity.getServdate())); - values.add(typeMatch(entity.getDoc_result())); - return values.toArray(Object[]::new); - } - - @Override - public DBFField[] getDBFHeaders() { - List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("SEG_TYPE", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("DOC_TYPE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("DOCNM_REF", DBFDataType.CHARACTER, 16)); - dbfFields.add(new DBFField("DOCNMPREV", DBFDataType.CHARACTER, 16)); - dbfFields.add(new DBFField("PRIORITY", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("SBANKCODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("C_ACC_DEB", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKCODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("C_ACC_CRED", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("PAY_DATE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("EXT_DATE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("SUM_DEB", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("SCLIENTN1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SCLIENTN2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SCLIENTN3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SCLIENTN4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SC_CODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("ACC_DEB", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("ACC_KR_1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("ACC_KR_2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SP_CODE", DBFDataType.CHARACTER, 2)); - dbfFields.add(new DBFField("SPECIF_1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_6", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); - dbfFields.add(new DBFField("SERVDATE", DBFDataType.CHARACTER, 8)); - dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); - return dbfFields.toArray(DBFField[]::new); - } - -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF13_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF13_Converter.java deleted file mode 100644 index 81ee56697..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF13_Converter.java +++ /dev/null @@ -1,113 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import com.linuxense.javadbf.DBFDataType; -import com.linuxense.javadbf.DBFField; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf13; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class S_DF13_Converter extends DFConverter { - @Override - public Object[] toObjectArray(SDf13 entity) { - List values = new LinkedList<>(); - values.add(typeMatch(entity.getSeg_type())); - values.add(typeMatch(entity.getDoc_type())); - values.add(typeMatch(entity.getDocnm_ref())); - values.add(typeMatch(entity.getDocnmprev())); - values.add(typeMatch(entity.getPriority())); - values.add(typeMatch(entity.getSbankcode())); - values.add(typeMatch(entity.getC_acc_deb())); - values.add(typeMatch(entity.getSbanknam1())); - values.add(typeMatch(entity.getSbanknam2())); - values.add(typeMatch(entity.getSbanknam3())); - values.add(typeMatch(entity.getSbanknam4())); - values.add(typeMatch(entity.getSbanknam5())); - values.add(typeMatch(entity.getRbankcode())); - values.add(typeMatch(entity.getC_acc_cred())); - values.add(typeMatch(entity.getRbanknam1())); - values.add(typeMatch(entity.getOp_type())); - values.add(typeMatch(entity.getOp_order())); - values.add(typeMatch(entity.getRbanknam4())); - values.add(typeMatch(entity.getRbanknam5())); - values.add(typeMatch(entity.getPay_date())); - values.add(typeMatch(entity.getExt_date())); - values.add(typeMatch(entity.getPay_val())); - values.add(typeMatch(entity.getSum_deb())); - values.add(typeMatch(entity.getSclientn1())); - values.add(typeMatch(entity.getInn_deb())); - values.add(typeMatch(entity.getKpp_deb())); - values.add(typeMatch(entity.getSclientn4())); - values.add(typeMatch(entity.getSc_code())); - values.add(typeMatch(entity.getAcc_deb())); - values.add(typeMatch(entity.getRclientn1())); - values.add(typeMatch(entity.getKpp_cred())); - values.add(typeMatch(entity.getRclientn4())); - values.add(typeMatch(entity.getAcc_kr_1())); - values.add(typeMatch(entity.getAcc_kr_2())); - values.add(typeMatch(entity.getSp_code())); - values.add(typeMatch(entity.getSpecif_1())); - values.add(typeMatch(entity.getSpecif_2())); - values.add(typeMatch(entity.getSpecif_3())); - values.add(typeMatch(entity.getSpecif_4())); - values.add(typeMatch(entity.getSpecif_5())); - values.add(typeMatch(entity.getSpecif_6())); - values.add(typeMatch(entity.getSend_type())); - values.add(typeMatch(entity.getServdate())); - values.add(typeMatch(entity.getDoc_result())); - return values.toArray(Object[]::new); - } - - @Override - public DBFField[] getDBFHeaders() { - List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("SEG_TYPE", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("DOC_TYPE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("DOCNM_REF", DBFDataType.CHARACTER, 16)); - dbfFields.add(new DBFField("DOCNMPREV", DBFDataType.CHARACTER, 16)); - dbfFields.add(new DBFField("PRIORITY", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("SBANKCODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("C_ACC_DEB", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SBANKNAM5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKCODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("C_ACC_CRED", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("OP_TYPE", DBFDataType.CHARACTER, 2)); - dbfFields.add(new DBFField("OP_ORDER", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("RBANKNAM4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RBANKNAM5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("PAY_DATE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("EXT_DATE", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("SUM_DEB", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("SCLIENTN1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("INN_DEB", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("KPP_DEB", DBFDataType.CHARACTER, 9)); - dbfFields.add(new DBFField("SCLIENTN4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SC_CODE", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("ACC_DEB", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("RCLIENTN1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("KPP_CRED", DBFDataType.CHARACTER, 9)); - dbfFields.add(new DBFField("RCLIENTN4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("ACC_KR_1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("ACC_KR_2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SP_CODE", DBFDataType.CHARACTER, 2)); - dbfFields.add(new DBFField("SPECIF_1", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_2", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_3", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_4", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_5", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SPECIF_6", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); - dbfFields.add(new DBFField("SERVDATE", DBFDataType.CHARACTER, 8)); - dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); - return dbfFields.toArray(DBFField[]::new); - } - -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java index c64a2bcb3..206f8d84a 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java @@ -22,7 +22,6 @@ public class S_DF17_Converter extends DFConverter { values.add(typeMatch(entity.getSPEC())); values.add(typeMatch(entity.getNumber())); values.add(typeMatch(entity.getResult())); -// values.add(typeMatch(entity.getIn_s_df16_id())); return values.toArray(Object[]::new); } @@ -38,7 +37,6 @@ public class S_DF17_Converter extends DFConverter { dbfFields.add(new DBFField("_S_P_E_C", DBFDataType.NUMERIC, 32, 18)); dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 32, 18)); dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 3)); -// dbfFields.add(new DBFField("INSDF16_ID", DBFDataType.NUMERIC)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java index cd2540b4b..c8fd9773d 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java @@ -19,7 +19,6 @@ public class S_DF18_Converter extends DFConverter { values.add(typeMatch(entity.getResult())); values.add(typeMatch(entity.getGenerationTime())); values.add(typeMatch(entity.getGenerationId())); -// values.add(typeMatch(entity.getInSDf12Id())); return values.toArray(Object[]::new); } @@ -32,7 +31,6 @@ public class S_DF18_Converter extends DFConverter { dbfFields.add(new DBFField("RESULT", DBFDataType.NUMERIC, 32, 18)); dbfFields.add(new DBFField("GEN_TIME", DBFDataType.DATE)); dbfFields.add(new DBFField("GEN_ID", DBFDataType.NUMERIC)); -// dbfFields.add(new DBFField("INSDF12_ID", DBFDataType.NUMERIC)); return dbfFields.toArray(DBFField[]::new); }