메소드 명 변경

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<? extends BasicResponse> kacDateStatistics(String date, @PathVariable String type){		
+	public ResponseEntity<? extends BasicResponse> 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<? extends BasicResponse> kacPlanAllowStatistics(String date ,@PathVariable String type){
+	public ResponseEntity<? extends BasicResponse> planAllowStatistics(String date ,@PathVariable String type){
 		
 		String[] formatParam = null;
 
@@ -209,7 +209,37 @@ public class MainDashController {
 		List<MainDashStcsModel> 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<List<MainDashStcsModel>>(result));
+	}
+
+	@GetMapping("/stcs/drone-flight/date/{type}")
+	@ApiOperation(value = "김포공항, 드론별 비행 통계")
+	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
+	@ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class)
+	public ResponseEntity<? extends BasicResponse> 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<MainDashStcsModel> result = null;
+
+		try {
+			result = service.mainStcsPlanAllow(date,formatParam);
 		} catch (Exception e) {
 
 			log.error("IGNORE : {}", e);

pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java

@@ -104,7 +104,7 @@ public class MainDashService {
 	 */
 	public List<MainDashStcsModel> mainKacDashStcsDay(String date, String[] formatParam){
 		
-		List<MainDashStcsModel> resultList = query.mainKacDashStcsDay(date, formatParam);		
+		List<MainDashStcsModel> resultList = query.mainStcsFlight(date, formatParam);		
 		
 		return resultList;
 	}
@@ -114,9 +114,9 @@ public class MainDashService {
 	 * @param yyyymm
 	 * @return
 	 */
-	public List<MainDashStcsModel> mainKacStcsPlanAllow(String date, String[] formatParam){
+	public List<MainDashStcsModel> mainStcsPlanAllow(String date, String[] formatParam){
 		
-		List<MainDashStcsModel> resultList = fltPlanQueryRepository.mainKacStcsPlanAllow(date, formatParam);		
+		List<MainDashStcsModel> resultList = fltPlanQueryRepository.mainStcsPlanAllow(date, formatParam);		
 
 		return resultList;
 	}

pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -1676,7 +1676,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 	 * @param yyyymm
 	 * @return
 	 */	
-	public List<MainDashStcsModel> mainKacDashStcsDay(String date, String[] formatParam){
+	public List<MainDashStcsModel> mainStcsFlight(String date, String[] formatParam){
 		QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas;
 		
 		StringTemplate formattedDate = Expressions.stringTemplate(

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<MainDashStcsModel> mainKacStcsPlanAllow(String date, String[] formatParam){
+    public List<MainDashStcsModel> mainStcsPlanAllow(String date, String[] formatParam){
         
         QFltPlanBas bas = QFltPlanBas.fltPlanBas;