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

swt-exporter DF09 header fix, поправил имена файлов

Browse source
This commit is contained in:
AKurakin 2023-08-10 19:33:30 +03:00
parent 6daf7c0227
commit 9aad5d1553
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/AbstractExporterService.java
View file

@ -33,7 +33,7 @@ public abstract class AbstractExporterService<T extends SpcexObjectBase> {
public static final Charset ENCODING = Charset.forName("windows-1251"); public static final Charset ENCODING = Charset.forName("windows-1251");
protected final SwtTable type; protected final SwtTable type;
protected final Imdg<T> sdfImdg; protected final Imdg<T> sdfImdg;
private final DateTimeFormatter dtFileNameFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); private final DateTimeFormatter dtFileNameFormatter = DateTimeFormatter.ofPattern("yyMMddHHmmssSSS");// YYMMDDHHmmssSSS
private final DateTimeFormatter dtInFileHeaderFormatter = DateTimeFormatter.ofPattern("yyyyMMdd'/'HHmm"); private final DateTimeFormatter dtInFileHeaderFormatter = DateTimeFormatter.ofPattern("yyyyMMdd'/'HHmm");
private final KafkaSender kafkaSender; private final KafkaSender kafkaSender;
protected final FileStorage fileStorage; protected final FileStorage fileStorage;

6
clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/util/SWTHeaderData.java
View file

@ -147,15 +147,15 @@ public class SWTHeaderData {
String timeS = dtInFileHeaderFormatter.format(dateTime); String timeS = dtInFileHeaderFormatter.format(dateTime);
stringBuilder.append("Date/Time:").append(timeS).append(LINE_SEPARATOR); stringBuilder.append("Date/Time:").append(timeS).append(LINE_SEPARATOR);
} }
if (valFor18ATag != null) {
stringBuilder.append(":18A:").append(valFor18ATag).append(LINE_SEPARATOR);
}
if (valFor20Tag != null) { if (valFor20Tag != null) {
stringBuilder.append(":20:").append(valFor20Tag).append(LINE_SEPARATOR); stringBuilder.append(":20:").append(valFor20Tag).append(LINE_SEPARATOR);
} }
if (valFor21Tag != null) { if (valFor21Tag != null) {
stringBuilder.append(":21:").append(valFor21Tag).append(LINE_SEPARATOR); stringBuilder.append(":21:").append(valFor21Tag).append(LINE_SEPARATOR);
} }
if (valFor18ATag != null) {
stringBuilder.append(":18A:").append(valFor18ATag).append(LINE_SEPARATOR);
}
if (valFor23Tag != null) { if (valFor23Tag != null) {
stringBuilder.append(":23:").append(valFor23Tag).append(LINE_SEPARATOR); stringBuilder.append(":23:").append(valFor23Tag).append(LINE_SEPARATOR);
} }

12
clearing-parent/swt-exporter/src/test/java/ru/spcex/clearing/swt/exporter/services/AbstractExporterServiceTest.java
View file

@ -7,6 +7,9 @@ import ru.spcex.platform.enumeration.ResultStatuses;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import static org.junit.jupiter.api.Assertions.assertEquals;
class AbstractExporterServiceTest extends AbstractServiceTest { class AbstractExporterServiceTest extends AbstractServiceTest {
@PostConstruct @PostConstruct
@ -22,4 +25,13 @@ class AbstractExporterServiceTest extends AbstractServiceTest {
moneyExporterService.sendSwtExportedNotification(LocalDateTime.now(), 1L, ResultStatuses.notSuccess); moneyExporterService.sendSwtExportedNotification(LocalDateTime.now(), 1L, ResultStatuses.notSuccess);
//TestUtils.waitingSendAndCheckRecord(null, mockProducer); //TestUtils.waitingSendAndCheckRecord(null, mockProducer);
} }
@Test
void formatFileName() {
AbstractExporterService moneyExporterService = new DF09Exporter(null, kafkaSender, imdgProvider);
assertEquals("KS_RDC_DF-09_230227093203515.txt", moneyExporterService.formatFileName(
"DF-09", null, LocalDateTime.of(2023,2,27,9,32,3).plus(515, ChronoUnit.MILLIS) ));
assertEquals("KS_RDC_DF-09_230227093203000.txt", moneyExporterService.formatFileName(
moneyExporterService.typeForFileName(), moneyExporterService.sectionForFileName(null), LocalDateTime.of(2023,2,27,9,32,3,515) ));
}
} }