Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Fix log errori in DocumentController

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-06-20 12:14:42 +02:00
parent 026a4890d1
commit 5db1aa0948
2 changed files with 28 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ems-core/src/main/java/it/integry/ems/utility/UtilityFile.java
View File

@@ -5,7 +5,6 @@ import com.itextpdf.text.PageSize;
import com.itextpdf.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfWriter;
import com.itextpdf.tool.xml.XMLWorkerHelper;
import it.integry.ems.Import.dto.ImportRequestDTO;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.enums.DigitalSignatureType;
import it.integry.ems_model.utility.UtilityDB;
@@ -13,7 +12,6 @@ import it.integry.ems_model.utility.UtilityString;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bouncycastle.cms.CMSSignedData;
@@ -33,7 +31,6 @@ import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.security.Security;
import java.sql.Connection;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -297,7 +294,7 @@ public class UtilityFile {
break;
}
} catch (Exception ex) {
throw new Exception(String.format("Errore durante l'estrazione della firma digitale dal file %s: %s", inputFileName, ex.getMessage()));
throw new Exception(String.format("Errore durante l'estrazione della firma digitale dal file %s: %s", inputFileName, ex.getMessage()), ex);
}
return outputStream.toByteArray();

107
ems-engine/src/main/java/it/integry/ems/document/controller/DocumentController.java
View File

@@ -340,19 +340,11 @@ public class DocumentController {
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestParam String codMdep,
@RequestParam String codCassa,
@RequestParam("dataScontrino") String dataScontrinoString) {
@RequestParam("dataScontrino") String dataScontrinoString) throws Exception {
ServiceRestResponse response;
try {
Date dataScotrino = UtilityDate.RecognizeDate(dataScontrinoString);
List<EntityBase> responseEntities = documentService.stornaScontrino(codMdep, codCassa, dataScotrino, true);
response = ServiceRestResponse.createPositiveResponse((Object) responseEntities);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
}
return response;
Date dataScotrino = UtilityDate.RecognizeDate(dataScontrinoString);
List<EntityBase> responseEntities = documentService.stornaScontrino(codMdep, codCassa, dataScotrino, true);
return ServiceRestResponse.createPositiveResponse(responseEntities);
}
@RequestMapping(value = EmsRestConstants.PATH_PROPORZIONA_CONSUMI_MP, method = RequestMethod.POST)
@@ -416,36 +408,22 @@ public class DocumentController {
@RequestMapping(value = EmsRestConstants.PATH_FPX_TO_PDF, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse fpxToPdf(@RequestParam(CommonConstants.PROFILE_DB) String configuration, @RequestBody FpxToPdfDTO payload) {
ServiceRestResponse serviceRestResponse = new ServiceRestResponse();
try {
List<FpxToPdfDTO.FpxToPdfFile> convertedFiles = digitalInvoiceConverterService.fpxToPdf(payload);
List<DownloadFileDto> downloadFiles = new ArrayList<>();
ServiceRestResponse fpxToPdf(@RequestParam(CommonConstants.PROFILE_DB) String configuration, @RequestBody FpxToPdfDTO payload) throws Exception {
List<FpxToPdfDTO.FpxToPdfFile> convertedFiles = digitalInvoiceConverterService.fpxToPdf(payload);
List<DownloadFileDto> downloadFiles = new ArrayList<>();
for (FpxToPdfDTO.FpxToPdfFile convertedFile : convertedFiles) {
downloadFiles.add(downloadFileHandlerService.generateDownloadItem(convertedFile.getFileName(), convertedFile.getFileContentBytes()));
}
serviceRestResponse = ServiceRestResponse.createPositiveResponse(downloadFiles);
} catch (Exception ex) {
serviceRestResponse.setEsito(EsitoType.KO);
serviceRestResponse.setErrorMessage(ex.getMessage());
for (FpxToPdfDTO.FpxToPdfFile convertedFile : convertedFiles) {
downloadFiles.add(downloadFileHandlerService.generateDownloadItem(convertedFile.getFileName(), convertedFile.getFileContentBytes()));
}
return serviceRestResponse;
return ServiceRestResponse.createPositiveResponse(downloadFiles);
}
@RequestMapping(value = EmsRestConstants.PATH_EXPORT_FATTURE_FPX, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse exportFpx(@RequestParam(CommonConstants.PROFILE_DB) String configuration, @RequestBody ExportFpxRequest payload) {
ServiceRestResponse serviceRestResponse = new ServiceRestResponse();
try {
serviceRestResponse = ServiceRestResponse.createPositiveResponse(digitalInvoiceBackupService.exportFpxInvoices(payload));
} catch (Exception ex) {
serviceRestResponse.setEsito(EsitoType.KO);
serviceRestResponse.setErrorMessage(ex.getMessage());
}
return serviceRestResponse;
ServiceRestResponse exportFpx(@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody ExportFpxRequest payload) throws Exception {
return ServiceRestResponse.createPositiveResponse(digitalInvoiceBackupService.exportFpxInvoices(payload));
}
@@ -453,58 +431,32 @@ public class DocumentController {
public @ResponseBody
ServiceRestResponse exportEmailFpx(HttpServletRequest httpRequest,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody ExportFpxRequest payload) {
ServiceRestResponse serviceRestResponse = new ServiceRestResponse();
try {
serviceRestResponse = ServiceRestResponse.createPositiveResponse(digitalInvoiceBackupService.exportEmailFpx(payload));
} catch (Exception ex) {
serviceRestResponse.setEsito(EsitoType.KO);
serviceRestResponse.setErrorMessage(ex.getMessage());
logger.error(httpRequest.getRequestURI(), ex);
}
return serviceRestResponse;
@RequestBody ExportFpxRequest payload) throws Exception {
return ServiceRestResponse.createPositiveResponse(digitalInvoiceBackupService.exportEmailFpx(payload));
}
@RequestMapping(value = EmsRestConstants.PATH_IMPORT_FPX_RECEIPTS, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse importFpxReceipts(@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody List<FileItem> files) {
ServiceRestResponse serviceRestResponse = new ServiceRestResponse();
try {
serviceRestResponse = ServiceRestResponse.createPositiveResponse(digitalInvoiceBackupService.importReceipts(files, false));
} catch (Exception ex) {
serviceRestResponse.setEsito(EsitoType.KO);
serviceRestResponse.setErrorMessage(ex.getMessage());
}
return serviceRestResponse;
@RequestBody List<FileItem> files) throws Exception {
return ServiceRestResponse.createPositiveResponse(digitalInvoiceBackupService.importReceipts(files, false));
}
@RequestMapping(value = EmsRestConstants.PATH_SEND_FPX, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse sendPfx(@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody SendFpxRequestDTO payload) {
ServiceRestResponse serviceRestResponse = ServiceRestResponse.createPositiveResponse();
try {
digitalInvoiceMailService.sendFPX(payload);
} catch (Exception ex) {
serviceRestResponse = ServiceRestResponse.createNegativeResponse(ex);
}
return serviceRestResponse;
@RequestBody SendFpxRequestDTO payload) throws Exception {
digitalInvoiceMailService.sendFPX(payload);
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_CHK_INVIO_FE, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse chkInvioFE(HttpServletRequest request) {
ServiceRestResponse chkInvioFE(HttpServletRequest request) throws Exception {
ServiceRestResponse response;
try {
documentService.chkInvioFE();
response = ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, "", e);
}
return response;
documentService.chkInvioFE();
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_CAMBIO_TIPO_DOC, method = RequestMethod.POST)
@@ -537,13 +489,8 @@ public class DocumentController {
HttpServletResponse response,
@RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception {
try {
cambioTipoDocPlanService.cambioTipoDoc();
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
return ServiceRestResponse.createNegativeResponse(e);
}
cambioTipoDocPlanService.cambioTipoDoc();
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_IMPORT_RESI_DA_CLIENTE, method = RequestMethod.POST)