패키지 편경

pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java

@@ -24,17 +24,16 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import com.palnet.biz.api.bas.flight.dto.LanncPdfVO;
 import com.palnet.biz.api.bas.flight.service.BasFlightService;
+import com.palnet.biz.api.bas.flight.template.service.PdfService;
+import com.palnet.biz.api.bas.flight.template.vo.LanncPdfVO;
 import com.palnet.biz.api.comn.model.ComnPagingRs;
 import com.palnet.biz.api.comn.response.BasicResponse;
 import com.palnet.biz.api.comn.response.ErrorResponse;
 import com.palnet.biz.api.comn.response.SuccessResponse;
-import com.palnet.biz.jpa.entity.ComFileBas;
 import com.palnet.biz.scheduler.ctr.service.CtrTrnsLctnService;
 import com.palnet.comn.exception.CustomException;
 import com.palnet.comn.utils.AreaUtils;
-import com.palnet.comn.utils.PdfUtils;
 
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -51,15 +50,15 @@ public class BasFlightController {
     private final Environment env;
     private final CtrTrnsLctnService ctrTrnsLctnService;
     private final AreaUtils utils;
-    private final PdfUtils pdfUtils;    
+    private final PdfService pdfService;    
 
     @Autowired
-    public BasFlightController(BasFlightService basFlightService, Environment env, CtrTrnsLctnService ctrTrnsLctnService, AreaUtils AreaUtils, PdfUtils pdfUtils) {
+    public BasFlightController(BasFlightService basFlightService, Environment env, CtrTrnsLctnService ctrTrnsLctnService, AreaUtils AreaUtils, PdfService pdfService) {
         this.basFlightService = basFlightService;
         this.env = env;
         this.ctrTrnsLctnService = ctrTrnsLctnService;
         this.utils = AreaUtils;
-        this.pdfUtils = pdfUtils;
+        this.pdfService = pdfService;
     }
 
     @GetMapping("/area")
@@ -395,13 +394,13 @@ public class BasFlightController {
         
         String airUser = vo.getUserName();
         String etc = String.valueOf(System.currentTimeMillis()); // 동명이인 방지
-        String fileName = pdfUtils.getSaveName(airUser, etc);
+        String fileName = pdfService.getSaveName(airUser, etc);
 
         // PDF 생성 및 저장                
-        String htmlContent = pdfUtils.getHtmlToString(vo);
-        ComFileBas comFileBas = pdfUtils.generatePDF(htmlContent, fileName);
+        String htmlContent = pdfService.getHtmlToString(vo);
+        // ComFileBas comFileBas = pdfService.generatePDF(htmlContent, fileName);
 
-        pdfUtils.save(comFileBas);
+        // pdfService.save(comFileBas);
     }
 
 

pav-server/src/main/java/com/palnet/biz/api/bas/flight/template/service/PdfService.java

@@ -1,4 +1,4 @@
-package com.palnet.comn.utils;
+package com.palnet.biz.api.bas.flight.template.service;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -17,6 +17,7 @@ import javax.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
 
@@ -38,15 +39,16 @@ import com.itextpdf.tool.xml.pipeline.end.PdfWriterPipeline;
 import com.itextpdf.tool.xml.pipeline.html.HtmlPipeline;
 import com.itextpdf.tool.xml.pipeline.html.HtmlPipelineContext;
 import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
-import com.palnet.biz.api.bas.flight.dto.PdfBaseVO;
+import com.palnet.biz.api.bas.flight.template.vo.PdfBaseVO;
 import com.palnet.biz.jpa.entity.ComFileBas;
 import com.palnet.biz.jpa.repository.com.ComFileBasRepository;
+import com.palnet.comn.utils.InstantUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
-@Component
+@Service
 @Slf4j
-public class PdfUtils {
+public class PdfService {
     
     @Autowired
     private TemplateEngine templateEngine;

pav-server/src/main/java/com/palnet/biz/api/bas/flight/template/vo/LanncPdfVO.java

@@ -1,4 +1,4 @@
-package com.palnet.biz.api.bas.flight.dto;
+package com.palnet.biz.api.bas.flight.template.vo;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;

pav-server/src/main/java/com/palnet/biz/api/bas/flight/template/vo/PdfBaseVO.java

@@ -1,4 +1,4 @@
-package com.palnet.biz.api.bas.flight.dto;
+package com.palnet.biz.api.bas.flight.template.vo;
 
 import java.util.Map;