Merge pull request #162 from AppLinkers/develop

Deploy for thumbnail Image
AppLinkers · Jan 9, 2024 · 271e417 · 271e417
2 parents 34f67fd + b93998d
commit 271e417
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -65,6 +65,12 @@ dependencies {
 	// aspose-cad
 	implementation 'com.aspose:aspose-cad:23.7'
 
+	// imgscalr
+	implementation 'org.imgscalr:imgscalr-lib:4.2'
+
+	// apache PDFBox
+	implementation 'org.apache.pdfbox:pdfbox:3.0.0'
+
 	// test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 

diff --git a/src/main/java/com/laser/ordermanage/common/exception/GlobalExceptionHandler.java b/src/main/java/com/laser/ordermanage/common/exception/GlobalExceptionHandler.java
@@ -26,6 +26,7 @@ public class GlobalExceptionHandler {
 
     @ExceptionHandler(Exception.class)
     public ResponseEntity<?> handleUnknownException(Exception e) {
+        e.printStackTrace();
         CustomCommonException exception = new CustomCommonException(CommonErrorCode.UNKNOWN_ERROR);
         return exception.toErrorResponse();
     }

diff --git a/src/main/java/com/laser/ordermanage/common/util/ImageUtil.java b/src/main/java/com/laser/ordermanage/common/util/ImageUtil.java
@@ -0,0 +1,36 @@
+package com.laser.ordermanage.common.util;
+
+import com.laser.ordermanage.common.exception.CommonErrorCode;
+import com.laser.ordermanage.common.exception.CustomCommonException;
+import org.imgscalr.Scalr;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+public class ImageUtil {
+
+    private ImageUtil() {
+
+    }
+
+    public static String extractThumbnail(MultipartFile multipartFile, String tempFolderPath) {
+        try {
+            // MultipartFile to BufferedImage
+            BufferedImage bufferedImage = ImageIO.read(multipartFile.getInputStream());
+
+            // resize image
+            BufferedImage resizedImage = Scalr.resize(bufferedImage, Scalr.Method.AUTOMATIC, Scalr.Mode.FIT_EXACT, 500, 500, Scalr.OP_ANTIALIAS);
+
+            String filePath = tempFolderPath + FileUtil.getFileNameWithoutExtension(multipartFile) + "-thumbnail.png";
+
+            ImageIO.write(resizedImage, "png", new File(filePath));
+
+            return filePath;
+        } catch (IOException e) {
+            throw new CustomCommonException(CommonErrorCode.UNABLE_TO_EXTRACT_THUMBNAIL);
+        }
+    }
+}
diff --git a/src/main/java/com/laser/ordermanage/common/util/PDFUtil.java b/src/main/java/com/laser/ordermanage/common/util/PDFUtil.java
@@ -0,0 +1,50 @@
+package com.laser.ordermanage.common.util;
+
+import com.laser.ordermanage.common.exception.CommonErrorCode;
+import com.laser.ordermanage.common.exception.CustomCommonException;
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.imgscalr.Scalr;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+
+public class PDFUtil {
+
+    private PDFUtil() {
+
+    }
+
+    public static String extractThumbnail(MultipartFile multipartFile, String tempFolderPath) {
+        try {
+            // 일시적인 파일 생성
+            Path tempFile = Files.createTempFile("uploadedDrawing-", ".pdf");
+            Files.copy(multipartFile.getInputStream(), tempFile, StandardCopyOption.REPLACE_EXISTING);
+
+            try (PDDocument document = Loader.loadPDF(tempFile.toFile())) {
+                PDFRenderer renderer = new PDFRenderer(document);
+                BufferedImage originalImage = renderer.renderImageWithDPI(0, 300);
+
+                // 이미지 크기 조정
+                BufferedImage resizedImage = Scalr.resize(originalImage, Scalr.Method.AUTOMATIC, Scalr.Mode.FIT_EXACT, 500, 500, Scalr.OP_ANTIALIAS);
+
+                String filePath = tempFolderPath + FileUtil.getFileNameWithoutExtension(multipartFile) + "-thumbnail.png";
+                ImageIO.write(resizedImage, "png", new File(filePath));
+
+                // 임시 파일 삭제
+                Files.deleteIfExists(tempFile);
+
+                return filePath;
+            }
+        } catch (IOException e) {
+            throw new CustomCommonException(CommonErrorCode.UNABLE_TO_EXTRACT_THUMBNAIL);
+        }
+    }
+}
diff --git a/src/main/java/com/laser/ordermanage/order/api/DrawingAPI.java b/src/main/java/com/laser/ordermanage/order/api/DrawingAPI.java
@@ -14,6 +14,8 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+
 @Validated
 @RequiredArgsConstructor
 @RequestMapping("/drawing")
@@ -30,7 +32,7 @@ public class DrawingAPI {
      * - 썸네일 이미지 파일 AWS S3 에 업로드
      */
     @PostMapping("")
-    public ResponseEntity<?> uploadDrawingFile(@RequestParam @ValidFile(message = "도면 파일은 필수 입력값입니다.") MultipartFile file) {
+    public ResponseEntity<?> uploadDrawingFile(@RequestParam @ValidFile(message = "도면 파일은 필수 입력값입니다.") MultipartFile file) throws IOException {
         // File 확장자 확인
         DrawingFileType fileType = DrawingFileType.ofExtension(FileUtil.getExtension(file));
 
@@ -39,19 +41,11 @@ public ResponseEntity<?> uploadDrawingFile(@RequestParam @ValidFile(message = "
         // 도면 파일 업로드
         String drawingFileUrl = drawingService.uploadDrawingFile(file);
 
-        String thumbnailUrl;
-        if (fileType.equals(DrawingFileType.DWG) || fileType.equals(DrawingFileType.DXF)) {
-            // 썸네일 추출
-            String tempThumbnailFilePath = drawingService.extractThumbnail(file);
-
-            // 썸네일 파일 업로드
-            thumbnailUrl = drawingService.uploadThumbnailFile(tempThumbnailFilePath);
+        // 썸네일 추출
+        String tempThumbnailFilePath = drawingService.extractThumbnail(file, fileType);
 
-        } else {
-            // TODO: pdf, png, jpg, jpeg 파일 썸네일 추출 기능
-            // 썸네일 파일 업로드
-            thumbnailUrl = "https://ordermanage-drawing.s3.ap-northeast-2.amazonaws.com/ce429eb7-3319-45ba-b0b9-48bc6c77cf79_exception.png";
-        }
+        // 썸네일 파일 업로드
+        String thumbnailUrl = drawingService.uploadThumbnailFile(tempThumbnailFilePath);
 
         UploadDrawingFileResponse uploadDrawingFileResponse = UploadDrawingFileResponse.builder()
                 .thumbnailUrl(thumbnailUrl)

diff --git a/src/main/java/com/laser/ordermanage/order/service/DrawingService.java b/src/main/java/com/laser/ordermanage/order/service/DrawingService.java
@@ -3,8 +3,11 @@
 import com.laser.ordermanage.common.cloud.aws.S3Service;
 import com.laser.ordermanage.common.exception.CustomCommonException;
 import com.laser.ordermanage.common.util.CADUtil;
+import com.laser.ordermanage.common.util.ImageUtil;
+import com.laser.ordermanage.common.util.PDFUtil;
 import com.laser.ordermanage.order.domain.Drawing;
 import com.laser.ordermanage.order.domain.Order;
+import com.laser.ordermanage.order.domain.type.DrawingFileType;
 import com.laser.ordermanage.order.exception.OrderErrorCode;
 import com.laser.ordermanage.order.repository.DrawingRepository;
 import lombok.RequiredArgsConstructor;
@@ -34,8 +37,13 @@ public Integer countDrawingByOrder(Order order) {
         return drawingRepository.countByOrder(order);
     }
 
-    public String extractThumbnail(MultipartFile multipartFile) {
-        return CADUtil.extractThumbnail(multipartFile, tempFolderPath);
+    public String extractThumbnail(MultipartFile multipartFile, DrawingFileType fileType) {
+        return switch (fileType) {
+            case DWG, DXF -> CADUtil.extractThumbnail(multipartFile, tempFolderPath);
+            case PDF -> PDFUtil.extractThumbnail(multipartFile, tempFolderPath);
+            // PNG, JPG, JPEG
+            default -> ImageUtil.extractThumbnail(multipartFile, tempFolderPath);
+        };
     }
 
     public String uploadDrawingFile(MultipartFile multipartFile) {