|
|
|
@ -57,46 +57,31 @@ public class BasFlightController {
|
|
|
|
|
// 비행계획서 조회
|
|
|
|
|
@GetMapping(value = "/plan/list") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> listPlan(BasFlightPlanListRq rq) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
List<BasFlightPlanModel> 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<Map>(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<List<BasFlightPlanModel>>(result)); |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(result)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 비행계획서 상세 조회
|
|
|
|
|
@GetMapping(value = "/plan/detail/{planSno}") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> detailPlan(@PathVariable("planSno") Integer planSno) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
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<Map>(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<Map>(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<Map>(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<Map>(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<Map>(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<Map>(resultMap)); |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// 그룹 조종사 조회
|
|
|
|
|
@GetMapping(value = "/plan/pilot/{groupId}") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> findPilot(@PathVariable("groupId") String groupId) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
List<BasFlightPlanPilotModel> result = null; |
|
|
|
|
try { |
|
|
|
|
List<BasFlightPlanPilotModel> 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<Map>(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<Map>(resultMap)); |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(result)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// 그룹 기체 조회
|
|
|
|
|
@GetMapping(value = "/plan/arcrft/{groupId}") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> findArcrft(@PathVariable("groupId") String groupId) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
List<BasFlightPlanArcrftModel> result = null; |
|
|
|
|
try { |
|
|
|
|
List<BasFlightPlanArcrftModel> 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<Map>(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<Map>(resultMap)); |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(result)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|