From 2108428077506aa609c727627a074ba9fa8c2766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Mon, 25 Jul 2022 20:18:02 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EC=84=9C?= =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B5=AC=EC=84=B1=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasFlightController.java | 56 +++++-------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java index 6d7804b..80ab2f4 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java @@ -57,46 +57,31 @@ public class BasFlightController { // 비행계획서 조회 @GetMapping(value = "/plan/list") public ResponseEntity listPlan(BasFlightPlanListRq rq) { - Map resultMap = new HashMap(); List result = null; try { result = basFlightService.listPlan(rq); - resultMap.put("result", result); - - } catch (CustomException e) { - log.error("IGNORE : {}", e); - resultMap.put("result", false); - resultMap.put("errorCode", e.getErrorCode()); - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse>(result)); + return ResponseEntity.ok().body(new SuccessResponse<>(result)); } // 비행계획서 상세 조회 @GetMapping(value = "/plan/detail/{planSno}") public ResponseEntity detailPlan(@PathVariable("planSno") Integer planSno) { - Map resultMap = new HashMap(); + BasFlightPlanModel result = null; try { - BasFlightPlanModel result = basFlightService.detailPlan(planSno); - resultMap.put("result", result); - - } catch (CustomException e) { - log.error("IGNORE : {}", e); - resultMap.put("result", false); - resultMap.put("errorCode", e.getErrorCode()); - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + result = basFlightService.detailPlan(planSno); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(result)); } // 비행계획서 등록 @@ -119,7 +104,7 @@ public class BasFlightController { .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); } // 비행계획서 수정 @@ -141,7 +126,7 @@ public class BasFlightController { .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); } // 비행계획서 삭제 @@ -163,7 +148,7 @@ public class BasFlightController { .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); } // 비행계획서 승인/미승인 @@ -185,51 +170,38 @@ public class BasFlightController { .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); } // 그룹 조종사 조회 @GetMapping(value = "/plan/pilot/{groupId}") public ResponseEntity findPilot(@PathVariable("groupId") String groupId) { - Map resultMap = new HashMap(); + List result = null; try { - List result = basFlightService.listPilotByGroup(groupId); - resultMap.put("result", result); + result = basFlightService.listPilotByGroup(groupId); - } catch (CustomException e) { - log.error("IGNORE : {}", e); - resultMap.put("result", false); - resultMap.put("errorCode", e.getErrorCode()); - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(result)); } // 그룹 기체 조회 @GetMapping(value = "/plan/arcrft/{groupId}") public ResponseEntity findArcrft(@PathVariable("groupId") String groupId) { - Map resultMap = new HashMap(); + List result = null; try { - List result = basFlightService.listArcrftByGroup(groupId); - resultMap.put("result", result); - - } catch (CustomException e) { - log.error("IGNORE : {}", e); - resultMap.put("result", false); - resultMap.put("errorCode", e.getErrorCode()); - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + result = basFlightService.listArcrftByGroup(groupId); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(result)); } }