통계패키지 모델 이동

pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java

@@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.palnet.biz.api.comn.response.BasicResponse;
 import com.palnet.biz.api.comn.response.ErrorResponse;
 import com.palnet.biz.api.comn.response.SuccessResponse;
-import com.palnet.biz.api.main.dash.model.FlightStaticStcsModel;
-import com.palnet.biz.api.main.dash.model.FlightStcsModel;
 import com.palnet.biz.api.main.dash.model.MainDashListModel;
 import com.palnet.biz.api.main.dash.model.MainDashStcsModel;
 import com.palnet.biz.api.main.dash.service.MainDashService;

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

@@ -1,7 +1,6 @@
 package com.palnet.biz.api.main.dash.service;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,11 +16,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.palnet.biz.api.main.dash.model.FlightStaticStcsModel;
 import com.palnet.biz.api.main.dash.model.MainDashListModel;
 import com.palnet.biz.api.main.dash.model.MainDashStcsModel;
-import com.palnet.biz.jpa.entity.type.WarnType;
-import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository;
 import com.palnet.biz.jpa.repository.flt.FltPlanQueryRepository;
 

pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java

@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.palnet.biz.api.comn.response.BasicResponse;
 import com.palnet.biz.api.comn.response.ErrorResponse;
 import com.palnet.biz.api.comn.response.SuccessResponse;
-import com.palnet.biz.api.main.dash.model.FlightStaticStcsModel;
-import com.palnet.biz.api.main.dash.model.FlightStcsModel;
+import com.palnet.biz.api.main.statistics.model.FlightStaticStcsModel;
+import com.palnet.biz.api.main.statistics.model.FlightStcsModel;
 import com.palnet.biz.api.main.statistics.service.MainStatisticsService;
 
 import io.swagger.annotations.ApiImplicitParam;
@@ -34,7 +34,7 @@ public class MainStatisticsController {
 
     private final MainStatisticsService service;
 
-    @GetMapping("/stcs/flight-static")
+    @GetMapping("/flight-static")
 	@ApiOperation(value = "비행통계 상단 데이터[DB전체 통계데이터]")
 	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")	
 	public ResponseEntity<? extends BasicResponse> fltStcsStatic(){
@@ -54,7 +54,7 @@ public class MainStatisticsController {
 		return ResponseEntity.ok().body(new SuccessResponse<List<FlightStaticStcsModel>>(result));
 	}
 	
-	@GetMapping("/stcs/flight/{type}")	
+	@GetMapping("/flight/{type}")	
 	@ApiOperation(value = "비행통계 cate = ['TIME', 'DISTANCE','FLT_COUNT'], type=['year','month','day','one-day']")
 	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")	
 	@ApiImplicitParams({
@@ -91,7 +91,7 @@ public class MainStatisticsController {
 
 
 
-	@GetMapping("/stcs/warn-static")
+	@GetMapping("/warn-static")
 	@ApiOperation(value = "비정상 상황 상단 데이터[DB전체 통계데이터]")
 	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")	
 	public ResponseEntity<? extends BasicResponse> warnStcsStatic(){
@@ -111,7 +111,7 @@ public class MainStatisticsController {
 		return ResponseEntity.ok().body(new SuccessResponse<List<FlightStaticStcsModel>>(result));
 	}
 	
-	@GetMapping("/stcs/warn/{type}")	
+	@GetMapping("/warn/{type}")	
 	@ApiOperation(value = "비정상상황 cate = ['PLAN' ,'ALTITUDE', 'CRASH'], type=['year','month','day','one-day']")
 	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")	
 	@ApiImplicitParams({

pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStaticStcsModel.java

@@ -1,4 +1,4 @@
-package com.palnet.biz.api.main.dash.model;
+package com.palnet.biz.api.main.statistics.model;
 
 import lombok.Data;
 

pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStcsModel.java

@@ -1,4 +1,4 @@
-package com.palnet.biz.api.main.dash.model;
+package com.palnet.biz.api.main.statistics.model;
 
 import java.util.List;
 

pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
-import com.palnet.biz.api.main.dash.model.FlightStaticStcsModel;
+import com.palnet.biz.api.main.statistics.model.FlightStaticStcsModel;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository;
 
 import lombok.RequiredArgsConstructor;

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

@@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.palnet.biz.api.main.dash.model.FlightStaticStcsModel;
 import com.palnet.biz.jpa.entity.CtrCntrlBas;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -28,7 +28,7 @@ import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel;
 import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlEndModel;
 import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlGroupArcrftModel;
 import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlGroupModel;
-import com.palnet.biz.api.main.dash.model.FlightStaticStcsModel;
+import com.palnet.biz.api.main.statistics.model.FlightStaticStcsModel;
 import com.palnet.biz.api.main.dash.model.MainDashStcsModel;
 import com.palnet.biz.jpa.entity.ComArcrftBas;
 import com.palnet.biz.jpa.entity.ComIdntfBas;