From 2b76d6488ccadc1aba53231eb0692a7d37fbbc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?=
 <lkd9125@naver.com>
Date: Fri, 13 Oct 2023 19:01:33 +0900
Subject: [PATCH] =?UTF-8?q?files=20=EC=A0=80=EC=9E=A5=20=EA=B2=BD=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comn/file/service/ComnFileService.java    |  3 ++
 .../java/com/palnet/comn/utils/PdfUtils.java  | 52 ++++++++++---------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java
index 1b6da356..ada9e1c9 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java
@@ -51,6 +51,8 @@ public class ComnFileService {
 
     @Value("${base-url}")
     private String BASE_PATH;
+    
+    private final String NORMAL_FORDER_PATH = "normal/";
 
     /**
      * 파일명 만들기, 앞에 기본으로 금일 날짜있음
@@ -210,6 +212,7 @@ public class ComnFileService {
         String fileUrl = new StringBuilder()
             .append(absPath)
             .append(this.BASE_PATH)
+            .append(this.NORMAL_FORDER_PATH)
             .append(InstantUtils.toDateStringByFormat(Instant.now(), "yyyyMMdd"))
             .append("/")
             .toString();                                   
diff --git a/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java b/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java
index d9cda037..55fd54d5 100644
--- a/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java
+++ b/pav-server/src/main/java/com/palnet/comn/utils/PdfUtils.java
@@ -1,45 +1,43 @@
 package com.palnet.comn.utils;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.Instant;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.HtmlConverter;
 import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.layout.font.FontProvider;
+import com.palnet.biz.api.comn.file.constant.ExtensionConstant;
 import com.palnet.biz.api.comn.file.model.PdfBaseModel;
 import com.palnet.biz.jpa.entity.ComFileBas;
-import com.palnet.comn.code.ErrorCode;
-import com.palnet.comn.exception.CustomException;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.thymeleaf.TemplateEngine;
-import org.thymeleaf.context.Context;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.Instant;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
 
 @Slf4j
 @RequiredArgsConstructor
 @Component
 public class PdfUtils {
-
-    private final HttpServletResponse response;
+    
     private final TemplateEngine templateEngine;
-
+    
     @Value("${base-url}")
     private String BASE_PATH;
-
-    private final String FILE_EXTENSION = ".pdf";
+    
+    private final String PDF_FORDER_PATH = BASE_PATH + "od/";    
 
 
     /**
@@ -80,7 +78,13 @@ public class PdfUtils {
 
         ComFileBas result = new ComFileBas();
 
-        String pdfPath = this.BASE_PATH + InstantUtils.toDateStringByFormat(Instant.now(), "yyyyMMdd") + "/";
+        String pdfPath = new StringBuilder()
+        .append(this.BASE_PATH)
+        .append(this.PDF_FORDER_PATH)
+        .append(InstantUtils.toDateStringByFormat(Instant.now(), "yyyyMMdd"))
+        .append("/")
+        .toString();
+
         String pdfFilePath = pdfPath + fileName;
 
         File path = new File(pdfPath);
@@ -145,7 +149,7 @@ public class PdfUtils {
 
         result.setFileGroupNo(0);
         result.setFilePath(pdfPath);
-        result.setFileExt(this.FILE_EXTENSION);
+        result.setFileExt(ExtensionConstant.PDF.extension);
         result.setCreateDt(Instant.now());
         result.setFileSaveNm(fileName);
         result.setFileOriNm(fileName);