From 31a123789a11fe4128d0ca9ecb4521d10c4e735c Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 17 Sep 2024 14:56:57 +0200 Subject: [PATCH] Refactor processReport --- .../ems_model/config/EmsRestConstants.java | 1 - .../core/controller/EmsEngineController.java | 31 +++++-------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java b/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java index c69718f80e..b2fe7ca20d 100644 --- a/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java +++ b/ems-core/src/main/java/it/integry/ems_model/config/EmsRestConstants.java @@ -115,7 +115,6 @@ public class EmsRestConstants { public static final String PATH_EXPORT_ORDINI_ACQ = PATH + "exportOrdiniAcquisto"; public static final String PATH_PROCESS_REPORT = PATH + "processReport"; public static final String PATH_DOWNLOAD_REPORT = PATH + "downloadReport"; - public static final String PATH_DOWNLOAD_REPORT_RESPONSE_ENTITY = PATH + "downloadReportResponseEntity"; public static final String PATH_PROCESS_REPORT_TYPE = PATH + "processReportType"; public static final String PATH_PRINT_REPORT_TYPE = PATH + "printReportType"; public static final String PATH_GET_SETUP_REPORT_TYPE = PATH + "getSetupReportType"; 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 94dec58df9..1c806d18ab 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 @@ -64,24 +64,25 @@ public class EmsEngineController { List processReport(HttpServletRequest request, @RequestParam(CommonConstants.PROFILE_DB) String configuration, @RequestBody JasperDTO jasperDTO) { - List response = new ArrayList(); + List response = new ArrayList<>(); try { FileItem fi = new FileItem(); byte[] bytes = emsEngineService.processReport(jasperDTO); - if (bytes != null) { + if (bytes != null) { fi.setFileb64Content(new String(Base64.encodeBase64(bytes))); + response.add(new ServiceRestResponse(EsitoType.OK, multiDBTransactionManager.getPrimaryDatasource().getProfile(), fi)); } - response.add(new ServiceRestResponse(EsitoType.OK, multiDBTransactionManager.getPrimaryDatasource().getProfile(), fi)); + response.add(ServiceRestResponse.createNegativeResponse("Nessun report generato!")); } catch (JRException e) { logger.error(e + " - Cause: " + e.getCause()); - response.add(new ServiceRestResponse(EsitoType.KO, configuration, e)); - + response.add(ServiceRestResponse.createNegativeResponse(configuration, e)); } catch (Exception e) { logger.error(request.getRequestURI(), e); - response.add(new ServiceRestResponse(EsitoType.KO, configuration, e)); + response.add(ServiceRestResponse.createNegativeResponse(configuration, e)); } + return response; } @@ -104,24 +105,6 @@ public class EmsEngineController { } } - @RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_REPORT_RESPONSE_ENTITY, method = RequestMethod.POST) - @ResponseBody - public ResponseEntity downloadReportResponseEntity(HttpServletRequest request, - @RequestParam(CommonConstants.PROFILE_DB) String configuration, - @RequestParam String fileName, - @RequestBody JasperDTO jasperDTO) throws Exception { - - byte[] bytes = emsEngineService.processReport(jasperDTO); - String mimeType = mimeTypesHandler.getContentType(fileName).toString(); - - return ResponseEntity.ok() - .contentType(MediaType.parseMediaType(mimeType)) - .contentLength(bytes != null ? bytes.length : 0) - .header("Content-Disposition", "attachment; filename=\"" + fileName + "\"") - .body(bytes); - } - - @RequestMapping(value = EmsRestConstants.PATH_PROCESS_REPORT_TYPE, method = RequestMethod.POST) public @ResponseBody ServiceRestResponse processReportTypeList(HttpServletRequest request,