diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 38a9693ab..fc2108169 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -50,12 +50,6 @@ classes - - - org.testng - testng - test - diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java index 0166fbf06..516c4736a 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java @@ -5,9 +5,6 @@ import com.linuxense.javadbf.DBFField; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.sdf.SDf08; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.LinkedList; import java.util.List; @@ -18,7 +15,7 @@ public class S_DF08_Converter extends DFConverter { public Object[] toObjectArray(SDf08 entity) { List values = new LinkedList<>(); values.add(convertStrToLong(entity.getNumber())); - values.add(typeMatch(convertStrToDate(entity.getDatetime()))); + values.add(typeMatch(convertStrToLong(entity.getDatetime()))); // UNIX TIME return values.toArray(Object[]::new); } @@ -26,7 +23,7 @@ public class S_DF08_Converter extends DFConverter { public DBFField[] getDBFHeaders() { List dbfFields = new LinkedList<>(); dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 10)); - dbfFields.add(new DBFField("DATETIME", DBFDataType.DATE)); + dbfFields.add(new DBFField("DATETIME", DBFDataType.NUMERIC, 13)); // UNIX TIME return dbfFields.toArray(DBFField[]::new); } @@ -38,12 +35,4 @@ public class S_DF08_Converter extends DFConverter { private static final DateTimeFormatter DATE_FMT = DateTimeFormatter.ofPattern("dd.MM.yyyy"); private static final DateTimeFormatter DATE_TIME_FMT = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss"); - Object convertStrToDate(String s) { - if (s == null) return null; - if (s.matches("\\d{2}.\\d{2}.\\d{4}")) { - return LocalDate.parse(s, DATE_FMT).atStartOfDay(ZoneId.systemDefault()).toInstant(); - } else { - return LocalDateTime.parse(s, DATE_TIME_FMT).atZone(ZoneId.systemDefault()).toInstant(); - } - } } diff --git a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_ConverterTest.java b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_ConverterTest.java deleted file mode 100644 index 10de36001..000000000 --- a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_ConverterTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import org.testng.Assert; -import org.testng.annotations.Test; - -public class S_DF08_ConverterTest { - @Test - public void testTestConvertStrToLong() { - S_DF08_Converter converter = new S_DF08_Converter(); - Assert.assertNull(converter.convertStrToLong(null)); - Assert.assertEquals(1L, converter.convertStrToLong("1")); - } - - @Test - public void testTestConvertStrToDate() { - S_DF08_Converter converter = new S_DF08_Converter(); - Assert.assertNull(converter.convertStrToDate(null)); - Assert.assertEquals("2022-12-29 00:00:00.0", converter.convertStrToDate("29.12.2022").toString()); - Assert.assertEquals("2023-01-13 15:32:01.0", converter.convertStrToDate("13.01.2023 15:32:01").toString()); - } -} \ No newline at end of file