Merge commit 'ca86a2debdd264d10972bb1db00fe044b2678f54' into feature/current/flight-warn

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -31,7 +30,6 @@ import java.util.Map;
 @Tag(name = "회원관리", description = "회원 관련 API")
 public class AcntCstmrController {
 	
-	@Autowired
 	private final AcntCstmrService service;
 	
 	@PostMapping(value = "/register")

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java

@@ -28,4 +28,6 @@ public class AnctCstmerRlModel {
 	
 	private String updateuserId;
 
+	private String cptAuthCode;
+	
 }

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtUserModel.java

@@ -36,6 +36,9 @@ public class JwtUserModel implements UserDetails {
     @Column(name = "CSTMR_STATUS_CD")
     private String cstmrStatusCd;
 
+    @Column(name = "CPT_AUTH_CODE")
+    private String cptAuthCode;
+
     @Transient
     private String userNm;
     @Transient
@@ -76,7 +79,7 @@ public class JwtUserModel implements UserDetails {
     @Override
     public boolean isAccountNonLocked() {
         // 계정 잠금되었는지 확인하는 로직
-	    	if(cstmrStatusCd.equals("A"))
+        if ("A".equals(cstmrStatusCd))
             return true;
         else
             return false;

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java

@@ -73,6 +73,7 @@ public class JwtTokenUtil implements Serializable {
         claims.put("auth", userDetails.getAuth());
         claims.put("group", userDetails.getGroup());
         claims.put("userNm", userDetails.getUserNm());
+        claims.put("cptAuthCode", userDetails.getCptAuthCode());
         return doGenerateToken(claims, userDetails.getUsername());
     }
 
@@ -178,4 +179,17 @@ public class JwtTokenUtil implements Serializable {
 
         return payload.get("auth", String.class);
     }
+
+
+    public String getCptAuthCodeByToken() {
+        HttpServletRequest rq = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String token = rq.getHeader("Authorization");
+
+        if (token == null || "".equals(token)) return null;
+
+        token = token.substring(JWT_PREFIX.length()).trim();
+        Claims payload = getAllClaimsFromToken(token);
+
+        return payload.get("cptAuthCode", String.class);
+    }
 }

pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java

@@ -393,8 +393,8 @@ public class BasFlightController {
 
 //    @PostMapping("/coord")
 //    public JSONObject coordTest(@RequestBody Coordinate coordinate) throws IOException, ParseException {
-    	
+//
 //    	return FlightUtils.getCoordinateGis(coordinate);
-    	
+//
 //    }
 }

pav-server/src/main/java/com/palnet/biz/api/comn/elev/controller/ComnElevController.java

@@ -8,13 +8,10 @@ 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.comn.exception.CustomException;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -23,6 +23,7 @@ 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;
 import com.palnet.comn.code.RSErrorCode;
+import com.querydsl.core.Tuple;
 
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -303,6 +304,24 @@ public class MainDashController {
 		return ResponseEntity.ok().body(new SuccessResponse<List<MainDashStcsModel>>(result));
 	}
 	
+	@GetMapping(value = "/stcs/dron-flight/")
+	@ApiOperation(value = "드론 비행 현황")
+	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
+	public ResponseEntity<? extends BasicResponse> dronFlightStcs(){		
+		
+		 Map<String, String> result = null;
+
+		try {
+			result = service.mainDashDronFlightStcs();
+		}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< Map<String, String>>(result));
+	}
+	
 	@GetMapping(value = "/dron-flight/list/")
 	@ApiOperation(value = "드론 별 비행운항 목록")
 	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")

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

@@ -13,9 +13,9 @@ public class MainDashFlightListModel {
 	
 	private String idntfNum;
 	
-	private Instant schFltStDt;
+	private Instant cntrlStDt;
 	
-	private Instant schFltEndDt;
+	private Instant cntrlEndDt;
 	
 	private Object totalFlightTime;
 	

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

@@ -11,6 +11,7 @@ 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.*;
+import com.querydsl.core.Tuple;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -138,9 +139,6 @@ public class MainDashService {
 		String userAuth = token.getUserAuthByToken();
 		List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
 		
-		
-		log.info(">>>>>>>>> groupList {} " , userAuth);
-		
 		BasGroupModel myFirstGroup = new BasGroupModel();
 		
 		List<MainDashFlightListModel> resultList = new ArrayList<MainDashFlightListModel>();
@@ -158,6 +156,29 @@ public class MainDashService {
 		
 		return resultList;
 	}
+	
+	public Map<String, String> mainDashDronFlightStcs(){
+		
+		String userAuth = token.getUserAuthByToken();
+		List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
+		
+		BasGroupModel myFirstGroup = new BasGroupModel();
+		
+		Map<String, String> resultList = new HashMap<>();
+		
+		if(userAuth.equals("SUPER")) {
+			
+			resultList = fltPlanQueryRepository.getFlightDronStcs("KAC");
+			
+		}else {
+			
+			myFirstGroup = ptyGroupQueryRepository.myFirstGroup(userGroupList);
+			
+			resultList = fltPlanQueryRepository.getFlightDronStcs(myFirstGroup.getGroupId());
+		}
+		
+		return resultList;
+	}
 	/**
 	 * 김포공항, 비행승인 통계
 	 * @param yyyymm

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

@@ -87,7 +87,7 @@ public class MainStatisticsService {
 					}
 
 					result[0] = "%Y-%m-%d";
-					result[1] = "%Y-%m-%d";
+					result[1] = "%H:00:00";
 				} else {
 					throw new NumberFormatException();
 				}

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java

@@ -34,11 +34,12 @@ public class PtyCstmrBas implements Serializable {
 	@Column(name="CSTMR_STATUS_CD")
 	private String cstmrStatusCd;
 
-//	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CSTMR_STATUS_CNG_DT", columnDefinition = "TIMESTAMP")
 	private Instant cstmrStatusCngDt;
 
-//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CPT_AUTH_CODE")
+	private String cptAuthCode;
+
 	@Column(name="JOIN_DT", columnDefinition = "TIMESTAMP")
 	private Instant joinDt;
 

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

@@ -3,14 +3,14 @@ package com.palnet.biz.jpa.repository.flt;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -26,7 +26,6 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq;
 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;
@@ -54,6 +53,7 @@ import com.palnet.biz.jpa.model.LaancPlanareaCoordDto;
 import com.palnet.comn.utils.DateUtils;
 import com.palnet.comn.utils.InstantUtils;
 import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.Tuple;
 import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.ConstantImpl;
 import com.querydsl.core.types.Expression;
@@ -67,7 +67,6 @@ 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;
@@ -1740,6 +1739,7 @@ public class FltPlanQueryRepository {
                 .leftJoin(qFltPlanBas)
                         .on(qFltPlanBas.planSno.eq(qFltPlanCtrCntrlRel.planSno))
                 .where(builder)
+                .groupBy(qFltPlanCtrCntrlRel.idntfNum)
                 .orderBy(qFltPlanCtrCntrlRel.planSno.countDistinct().desc())
                 .limit(5)
                 .fetch();
@@ -1917,6 +1917,68 @@ public class FltPlanQueryRepository {
     	    .orderBy(((ComparableExpressionBase<Integer>) groupOrder).desc(), cib.createDt.asc())
     	    .fetch();
 
+    	return result;
+    }
+    
+    public Map<String, String> getFlightDronStcs(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;
+
+    	BooleanBuilder builder = new BooleanBuilder();		
+    	
+    	if(!groupId.equals("all")) {
+    		builder.and(pgb.groupId.eq(groupId));
+    	}
+    	Instant now = Instant.now();
+    	
+    	Instant todayStart = LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC);
+    	Instant todayEnd = LocalDate.now().plusDays(1).atStartOfDay().toInstant(ZoneOffset.UTC);
+
+    	List<Tuple> res = query
+    		    .select(
+    		        new CaseBuilder()
+    		            .when(ccb.statusCd.eq("01")).then("비행 중")
+    		            .when(ccb.statusCd.eq("99")).then("비행 완료")
+    		            .when(fpb.planSno.isNotNull()).then("비행 대기 중")
+    		            .otherwise("비행 없음").as("status"),
+    		        fpb.count()
+    		    )
+    		    .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.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).toInstant(),
+    		                now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS).toInstant()
+    		            ))
+    		            .and(fpb.schFltEndDt.between(
+    		                now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).toInstant(),
+    		                now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS).toInstant()
+    		            ))
+    		            .and(fpb.planSno.isNotNull())
+    		    )
+    		    .groupBy(ccb.statusCd)
+    		    .fetch();
+
+    	Map<String, String> result = new HashMap<>();
+
+    	for (Tuple tuple : res) {
+    	    String status = tuple.get(0, String.class);
+    	    String count = tuple.get(1, Long.class).toString(); // Assuming count is at index 1
+
+    	    result.put(status, count);
+    	}
+
+    	
     	return result;
     }
 }