diff --git a/http/server/server.http b/http/server/server.http index a19a7e24..63754931 100644 --- a/http/server/server.http +++ b/http/server/server.http @@ -125,13 +125,10 @@ PATCH {{appHost}}/api/bas/dos/plan/reviewed Authorization: {{accessToken}} Content-Type: application/json -[ - { - "planAreaSno": 42, - "reviewedType": "W" - }, - { - "planAreaSno": "43", - "reviewedType": "C" - } -] \ No newline at end of file +{ + "planAreaSnoList": [ + 42, + 43 + ], + "reviewedType": "R" +} \ No newline at end of file diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/controller/BasDosController.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/controller/BasDosController.java index 09b3b675..6758c808 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/controller/BasDosController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/controller/BasDosController.java @@ -49,17 +49,18 @@ public class BasDosController { return ResponseEntity.ok().build(); } + /** + * 비행계획 검토 + * + * @param rq + * @return + */ @PatchMapping("/plan/reviewed") - public ResponseEntity updateDosPlanReviewed(@RequestBody List rqList) { - if (rqList == null || rqList.isEmpty()) { + public ResponseEntity updateDosPlanReviewed(@RequestBody DosBasPlanReviewedRq rq) { + if (rq == null || rq.getPlanAreaSnoList() == null || rq.getPlanAreaSnoList().isEmpty() || rq.getReviewedType() == null) { throw new CustomException(ErrorCode.NON_VALID_PARAMETER); } - rqList.forEach(rq -> { - if (rq.getReviewedType() == null) { - throw new CustomException(ErrorCode.NON_VALID_PARAMETER); - } - }); - basDosService.updatePlanReviewed(rqList); + basDosService.updatePlanReviewed(rq); return ResponseEntity.ok().build(); } @@ -85,6 +86,11 @@ public class BasDosController { basDosService.createPDF(rs); } + /** + * 한글 다운로드 + * + * @param rq + */ @GetMapping("/plan/download/han-com") public void downloadHanCom(BasDosPlanRq rq) { List rs = basDosService.getDosPlan(rq, PlanSelectType.DOWNLOAD); diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/DosBasPlanReviewedRq.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/DosBasPlanReviewedRq.java index 71a61807..ede64977 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/DosBasPlanReviewedRq.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/DosBasPlanReviewedRq.java @@ -6,15 +6,15 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor @Builder public class DosBasPlanReviewedRq { - // 비행계획일련번호 -// private Long planSno; // 비행구역일련번호 - private Long planAreaSno; + private List planAreaSnoList; // 검토 타입 private ReviewedType reviewedType; } diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java index b1ba0694..9154fbef 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java @@ -297,23 +297,23 @@ public class BasDosService { } } - // 검토 수정 - public void updatePlanReviewed(List rqList) { - List planAreaSnoList = rqList.stream().map(DosBasPlanReviewedRq::getPlanAreaSno).collect(Collectors.toList()); + /** + * 검토 수정 + * + * @param rq + */ + public void updatePlanReviewed(DosBasPlanReviewedRq rq) { + List planAreaSnoList = rq.getPlanAreaSnoList(); List planAreaList = dosFltPlanAreaRepository.findByPlanAreaSnoIn(planAreaSnoList); - if (planAreaList.isEmpty()) { - log.warn("update data is not found : {}", rqList); + if (planAreaList == null || planAreaList.isEmpty()) { + log.warn("update data is not found"); return; } - for (DosBasPlanReviewedRq rq : rqList) { - Optional optional = planAreaList.stream().filter(area -> area.getPlanAreaSno().equals(rq.getPlanAreaSno())).findFirst(); - if (optional.isPresent()) { - DosFltPlanArea area = optional.get(); - area.setReviewedType(rq.getReviewedType()); - } else { - log.warn("update data is not found : {}", rq); - } + + for (DosFltPlanArea area : planAreaList) { + area.setReviewedType(rq.getReviewedType()); } + dosFltPlanAreaRepository.saveAll(planAreaList); } @@ -338,7 +338,11 @@ public class BasDosService { }).collect(Collectors.toList()); } - // Excel 다운로드 + /** + * Excel 다운로드 + * + * @param rs + */ public void createExcel(List rs) { try (XSSFWorkbook workbook = new XSSFWorkbook()) { @@ -495,7 +499,11 @@ public class BasDosService { } } - // PDF 다운로드 + /** + * PDF 다운로드 + * + * @param rs + */ public void createPDF(List rs) { List validFlightList = new ArrayList<>(); @@ -632,7 +640,11 @@ public class BasDosService { return (int) ((pixelWidth / 6.0) * 256); } - // 한컴 생성 + /** + * 한글 다운로드 + * + * @param rs + */ public void createHanCom(List rs) {