비행운항목록 조건에 맞게 수정

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

@@ -324,12 +324,12 @@ public class MainDashController {
 	@GetMapping(value = "/dron-flight/list/")
 	@ApiOperation(value = "드론 별 비행운항 목록")
 	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
-	public ResponseEntity<? extends BasicResponse> dronFlightList(@RequestParam String groupId){		
+	public ResponseEntity<? extends BasicResponse> dronFlightList(@RequestParam String serviceType){		
 		
 		List<MainDashFlightListModel> result = null;
 
 		try {
-			result = service.mainDashDronFlightList(groupId);
+			result = service.mainDashDronFlightList(serviceType);
 		}catch (Exception e) {
 			log.error("IGNORE : {}", e);
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)

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

@@ -130,28 +130,32 @@ public class MainDashService {
 		return resultList;
 	}
 
-	public List<MainDashFlightListModel> mainDashDronFlightList(String groupId){
+	   public List<MainDashFlightListModel> mainDashDronFlightList(String serviceType){
-		
+		      
-		String userAuth = token.getUserAuthByToken();
+		      String cptAuth = token.getCptAuthCodeByToken();
-		List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
+		      List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
-		
+		      
-		BasGroupModel myFirstGroup = new BasGroupModel();
+		      BasGroupModel myFirstGroup = new BasGroupModel();
-		
+		      
-		List<MainDashFlightListModel> resultList = new ArrayList<MainDashFlightListModel>();
+		      List<MainDashFlightListModel> resultList = new ArrayList<MainDashFlightListModel>();
-		
+		      
-		if(userAuth.equals("SUPER")) {
+//		      cptAuth = "KAC";
-			
+		      
-			resultList = fltPlanQueryRepository.getFlightDronList("KAC", groupId);
+		      if(cptAuth.length() != 0) {
-			
+		         
-		}else {
+		         if(cptAuth.equals("KAC")) {
-			
+		            
-			myFirstGroup = ptyGroupQueryRepository.myFirstGroup(userGroupList);
+		            resultList = fltPlanQueryRepository.getFlightDronList(cptAuth, serviceType);
-			
+		            
-			resultList = fltPlanQueryRepository.getFlightDronList(myFirstGroup.getGroupId(), "all");
+		         }
-		}
+		         
-		
+		      }else {
-		return resultList;
+		            
-	}
+		            resultList = fltPlanQueryRepository.getFlightDronList(cptAuth, serviceType);
+		         }
+		      
+		      return resultList;
+		   }
 	
 	public Map<String, String> mainDashDronFlightStcs(){
 		

pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -1930,7 +1930,7 @@ public class FltPlanQueryRepository {
 
 
     
-    public List<MainDashFlightListModel> getFlightDronList(String orderBy, String groupId){
+    public List<MainDashFlightListModel> getFlightDronList(String cptAuth, String serviceType){
     	
     	QComIdntfBas cib = QComIdntfBas.comIdntfBas;
     	QFltPlanArcrft fpa = QFltPlanArcrft.fltPlanArcrft;
@@ -1940,14 +1940,18 @@ public class FltPlanQueryRepository {
     	QCtrCntrlBas ccb = QCtrCntrlBas.ctrCntrlBas;
 
     	Expression<Integer> groupOrder = new CaseBuilder()
-    		    .when(pgb.groupNm.eq(orderBy)).then(0)
+    		    .when(pgb.groupNm.eq(cptAuth)).then(0)
     		    .otherwise(1);
     	
     	BooleanBuilder builder = new BooleanBuilder();		
     	
-    	if(!groupId.equals("all")) {
+    	if(!serviceType.equals("all")) {
-    		builder.and(pgb.groupId.eq(groupId));
+    		builder.and(fpb.serviceType.contains(serviceType));
     	}
+    	
+    	if(!cptAuth.equals("KAC")) {
+    		builder.and(pgb.groupNm.eq("cptAuth"));
+		}
     	Instant now = Instant.now();
     	
     	Instant todayStart = LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC);