From 7d51561c71fb2c5b4b259a7249a93343bc57a3c3 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 3 Aug 2023 17:42:47 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-317=20?= =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=86?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?= =?UTF-8?q?=20=D0=94=D0=A4-12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swt/exporter/services/AbstractExporterService.java | 10 +++++++--- .../swt/exporter/services/exportimpl/DF12Exporter.java | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/AbstractExporterService.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/AbstractExporterService.java index 53e962ffe..a222ff418 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/AbstractExporterService.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/AbstractExporterService.java @@ -13,10 +13,14 @@ import ru.spcex.platform.enumeration.SwtTable; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.io.PrintWriter; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.Collection; +import java.util.Objects; +import java.util.Optional; import static ru.spcex.clearing.platform.messaging.domain.Consts.JOURNAL_SERVICE; @@ -135,8 +139,8 @@ public abstract class AbstractExporterService { protected void makeSWTData(SWTHeaderData header, Collection records, OutputStream outStream) { try (PrintWriter out = new PrintWriter(outStream)) { out.print(header.buildString()); - int counter = 1; // нумерация начинается с 1 int totalSize = records.size(); + int counter = totalSize == 0 ? 0 : 1; // нумерация начинается с 1 for (T row : records) { ConvertionContext context = new ConvertionContext(mapClass, counter, totalSize); String data = convertRecord(row, context); diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java index 924744fde..784a7c49d 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF12Exporter.java @@ -97,7 +97,7 @@ public class DF12Exporter extends AbstractExporterService { @Override protected void writeFooter(PrintWriter out, Collection records, int counter) { - String footerCheckSum = counter + lineSeparator + records.size() + lineSeparator; - out.print(footerCheckSum); +// String footerCheckSum = counter + lineSeparator + records.size() + lineSeparator; +// out.print(footerCheckSum); } }