From eadb1bfaee2f357023a7c98e3e20668401bb5d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?=
 <박재우@host.docker.internal>
Date: Wed, 15 Nov 2023 16:23:28 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9A=B4=ED=95=AD=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=EA=B1=B4=EC=97=90=20=EB=A7=9E=EA=B2=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dash/controller/MainDashController.java   |  4 +-
 .../main/dash/service/MainDashService.java    | 48 ++++++++++---------
 .../flt/FltPlanQueryRepository.java           | 12 +++--
 3 files changed, 36 insertions(+), 28 deletions(-)

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 cf4bde4..4ce48fd 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
@@ -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)
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 51fb56a..4322f81 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
@@ -130,28 +130,32 @@ public class MainDashService {
 		return resultList;
 	}
 
-	public List<MainDashFlightListModel> mainDashDronFlightList(String groupId){
-		
-		String userAuth = token.getUserAuthByToken();
-		List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
-		
-		BasGroupModel myFirstGroup = new BasGroupModel();
-		
-		List<MainDashFlightListModel> resultList = new ArrayList<MainDashFlightListModel>();
-		
-		if(userAuth.equals("SUPER")) {
-			
-			resultList = fltPlanQueryRepository.getFlightDronList("KAC", groupId);
-			
-		}else {
-			
-			myFirstGroup = ptyGroupQueryRepository.myFirstGroup(userGroupList);
-			
-			resultList = fltPlanQueryRepository.getFlightDronList(myFirstGroup.getGroupId(), "all");
-		}
-		
-		return resultList;
-	}
+	   public List<MainDashFlightListModel> mainDashDronFlightList(String serviceType){
+		      
+		      String cptAuth = token.getCptAuthCodeByToken();
+		      List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
+		      
+		      BasGroupModel myFirstGroup = new BasGroupModel();
+		      
+		      List<MainDashFlightListModel> resultList = new ArrayList<MainDashFlightListModel>();
+		      
+//		      cptAuth = "KAC";
+		      
+		      if(cptAuth.length() != 0) {
+		         
+		         if(cptAuth.equals("KAC")) {
+		            
+		            resultList = fltPlanQueryRepository.getFlightDronList(cptAuth, serviceType);
+		            
+		         }
+		         
+		      }else {
+		            
+		            resultList = fltPlanQueryRepository.getFlightDronList(cptAuth, serviceType);
+		         }
+		      
+		      return resultList;
+		   }
 	
 	public Map<String, String> mainDashDronFlightStcs(){
 		
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 6ff1309..9b7642e 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
@@ -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")) {
-    		builder.and(pgb.groupId.eq(groupId));
+    	if(!serviceType.equals("all")) {
+    		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);