From 297599e78773a615f5810c824a41b4365ebd5ea9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 5 Feb 2025 11:11:14 +0100 Subject: [PATCH] Rimossa eccezione nel caso di configurazione stampa non trovata --- .../integry/ems/service/PrinterService.java | 19 ++++++++----------- .../core/controller/EmsEngineController.java | 3 ++- .../ems/retail/service/GiacenzaService.java | 8 ++++---- .../service/ExchangeOrdiniImportService.java | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/service/PrinterService.java b/ems-core/src/main/java/it/integry/ems/service/PrinterService.java index 905ea426ac..679d5d5c99 100644 --- a/ems-core/src/main/java/it/integry/ems/service/PrinterService.java +++ b/ems-core/src/main/java/it/integry/ems/service/PrinterService.java @@ -3,6 +3,7 @@ package it.integry.ems.service; import it.integry.ems.properties.EmsProperties; import it.integry.ems.report.dto.ReportTypeDTO; import it.integry.ems.service.exception.EmptyReportException; +import it.integry.ems.sync.MultiDBTransaction.Connection; import it.integry.ems_model.entity.WtbJreptSetup; import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.utility.UtilityString; @@ -32,8 +33,6 @@ import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.InputStream; -import it.integry.ems.sync.MultiDBTransaction.Connection; - @Service @Scope("request") public class PrinterService { @@ -239,10 +238,11 @@ public class PrinterService { return reportProcessor.getReportForReportType(reportTypeDTO); } - public String printReportType(ReportTypeDTO reportTypeDTO) throws Exception { + public void printReportType(ReportTypeDTO reportTypeDTO) throws Exception { WtbJreptSetup impostazioniStampa = reportProcessor.getReportForReportType(reportTypeDTO); if (impostazioniStampa == null) { - throw new Exception("Nessuna configurazione trovata per il tipo report " + reportTypeDTO.getReportType().toString()); + logger.warn("Nessuna configurazione trovata per il tipo report " + reportTypeDTO.getReportType().toString()); + return; } String printerName = impostazioniStampa.getPrinterName(); Integer numberOfCopies = impostazioniStampa.getPrintQuantity(); @@ -256,16 +256,15 @@ public class PrinterService { switch (impostazioniStampa.getOrientation()) { case PORTRAIT: orientation = Orientation.PORTRAIT; - break; + case LANDSCAPE: orientation = Orientation.LANDSCAPE; - break; - default: - case AUTO: - orientation = Orientation.AUTO; + case AUTO: + default: + orientation = Orientation.AUTO; break; } numberOfCopies = numberOfCopies == null ? 1 : numberOfCopies; @@ -273,8 +272,6 @@ public class PrinterService { print(printerName, new ByteArrayInputStream(bytes), "application/pdf", orientation); } - return printerName; - } else { throw new EmptyReportException(); } diff --git a/ems-engine/src/main/java/it/integry/core/controller/EmsEngineController.java b/ems-engine/src/main/java/it/integry/core/controller/EmsEngineController.java index 4e9f6ffff0..ad4af4bc5d 100644 --- a/ems-engine/src/main/java/it/integry/core/controller/EmsEngineController.java +++ b/ems-engine/src/main/java/it/integry/core/controller/EmsEngineController.java @@ -120,7 +120,8 @@ public class EmsEngineController { @RequestParam(CommonConstants.PROFILE_DB) String configuration, @RequestBody ReportTypeDTO reportTypeDTO) { try { - return ServiceRestResponse.createPositiveResponse(printerService.printReportType(reportTypeDTO)); + printerService.printReportType(reportTypeDTO); + return ServiceRestResponse.createPositiveResponse(); } catch (Exception e) { logger.error(request.getRequestURI(), e); return ServiceRestResponse.createNegativeResponse(configuration, e); diff --git a/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java b/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java index 9cb9339823..2083c1bfb5 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java @@ -151,7 +151,7 @@ public class GiacenzaService { List carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.INSERT); List entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false, - new RequestDataDTO()); + RequestDataDTO.systemMockupData()); UtilityEntity.throwEntitiesException(entityRet); } @@ -166,7 +166,7 @@ public class GiacenzaService { List carelliGiacenzaProgs = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, CarelliGiacenzaProg.class, OperationType.DELETE); List entityRet = entityProcessor.processEntityList(carelliGiacenzaProgs, null, false, true, false, multiDBTransactionManager, false, false, - new RequestDataDTO()); + RequestDataDTO.systemMockupData()); UtilityEntity.throwEntitiesException(entityRet); } @@ -429,7 +429,7 @@ public class GiacenzaService { .setDataDoc(UtilityLocalDate.localDateToDate(collo.getDataCollo())) .setDataDistribuzione(new Date()); collo.setOperation(OperationType.UPDATE); - entityProcessor.processEntity(collo, false, false, "", multiDBTransactionManager, new RequestDataDTO(),false, false); + entityProcessor.processEntity(collo, false, false, "", multiDBTransactionManager, RequestDataDTO.systemMockupData(),false, false); UtilityEntity.throwEntityException(collo); } } @@ -448,7 +448,7 @@ public class GiacenzaService { calls.add(() -> { try { for (EntityBase entityBase : entityList) { - entityProcessor.processEntity(entityBase, false, true, "", multiDBTransactionManager, new RequestDataDTO(), false, false); + entityProcessor.processEntity(entityBase, false, true, "", multiDBTransactionManager, RequestDataDTO.systemMockupData(), false, false); } } catch (Exception ex) { diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java index 9d33f64308..772540c2f0 100644 --- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeOrdiniImportService.java @@ -309,7 +309,7 @@ public class ExchangeOrdiniImportService { .setDataInizProd(field.getDataInizProd()) .setCodVzon(field.getCodVzon()) .setDataOrd(field.getDataInizProd()); - agribookFieldService.createField(multiDb, dto, EXCHANGE_USER, new RequestDataDTO()); + agribookFieldService.createField(multiDb, dto, EXCHANGE_USER, RequestDataDTO.systemMockupData()); break; case UPDATE: