Cambiata risposta downloadStbActivityFileAttachment

This commit is contained in:
2025-12-03 11:12:47 +01:00
parent b50c348528
commit 8312d48970

View File

@@ -698,13 +698,10 @@ public class DocumentController {
} }
@RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_STB_ACTIVITY_FILE_ATTACHMENT, method = RequestMethod.GET) @RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_STB_ACTIVITY_FILE_ATTACHMENT, method = RequestMethod.GET)
public byte[] downloadStbActivityFileAttachment(HttpServletRequest request, HttpServletResponse response, public ResponseEntity<byte[]> downloadStbActivityFileAttachment(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam String id, @RequestParam String id,
@RequestParam String fileName, @RequestParam String fileName,
@RequestParam(defaultValue = "false") boolean requestThumbnail) { @RequestParam(defaultValue = "false") boolean requestThumbnail) throws Exception {
try {
StbActivityFile stbActivityFile = new StbActivityFile() StbActivityFile stbActivityFile = new StbActivityFile()
.setId(id) .setId(id)
.setFileName(fileName); .setFileName(fileName);
@@ -715,19 +712,20 @@ public class DocumentController {
if (stbActivityFile != null) { if (stbActivityFile != null) {
byte[] byteArr = requestThumbnail && stbActivityFile.getThumbnail() != null ? stbActivityFile.getThumbnail() : stbActivityFile.getContent(); byte[] byteArr = requestThumbnail && stbActivityFile.getThumbnail() != null ? stbActivityFile.getThumbnail() : stbActivityFile.getContent();
response.setContentType(mimetypesFileTypeMap.getContentType(stbActivityFile.getFileName()).toString()); MediaType mediaType = mimetypesFileTypeMap.getContentType(stbActivityFile.getFileName());
response.setStatus(HttpServletResponse.SC_OK);
response.addHeader("Content-Disposition", "attachment; filename=\"" + stbActivityFile.getFileName() + "\""); return ResponseEntity.ok()
response.setContentLength(byteArr != null ? byteArr.length : 0); .contentType(mediaType)
return byteArr; .contentLength(byteArr.length)
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition
.builder("attachment")
.filename(stbActivityFile.getFileName())
.build()
.toString())
.body(byteArr);
} }
response.sendError(404, "Allegato non trovato"); return ResponseEntity.notFound().build();
return null;
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
return null;
}
} }
@RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_STB_ACTIVITY_FILE_ATTACHMENT + "/{id}/{fileName}", method = RequestMethod.GET) @RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_STB_ACTIVITY_FILE_ATTACHMENT + "/{id}/{fileName}", method = RequestMethod.GET)