diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java index df2fbdcc..a9a8ffe9 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java @@ -164,7 +164,7 @@ public class MainDashController { @ApiOperation(value = "김포공항, 비행실적 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class) - public ResponseEntity kacDateStatistics(String date, @PathVariable String type){ + public ResponseEntity flightStatistics(String date, @PathVariable String type){ String[] formatParam = null; @@ -194,7 +194,7 @@ public class MainDashController { @ApiOperation(value = "김포공항, 비행승인 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class) - public ResponseEntity kacPlanAllowStatistics(String date ,@PathVariable String type){ + public ResponseEntity planAllowStatistics(String date ,@PathVariable String type){ String[] formatParam = null; @@ -209,7 +209,37 @@ public class MainDashController { List result = null; try { - result = service.mainKacStcsPlanAllow(date,formatParam); + result = service.mainStcsPlanAllow(date,formatParam); + } 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)); + } + + @GetMapping("/stcs/drone-flight/date/{type}") + @ApiOperation(value = "김포공항, 드론별 비행 통계") + @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") + @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class) + public ResponseEntity droneFlightStatistics(String date, String idntfNum, @PathVariable String type){ + + String[] formatParam = null; + + try { + if(date == null) date = ""; + formatParam = service.paramCheck(date,type); + } catch (NumberFormatException e) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + List result = null; + + try { + result = service.mainStcsPlanAllow(date,formatParam); } catch (Exception e) { log.error("IGNORE : {}", e); diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java index e0c2cfe7..a37a4f85 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java @@ -104,7 +104,7 @@ public class MainDashService { */ public List mainKacDashStcsDay(String date, String[] formatParam){ - List resultList = query.mainKacDashStcsDay(date, formatParam); + List resultList = query.mainStcsFlight(date, formatParam); return resultList; } @@ -114,9 +114,9 @@ public class MainDashService { * @param yyyymm * @return */ - public List mainKacStcsPlanAllow(String date, String[] formatParam){ + public List mainStcsPlanAllow(String date, String[] formatParam){ - List resultList = fltPlanQueryRepository.mainKacStcsPlanAllow(date, formatParam); + List resultList = fltPlanQueryRepository.mainStcsPlanAllow(date, formatParam); return resultList; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index e23ffb13..485bb68b 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1676,7 +1676,7 @@ public List listCntrlHstry(String id){ * @param yyyymm * @return */ - public List mainKacDashStcsDay(String date, String[] formatParam){ + public List mainStcsFlight(String date, String[] formatParam){ QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; StringTemplate formattedDate = Expressions.stringTemplate( diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index dcc31f3f..4a6e053a 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -672,7 +672,7 @@ public class FltPlanQueryRepository { * @param date * @return */ - public List mainKacStcsPlanAllow(String date, String[] formatParam){ + public List mainStcsPlanAllow(String date, String[] formatParam){ QFltPlanBas bas = QFltPlanBas.fltPlanBas;