diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java index 239111945..baa1a181b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java @@ -266,8 +266,8 @@ public class ReportService extends QueueConsumerV2 implements InitializingBean { } Map outFiles = createReportsForTask(sessionIds, reportBuildersForGREP.values()); - sendReportsToGateway(sessionIds, outFiles, ReportType.REPORT_KS_TMP.getKey()); sendFilesToSftp(outFiles.keySet()); + sendReportsToGateway(sessionIds, outFiles, ReportType.REPORT_KS_TMP.getKey()); } catch (Exception e) { log.error("Unexpected exception", e); } @@ -305,9 +305,9 @@ public class ReportService extends QueueConsumerV2 implements InitializingBean { outFilesWithReportType_PFX64.put(reportFile, reportInfo); } } + sendFilesToSftp(outFiles.keySet()); sendReportsToGateway(sessionIds, outFilesWithReportType_PFX64, ReportType.PFX64.getKey()); sendReportsToGateway(sessionIds, outFilesWithReportType_PFX65, ReportType.PFX65.getKey()); - sendFilesToSftp(outFiles.keySet()); } catch (Exception e) { log.error("Unexpected exception", e); } @@ -328,8 +328,8 @@ public class ReportService extends QueueConsumerV2 implements InitializingBean { } Map outFiles = createReportsForTask(sessionIds, reportBuildersForGREF.values()); - sendReportsToGateway(sessionIds, outFiles, ReportType.REPORT_KS_FINAL.getKey()); sendFilesToSftp(outFiles.keySet()); + sendReportsToGateway(sessionIds, outFiles, ReportType.REPORT_KS_FINAL.getKey()); } catch (Exception e) { log.error("Unexpected exception", e); } @@ -346,8 +346,8 @@ public class ReportService extends QueueConsumerV2 implements InitializingBean { Map outFiles = createReportsForTask(List.of(), reportBuildersForGREC.values()); - sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_OUTER.getKey()); sendFilesToSftp(outFiles.keySet()); + sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_OUTER.getKey()); } catch (Exception e) { log.error("Unexpected exception", e); } @@ -364,8 +364,8 @@ public class ReportService extends QueueConsumerV2 implements InitializingBean { Map outFiles = createReportsForTask(List.of(), reportBuildersForCX84.values()); - sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_VALUE_OUTER.getKey()); sendFilesToSftp(outFiles.keySet()); + sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_VALUE_OUTER.getKey()); } catch (Exception e) { log.error("Unexpected exception", e); }