diff --git a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMailService.java b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMailService.java index bf83c044f4..70b6fccfc9 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMailService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMailService.java @@ -288,7 +288,7 @@ public class DigitalInvoiceMailService { Multipart multipart = (Multipart) sdiMessage.getContent(); List progSdiList = digitalInvoiceMessageReader.readMailAttachments(multipart); - if (progSdiList != null && progSdiList.size() > 0) { + if (progSdiList != null && !progSdiList.isEmpty()) { progSdiTotal.addAll(progSdiList); digitalInvoiceBackupService.saveMailContent(sdiMessage, MailDirection.RICEVUTA, progSdiList); moveToFolder(sdiMessage, folder, INBOX_BACKUP_FOLDER); diff --git a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMessageReader.java b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMessageReader.java index ee5880182d..6c56924329 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMessageReader.java +++ b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceMessageReader.java @@ -403,12 +403,12 @@ public class DigitalInvoiceMessageReader { for (DtbDocXml doc : invoiceArchive) { doc.setXmlEsito(Base64.encodeBase64String(xmlEsito)); doc.setPdfEsito(Base64.encodeBase64String(pdfBytes)); - try { - entityProcessor.processEntity(doc, true, multiDBTransactionManager); - progSdiList.add(doc.getProgSdi()); - } catch (Exception ex) { - logger.error("Importazione Notifica fatture elettroniche", ex); - } +// try { + entityProcessor.processEntity(doc, true, multiDBTransactionManager); + progSdiList.add(doc.getProgSdi()); +// } catch (Exception ex) { +// logger.error("Importazione Notifica fatture elettroniche", ex); +// } } logger.debug(String.format("Aggiorno progressivo %s: ricevuta risposta %s dallo SDI", progSdi, receiptType.getValue())); @@ -416,11 +416,11 @@ public class DigitalInvoiceMessageReader { case MT: boolean read = false; - try { - read = passiveInvoiceService.storePassiveInvoice(bodyPartMap.get(nomeFile), receivedDate, identifierSdi); - } catch (Exception ex) { - logger.error("Importazione fatture elettroniche", ex); - } +// try { + read = passiveInvoiceService.storePassiveInvoice(bodyPartMap.get(nomeFile), receivedDate, identifierSdi); +// } catch (Exception ex) { +// logger.error("Importazione fatture elettroniche", ex); +// } if (read) { progSdiList.add(digitalInvoiceManager.getPassiveInvoiceId()); diff --git a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/PassiveInvoiceService.java b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/PassiveInvoiceService.java index d949e3e998..3c5d811d1e 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/PassiveInvoiceService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/PassiveInvoiceService.java @@ -16,7 +16,6 @@ import it.integry.ems.document.fatture.xml.pa.TipoDocumentoType; import it.integry.ems.document.service.DocumentService; import it.integry.ems.file_formatter.csv.CsvMapper; import it.integry.ems.javabeans.RequestDataDTO; -import it.integry.ems.order.Import.dto.OrdiniDialogoDTO; import it.integry.ems.response.FileItem; import it.integry.ems.service.EntityProcessor; import it.integry.ems.service.MailService; @@ -27,7 +26,10 @@ import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.entity.*; import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.types.OperationType; -import it.integry.ems_model.utility.*; +import it.integry.ems_model.utility.Query; +import it.integry.ems_model.utility.UtilityDB; +import it.integry.ems_model.utility.UtilityHashMap; +import it.integry.ems_model.utility.UtilityString; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -231,7 +233,7 @@ public class PassiveInvoiceService { } catch (Exception ex) { digitalInvoiceManager.getPassiveInvoices().remove(fileName); - throw new Exception("Errore durante il salvataggio del file " + fileName + ": " + ex.getMessage()); + throw new Exception("Errore durante il salvataggio del file " + fileName + ": " + ex.getMessage(), ex); } } else {