From edb70d1d900e48c121a50fd146f022721b28a9e0 Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 2 Aug 2023 10:24:31 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20PDF=EB=B7=B0=EC=96=B4=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/util/PdfUtil.java | 6 ++-- .../cmm/web/EgovFileDownloadController.java | 4 +-- .../let/mjo/msg/web/MjonMsgController.java | 25 +++++++++++++-- .../WEB-INF/jsp/cmm/fms/EgovMberFileList.jsp | 2 +- .../cmm/uss/umt/EgovMberCmpHstListByType.jsp | 24 +++++++------- .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp | 32 ++++++++++++++----- 6 files changed, 65 insertions(+), 28 deletions(-) diff --git a/src/main/java/itn/com/cmm/util/PdfUtil.java b/src/main/java/itn/com/cmm/util/PdfUtil.java index a5a4cf73..5be56982 100644 --- a/src/main/java/itn/com/cmm/util/PdfUtil.java +++ b/src/main/java/itn/com/cmm/util/PdfUtil.java @@ -110,7 +110,7 @@ public final class PdfUtil { File imgFiles = new File(imgDir + "." +extsn); Image img = ImageIO.read(imgFiles); - PDPage page = new PDPage(PDRectangle.A2); + PDPage page = new PDPage(PDRectangle.A4); doc.addPage(page); PDImageXObject pdImage = PDImageXObject.createFromFile(imgFiles.toString(), doc); @@ -131,8 +131,8 @@ public final class PdfUtil { PDPageContentStream contents = new PDPageContentStream(doc, page); contents.drawImage(pdImage, pageWidthPosition, pageHeightPosition, imgWidth, imgHeight); contents.close(); - doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf"); - //doc.save("C:/TEST/" + uuid + ".pdf"); + //doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf"); + doc.save("C:/TEST/" + uuid + ".pdf"); } catch (Exception e) { System.out.println("Exception! : " + e.getMessage()); diff --git a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java index 36bc34e8..7f0a748a 100644 --- a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java +++ b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java @@ -466,8 +466,8 @@ public class EgovFileDownloadController { try { - File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm); - //File uFile = new File("C:/TEST/", fileNm); + //File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm); + File uFile = new File("C:/TEST/", fileNm); long fSize = uFile.length(); diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java index c6c23fac..a4b2a207 100644 --- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java +++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java @@ -5049,13 +5049,22 @@ public class MjonMsgController { FileVO fvo = fileService.selectFileInf(fileVO); String path = ""; + String fileType = ""; + String[] imgExtArray = {"bmp", "gif", "jpeg", "jpg", "png", "tif", "tiff", "psd", "rle"}; + List imgExtList = new ArrayList<>(Arrays.asList(imgExtArray)); if(fvo != null) { if("pdf".equals(fvo.getFileExtsn())) { path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn(); - }else { + fileType = "pdf"; + } else if(imgExtList.contains(fvo.getFileExtsn())) { String storePath = fvo.getFileStreCours() + fvo.getStreFileNm(); path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn()); + fileType = "img"; + } else { + String storePath = fvo.getFileStreCours() + fvo.getStreFileNm(); + path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn()); + fileType = "etc"; } } @@ -5066,6 +5075,8 @@ public class MjonMsgController { String hstMbtlNum = request.getParameter("hstMbtlNum"); model.addAttribute("pdfPath", path); + model.addAttribute("fileType", fileType); + model.addAttribute("atchFileId", fileVO.getAtchFileId()); model.addAttribute("mberNm", mberNm); model.addAttribute("bizNo", bizNo); model.addAttribute("ceoNm", ceoNm); @@ -5080,17 +5091,27 @@ public class MjonMsgController { FileVO fvo = fileService.selectFileInf(fileVO); String path = ""; + String fileType = ""; + String[] imgExtArray = {"bmp", "gif", "jpeg", "jpg", "png", "tif", "tiff", "psd", "rle"}; + List imgExtList = new ArrayList<>(Arrays.asList(imgExtArray)); if(fvo != null) { if("pdf".equals(fvo.getFileExtsn())) { path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn(); - }else { + fileType = "pdf"; + } else if(imgExtList.contains(fvo.getFileExtsn())) { String storePath = fvo.getFileStreCours() + fvo.getStreFileNm(); path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn()); + fileType = "img"; + } else { + String storePath = fvo.getFileStreCours() + fvo.getStreFileNm(); + path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn()); + fileType = "etc"; } } model.addAttribute("pdfPath", path); + model.addAttribute("fileType", fileType); return "/uss/ion/msg/pdfView"; } diff --git a/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovMberFileList.jsp b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovMberFileList.jsp index af8d75bb..9e28c4a3 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovMberFileList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovMberFileList.jsp @@ -33,7 +33,7 @@ - ','')" class="fileName" title="다운로드">첨부파일 + ','')" class="fileName" title="다운로드">첨부파일 diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp index 3cce2e5b..b54dbba6 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp @@ -30,9 +30,9 @@ function pdfViewPop(atchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum) { document.pdfForm.hstManagerNm.value = hstManagerNm; document.pdfForm.hstMbtlNum.value = hstMbtlNum; document.pdfForm.fileSn.value = 0; - window.open("about:blank", 'taxListPopup', 'width=1020, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=no, location=no, scrollbars=yes'); + window.open("about:blank", 'pdfPopup', 'width=1020, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=no, location=no, scrollbars=no'); document.pdfForm.action = ""; - document.pdfForm.target = "taxListPopup"; + document.pdfForm.target = "pdfPopup"; document.pdfForm.submit(); } @@ -300,7 +300,7 @@ function fnSetCalMonth(val) { -
+ @@ -478,29 +478,29 @@ function fnSetCalMonth(val) { - + - <%-- + + - + - --%> + - + - <%-- - + - + - --%> + diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp index 19a260d1..a42fca9b 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp @@ -26,13 +26,21 @@ - - - - + + + + - - + + + + + @@ -67,7 +75,15 @@ - + +
+ PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.   + + + +
+ +
@@ -86,7 +102,7 @@ var pageNum = 1; var pageRendering = false; var pageNumPending = null; - var scale = 0.8; + var scale = 1.4; var canvas = document.getElementById('the-canvas'); var ctx = canvas.getContext('2d'); /* var url = '/cmm/fms/FileDown.do?atchFileId=FILE_000000000019061&fileSn=0'; */