From 9a00161ce6cd8e6d719676bbabb359927dc349f2 Mon Sep 17 00:00:00 2001 From: lkd9125 Date: Thu, 21 Sep 2023 11:35:32 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=ED=8B=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/controller/BasFlightController.java | 8 +++++++- .../bas/flight/service/BasFlightService.java | 18 +++++++++++++++++- .../repository/com/ComFileBasRepository.java | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java index d2ad9bb..f693049 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java @@ -10,6 +10,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletResponse; + import com.palnet.biz.api.bas.flight.model.*; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; @@ -388,7 +390,7 @@ public class BasFlightController { } } - @PostMapping("/lance-pdf/create") + @PostMapping("/laanc-pdf/create") @Tag(name = "비행계획서", description = "비행계획서 관련 API") @ApiOperation(value = "Lannc 공문 PDF생성") public void createLancePDF(@RequestBody LanncPdfVO vo) { @@ -404,6 +406,10 @@ public class BasFlightController { pdfUtils.save(comFileBas); } + @GetMapping("/laanc-pdf/download") + public void downloadPDF(int fileSno, HttpServletResponse response){ + basFlightService.fileDownload(fileSno, response); + } } diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index ee89363..d037bbe 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -11,8 +11,11 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; + import com.palnet.biz.api.bas.flight.model.*; import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; @@ -30,11 +33,13 @@ import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; import com.palnet.biz.api.comn.model.ComnPagingRs; +import com.palnet.biz.jpa.entity.ComFileBas; import com.palnet.biz.jpa.entity.FltPlanArcrft; import com.palnet.biz.jpa.entity.FltPlanArea; import com.palnet.biz.jpa.entity.FltPlanAreaCoord; import com.palnet.biz.jpa.entity.FltPlanBas; import com.palnet.biz.jpa.entity.FltPlanPilot; +import com.palnet.biz.jpa.repository.com.ComFileBasRepository; import com.palnet.biz.jpa.repository.flt.FltPlanArcrftRepository; import com.palnet.biz.jpa.repository.flt.FltPlanAreaCoordRepository; import com.palnet.biz.jpa.repository.flt.FltPlanAreaRepository; @@ -67,6 +72,7 @@ public class BasFlightService { private final FltPlanPilotRepository fltPlanPilotRepository; private final FltPlanQueryRepository fltPlanQueryRepository; private final PtyGroupQueryRepository ptyPlanQueryRepository; + private final ComFileBasRepository comFileBasRepository; private final JwtTokenUtil jwtTokenUtil; private final AreaUtils areaUtils; @@ -78,7 +84,8 @@ public class BasFlightService { FltPlanQueryRepository fltPlanQueryRepository, PtyGroupQueryRepository ptyPlanQueryRepository, JwtTokenUtil jwtTokenUtil, - AreaUtils areaUtils) { + AreaUtils areaUtils, + ComFileBasRepository comFileBasRepository) { this.fltPlanBasRepository = fltPlanBasRepository; this.fltPlanArcrftRepository = fltPlanArcrftRepository; this.fltPlanAreaRepository = fltPlanAreaRepository; @@ -88,6 +95,7 @@ public class BasFlightService { this.ptyPlanQueryRepository = ptyPlanQueryRepository; this.jwtTokenUtil = jwtTokenUtil; this.areaUtils = areaUtils; + this.comFileBasRepository = comFileBasRepository; } // 비행계획서 조회 @@ -747,4 +755,12 @@ public class BasFlightService { return jsonObject; } + + public void fileDownload(int fileSno, HttpServletResponse response) throws CustomException{ + + ComFileBas comFileBas = comFileBasRepository.findById(fileSno).orElse(null); + if(comFileBas == null) throw new CustomException(ErrorCode.DATA_NOTFIND); + + + } } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComFileBasRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComFileBasRepository.java index db35bd9..552c662 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComFileBasRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComFileBasRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import com.palnet.biz.jpa.entity.ComFileBas; @Repository -public interface ComFileBasRepository extends JpaRepository{ +public interface ComFileBasRepository extends JpaRepository{ public ComFileBas findFirstByOrderByFileSnoDesc(); }