From 085acf8a2bff9c38df209e6a8f5e4b6a181591d6 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 18 Apr 2024 11:40:58 +0300 Subject: [PATCH 1/2] =?UTF-8?q?dbf-exporter=20dbf-importer=20http://jira.m?= =?UTF-8?q?fd.msk:8088/browse/CLS-619=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java | 2 +- .../clearing/dbf/exporter/logic/stages/PrepareDBFFile.java | 1 + .../ru/spcex/clearing/dbf/importer/services/FileChecker.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 671dc60c4..a23dc414f 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 @@ -107,7 +107,7 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { log.warn("Can't delete file {}", resultContainer.getFileForExport().getName()); } } else { - log.debug("uuid {}, send to SFTP", resultContainer.getUuid()); + log.debug("uuid {}, send to SFTP path \"{}\"", resultContainer.getUuid(), path); gateway.sendToSftp(dbfFile, path); } } 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 f7cb84f1a..253f0b6a4 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 @@ -40,6 +40,7 @@ public class PrepareDBFFile extends Stage implements InitializingBean { return StageResult.ERROR; } List files = new ArrayList<>(); + log.trace("Get files from SFTP paths: {}", settings.getStore().getOutPayValDir().values()); for (String path : settings.getStore().getOutPayValDir().values()) { files.addAll(gateway.listFiles(path)); } diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java index 4fadc4fb0..ad20d9537 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java @@ -70,6 +70,7 @@ public class FileChecker { return; } List files = new ArrayList<>(); + log.trace("Load from SFTP paths: {}", settings.getStore().getSftpIn().getSftpSrcPayValDir().values()); for (String path : settings.getStore().getSftpIn().getSftpSrcPayValDir().values()) { files.addAll(gateway.listFiles(path)); } From e5d0e208bd9700cb7ca61ddc5368c0f657b73d59 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 18 Apr 2024 13:12:20 +0300 Subject: [PATCH 2/2] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-619=20?= =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D1=83.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbf/exporter/logic/stages/ExportFromHazelcast.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 a23dc414f..d94032686 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 @@ -78,10 +78,11 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { tableRows = new ArrayList(tableRows); ((ArrayList) tableRows).sort(Comparator.comparing(SpcexObjectBase::getId)); } + DFConverter currentConverter = null; for (SpcexObjectBase value : tableRows) { - DFConverter currentConverter = converters.stream().filter(c -> c.canProcessing(value)).findFirst() - .orElseThrow(() -> new Exception("Get unknown object from imdg. Class: " + value.getClass().getSimpleName())); - if (currency == null) { + if (currentConverter == null) { + currentConverter = converters.stream().filter(c -> c.canProcessing(value)).findFirst() + .orElseThrow(() -> new Exception("Get unknown object from imdg. Class: " + value.getClass().getSimpleName())); currency = currentConverter.getCurrency(value); dbfWriter.setFields(currentConverter.getDBFHeaders()); }