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

@@ -16,6 +16,7 @@ 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.MainDashFlightListModel;
 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;
@@ -300,7 +301,23 @@ public class MainDashController {
 		return ResponseEntity.ok().body(new SuccessResponse<List<MainDashStcsModel>>(result));
 	}
 	
+	@GetMapping(value = "/dron-flight/list/")
+	@ApiOperation(value = "드론 별 비행운항 목록")
+	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
+	public ResponseEntity<? extends BasicResponse> dronFlightList(@RequestParam String groupId){		
+		
+		List<MainDashFlightListModel> result = null;
+
+		try {
+			result = service.mainDashDronFlightList(groupId);
+		}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<MainDashFlightListModel>>(result));
+	}
 
 
 	

pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashFlightListModel.java

@@ -0,0 +1,24 @@
+package com.palnet.biz.api.main.dash.model;
+
+import java.time.Instant;
+
+import lombok.Data;
+
+@Data
+public class MainDashFlightListModel {
+
+	private String groupNm;
+	
+	private String memberName;
+	
+	private String idntfNum;
+	
+	private Instant schFltStDt;
+	
+	private Instant schFltEndDt;
+	
+	private Object totalFlightTime;
+	
+	private String status;
+	
+}

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

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel;
+import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
 import com.palnet.biz.api.bas.group.model.BasGroupModel;
 import com.palnet.biz.jpa.repository.pty.*;
 
@@ -16,9 +18,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.palnet.biz.api.main.dash.model.MainDashFlightListModel;
 import com.palnet.biz.api.main.dash.model.MainDashListModel;
 import com.palnet.biz.api.main.dash.model.MainDashStcsModel;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository;
+import com.palnet.biz.jpa.repository.flt.FltPlanArcrftRepository;
 import com.palnet.biz.jpa.repository.flt.FltPlanQueryRepository;
 
 @Service
@@ -39,7 +43,11 @@ public class MainDashService {
 	@Autowired
 	private CtrCntrlQueryRepository query;	
 
+	@Autowired
+	private FltPlanArcrftRepository fltPlanArcrftRepository;
 	
+	@Autowired
+	private JwtTokenUtil token;
 	
 	
 	/**
@@ -112,6 +120,31 @@ public class MainDashService {
 		return resultList;
 	}
 
+	public List<MainDashFlightListModel> mainDashDronFlightList(String groupId){
+		
+		String userAuth = token.getUserAuthByToken();
+		List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
+		
+		
+		log.info(">>>>>>>>> groupList {} " , userAuth);
+		
+		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;
+	}
 	/**
 	 * 김포공항, 비행승인 통계
 	 * @param yyyymm

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

@@ -24,6 +24,7 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanPilotModel;
 import com.palnet.biz.api.bas.flight.model.BasFlightScheduleRs;
 import com.palnet.biz.api.comn.file.service.ComnFileService;
+import com.palnet.biz.api.main.dash.model.MainDashFlightListModel;
 import com.palnet.biz.api.main.dash.model.MainDashStcsModel;
 import com.palnet.biz.api.main.statistics.model.FlightStcsValueModel;
 import com.palnet.biz.jpa.entity.FltPlanBas;
@@ -52,15 +53,18 @@ import com.palnet.comn.utils.InstantUtils;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.ExpressionUtils;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.CaseBuilder;
+import com.querydsl.core.types.dsl.ComparableExpressionBase;
 import com.querydsl.core.types.dsl.DateTemplate;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringTemplate;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import com.querydsl.sql.SQLExpressions;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -1847,4 +1851,59 @@ public class FltPlanQueryRepository {
 
         return result;
     }
+    
+    public List<MainDashFlightListModel> getFlightDronList(String orderBy, String groupId){
+    	
+    	QComIdntfBas cib = QComIdntfBas.comIdntfBas;
+    	QFltPlanArcrft fpa = QFltPlanArcrft.fltPlanArcrft;
+    	QFltPlanBas fpb = QFltPlanBas.fltPlanBas;
+    	QPtyGroupBas pgb = QPtyGroupBas.ptyGroupBas;
+    	QFltPlanCtrCntrlRel fpccr = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
+    	QCtrCntrlBas ccb = QCtrCntrlBas.ctrCntrlBas;
+
+    	Expression<Integer> groupOrder = new CaseBuilder()
+    		    .when(pgb.groupNm.eq(orderBy)).then(0)
+    		    .otherwise(1);
+    	
+    	BooleanBuilder builder = new BooleanBuilder();		
+    	
+    	if(!groupId.equals("all")) {
+    		builder.and(pgb.groupId.eq(groupId));
+    	}
+    	Instant now = Instant.now();
+
+    	List<MainDashFlightListModel> result = query
+    	    .select(Projections.bean(MainDashFlightListModel.class,
+    	        pgb.groupNm,
+    	        fpb.memberName,
+    	        fpa.idntfNum,
+    	        ccb.cntrlStDt,
+    	        ccb.cntrlEndDt,
+    	        Expressions.stringTemplate(
+    	            "CONCAT(SEC_TO_TIME(TIME_TO_SEC(TIMEDIFF({0}, {1}))))",
+    	            ccb.cntrlEndDt,
+    	            ccb.cntrlStDt
+    	        ).as("totalFlightTime"),
+    	        new CaseBuilder()
+	                .when(ccb.statusCd.eq("01")).then("비행 중")
+	                .when(ccb.statusCd.eq("99")).then("비행 완료")
+	                .otherwise("비행 대기 중").as("status")
+    	    ))
+    	    .from(fpa)
+    	    .leftJoin(fpb).on(fpb.planSno.eq(fpa.planSno))
+    	    .leftJoin(pgb).on(pgb.groupId.eq(fpb.groupId))
+    	    .leftJoin(cib).on(cib.idntfNum.eq(fpa.idntfNum))
+    	    .leftJoin(fpccr).on(fpccr.planSno.eq(fpb.planSno))
+    	    .leftJoin(ccb).on(ccb.cntrlId.eq(fpccr.cntrlId))
+    	    .where(
+    	        builder
+    	            .and(fpb.schFltStDt.between(now, now.plus(Duration.ofDays(1))))
+    	            .and(fpb.schFltEndDt.between(now, now.plus(Duration.ofDays(1))))
+    	            .and(fpb.planSno.isNotNull())
+    	    )
+    	    .orderBy(((ComparableExpressionBase<Integer>) groupOrder).desc(), cib.createDt.asc())
+    	    .fetch();
+
+    	return result;
+    }
 }