From 98cdcf8e5ae18b41cd616ad35a0f59f10fe7df5d Mon Sep 17 00:00:00 2001 From: manuelstefanile Date: Mon, 3 Feb 2025 09:59:39 +0100 Subject: [PATCH] 327915 - Modifica flussi Cubo Saldi Netti (Consumer e Business) - Rimozione check data in elaborazione - --- .../in/Dwhe2eRepoSaldiNettiIn.java | 33 ++++--------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/internalflow/in/Dwhe2eRepoSaldiNettiIn.java b/gnpdev/dbcfx/src/it/valueteam/gnp/internalflow/in/Dwhe2eRepoSaldiNettiIn.java index 93293a0e..1b08c63b 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/internalflow/in/Dwhe2eRepoSaldiNettiIn.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/internalflow/in/Dwhe2eRepoSaldiNettiIn.java @@ -167,22 +167,11 @@ public class Dwhe2eRepoSaldiNettiIn extends InternalSenderProcess implements Log String estensioneFname = fileName.substring(fileName.lastIndexOf("."),fileName.length()); if (estensioneFname.equals(Resources.getDWHE2E_REPOSALDINETTI_FILENAME_EXT())) { - //aggiungo a DBCFX_DWHE2E_USCITE_XXX_ + yyyymmdd.csv al nome file + //aggiungo a DBCFX_DWHE2E_USCITE_XXX_ + yyyymmdd + .csv al nome file String nomeFileOut = Resources.getDWHE2E_REPOSALDINETTI_NOME_FILE_CON_OUT(); - String dataFileOut; - - //replica della data del file di IN per il file di OUT - Pattern pattern = Pattern.compile("_(\\d{8})\\.csv$"); - Matcher matcher = pattern.matcher(fileName); - if (matcher.find()) { - dataFileOut= matcher.group(1); - } else { - //TODO aggiorna se rimuovere o meno. LOGGA - log.write("9999","-------- NOME FILE NON CORRETTO -------"); - dataFileOut = DateUtils.toString(new Date(),Resources.getDWHE2E_REPOSALDINETTI_DATA_FILENAME()); - } - + String dataFileOut = fileName.substring(fileName.lastIndexOf("_")+1,fileName.lastIndexOf(".")); nomeFileOut += dataFileOut + Resources.getDWHE2E_REPOSALDINETTI_FILENAME_EXT(); + generaFileOut(generaRecordAndStoreOut(fileName,nomeFileOut), nomeFileOut, Resources.getPATH_FILE_DWHE2E_REPOSALDINETTI_CON_OUT()); @@ -209,21 +198,11 @@ public class Dwhe2eRepoSaldiNettiIn extends InternalSenderProcess implements Log String estensioneFname = fileName.substring(fileName.lastIndexOf("."),fileName.length()); if (estensioneFname.equals(Resources.getDWHE2E_REPOSALDINETTI_FILENAME_EXT())) { - //aggiungo a DBCFX_DWHE2E_USCITE_XXX_ + yyyymmdd.csv al nome file + //aggiungo a DBCFX_DWHE2E_USCITE_XXX_ + yyyymmdd + .csv al nome file String nomeFileOut = Resources.getDWHE2E_REPOSALDINETTI_NOME_FILE_BUS_OUT(); - String dataFileOut; - - //replica della data del file di IN per il file di OUT - Pattern pattern = Pattern.compile("_(\\d{8})\\.csv$"); - Matcher matcher = pattern.matcher(fileName); - if (matcher.find()) { - dataFileOut= matcher.group(1); - } else { - //TODO aggiorna se rimuovere o meno - dataFileOut = DateUtils.toString(new Date(),Resources.getDWHE2E_REPOSALDINETTI_DATA_FILENAME()); - } - + String dataFileOut = fileName.substring(fileName.lastIndexOf("_")+1,fileName.lastIndexOf(".")); nomeFileOut += dataFileOut + Resources.getDWHE2E_REPOSALDINETTI_FILENAME_EXT(); + generaFileOut(generaRecordAndStoreOut(fileName,nomeFileOut), nomeFileOut, Resources.getPATH_FILE_DWHE2E_REPOSALDINETTI_BUS_OUT());