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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2024-04-22 17:12:13 +03:00
commit 9971299c70
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java
View file

@ -78,10 +78,11 @@ public class ExportFromHazelcast extends Stage implements InitializingBean {
tableRows = new ArrayList<SpcexObjectBase>(tableRows); tableRows = new ArrayList<SpcexObjectBase>(tableRows);
((ArrayList<SpcexObjectBase>) tableRows).sort(Comparator.comparing(SpcexObjectBase::getId)); ((ArrayList<SpcexObjectBase>) tableRows).sort(Comparator.comparing(SpcexObjectBase::getId));
} }
DFConverter currentConverter = null;
for (SpcexObjectBase value : tableRows) { for (SpcexObjectBase value : tableRows) {
DFConverter currentConverter = converters.stream().filter(c -> c.canProcessing(value)).findFirst() if (currentConverter == null) {
.orElseThrow(() -> new Exception("Get unknown object from imdg. Class: " + value.getClass().getSimpleName())); currentConverter = converters.stream().filter(c -> c.canProcessing(value)).findFirst()
if (currency == null) { .orElseThrow(() -> new Exception("Get unknown object from imdg. Class: " + value.getClass().getSimpleName()));
currency = currentConverter.getCurrency(value); currency = currentConverter.getCurrency(value);
dbfWriter.setFields(currentConverter.getDBFHeaders()); dbfWriter.setFields(currentConverter.getDBFHeaders());
} }
@ -107,7 +108,7 @@ public class ExportFromHazelcast extends Stage implements InitializingBean {
log.warn("Can't delete file {}", resultContainer.getFileForExport().getName()); log.warn("Can't delete file {}", resultContainer.getFileForExport().getName());
} }
} else { } else {
log.debug("uuid {}, send to SFTP", resultContainer.getUuid()); log.debug("uuid {}, send to SFTP path \"{}\"", resultContainer.getUuid(), path);
gateway.sendToSftp(dbfFile, path); gateway.sendToSftp(dbfFile, path);
} }
} }

1
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
View file

@ -40,6 +40,7 @@ public class PrepareDBFFile extends Stage implements InitializingBean {
return StageResult.ERROR; return StageResult.ERROR;
} }
List<SftpFileInfo> files = new ArrayList<>(); List<SftpFileInfo> files = new ArrayList<>();
log.trace("Get files from SFTP paths: {}", settings.getStore().getOutPayValDir().values());
for (String path : settings.getStore().getOutPayValDir().values()) { for (String path : settings.getStore().getOutPayValDir().values()) {
files.addAll(gateway.listFiles(path)); files.addAll(gateway.listFiles(path));
} }

1
clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java
View file

@ -70,6 +70,7 @@ public class FileChecker {
return; return;
} }
List<File> files = new ArrayList<>(); List<File> files = new ArrayList<>();
log.trace("Load from SFTP paths: {}", settings.getStore().getSftpIn().getSftpSrcPayValDir().values());
for (String path : settings.getStore().getSftpIn().getSftpSrcPayValDir().values()) { for (String path : settings.getStore().getSftpIn().getSftpSrcPayValDir().values()) {
files.addAll(gateway.listFiles(path)); files.addAll(gateway.listFiles(path));
} }