드론 상세정보 데이터 누락

https://www.notion.so/cozy-han/f776272c332a48aca329d7c052dd24fd?pvs=4

pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java

@@ -1,35 +1,35 @@
 package com.palnet.biz.api.ctr.cntrl.model;
 
-import java.time.Instant;
-import java.util.Date;
-
 import lombok.Data;
 
+import java.time.Instant;
+
 @Data
 public class CtrCntrlDtlModel {
 
-private String messageTypeCd;
-	
-	private String cntrlId;
-	private Instant cntrlStDt;
-	private Instant cntrlEndDt;
-	private int arcrftSno;
-	private String prdctNum;
-	private String arcrftTypeCd;
-	private String arcrftModelNm;
-	private String prdctCmpnNm;
-	private String wghtTypeCd;
-	private String imageUrl;
-	private String cameraYn;
-	private String insrncYn;
-	private String ownerNm;
-	private String hpno;
-	private String telno;
-	private String corpRegYn;
-	private String aprvlYn;
-	private Instant aprvlDt;
-	
-	private String stAreaNm;
+    private String messageTypeCd;
+
+    private String cntrlId;
+    private Instant cntrlStDt;
+    private Instant cntrlEndDt;
+    private int arcrftSno;
+    private String prdctNum;
+    private String arcrftTypeCd;
+    private String arcrftTypeNm;
+    private String arcrftModelNm;
+    private String prdctCmpnNm;
+    private String wghtTypeCd;
+    private String imageUrl;
+    private String cameraYn;
+    private String insrncYn;
+    private String ownerNm;
+    private String hpno;
+    private String telno;
+    private String corpRegYn;
+    private String aprvlYn;
+    private Instant aprvlDt;
+
+    private String stAreaNm;
 
 
 }

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

@@ -10,6 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.palnet.biz.api.main.dash.model.MainDashFlightNumStcsModel;
+import com.palnet.biz.jpa.entity.*;
 import com.querydsl.core.Tuple;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,23 +33,6 @@ 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.MainDashStcsModel;
 import com.palnet.biz.api.main.statistics.model.FlightStcsValueModel;
-import com.palnet.biz.jpa.entity.ComArcrftBas;
-import com.palnet.biz.jpa.entity.ComIdntfBas;
-import com.palnet.biz.jpa.entity.CtrCntrlHstry;
-import com.palnet.biz.jpa.entity.CtrCntrlHstryArea;
-import com.palnet.biz.jpa.entity.FltPlanArea;
-import com.palnet.biz.jpa.entity.FltPlanBas;
-import com.palnet.biz.jpa.entity.QComArcrftBas;
-import com.palnet.biz.jpa.entity.QComIdntfBas;
-import com.palnet.biz.jpa.entity.QCtrCntrlBas;
-import com.palnet.biz.jpa.entity.QCtrCntrlHstry;
-import com.palnet.biz.jpa.entity.QCtrCntrlHstryArea;
-import com.palnet.biz.jpa.entity.QCtrCntrlWarnLog;
-import com.palnet.biz.jpa.entity.QFltPlanArea;
-import com.palnet.biz.jpa.entity.QFltPlanBas;
-import com.palnet.biz.jpa.entity.QFltPlanCtrCntrlRel;
-import com.palnet.biz.jpa.entity.QPtyCstmrGroup;
-import com.palnet.biz.jpa.entity.QPtyGroupBas;
 import com.palnet.comn.model.GPHistoryModel;
 import com.palnet.comn.utils.DateUtils;
 import com.palnet.comn.utils.InstantUtils;
@@ -1312,6 +1296,64 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 		
 	}
 
+	// TODO 임시 수정
+	public CtrCntrlDtlModel detailCntrlForKac(String controlId) {
+		QCtrCntrlBas ctr = QCtrCntrlBas.ctrCntrlBas;
+//		QComArcrftBas cBas = QComArcrftBas.comArcrftBas;
+//		QComIdntfBas own = QComIdntfBas.comIdntfBas;
+		QFltPlanArcrft fltArcrft = QFltPlanArcrft.fltPlanArcrft;
+		QFltPlanPilot fltPilot = QFltPlanPilot.fltPlanPilot;
+		QFltPlanCtrCntrlRel rel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
+		QFltPlanBas fBas = QFltPlanBas.fltPlanBas;
+
+		CtrCntrlDtlModel result = query.select(Projections.bean(CtrCntrlDtlModel.class,
+						ctr.cntrlId,
+						ctr.cntrlStDt,
+						ctr.cntrlEndDt,
+						fltArcrft.arcrftSno,
+						fltArcrft.prdctNum,
+						fltArcrft.arcrftTypeCd.stringValue().as("arcrftTypeCd"),
+						fltArcrft.arcrftModelNm,
+						fltArcrft.prdctCmpnNm,
+						fltArcrft.wghtTypeCd,
+						fltArcrft.imageUrl,
+						fltArcrft.cameraYn,
+						fltArcrft.insrncYn,
+						fltArcrft.ownerNm,
+						fltPilot.hpno,
+						fBas.corpRegYn,
+						fBas.aprvlDt,
+						fBas.aprvlYn
+				))
+				.from(ctr)
+				.leftJoin(rel)
+				.on(ctr.cntrlId.eq(rel.cntrlId))
+				.leftJoin(fBas)
+				.on(rel.planSno.eq(fBas.planSno))
+				.leftJoin(fltArcrft)
+				.on(fBas.planSno.eq(fltArcrft.planSno).and(ctr.idntfNum.eq(fltArcrft.idntfNum)))
+				.leftJoin(fltPilot)
+				.on(fBas.planSno.eq(fltPilot.planSno))
+				.where(ctr.cntrlId.eq(controlId))
+				.orderBy(ctr.createDt.desc())
+				.fetchFirst();
+
+
+		if (result == null) return new CtrCntrlDtlModel();
+
+//		if(!StringUtils.isEmpty(result.getOwnerNm())) {
+////    		result.setOwnerNm(EncryptUtils.decrypt(result.getOwnerNm()));
+////    	}
+////    	if(!StringUtils.isEmpty(result.getHpno())) {
+////    		result.setHpno(EncryptUtils.decrypt(result.getHpno()));
+////    	}
+////    	if(!StringUtils.isEmpty(result.getTelno())) {
+////    		result.setTelno(EncryptUtils.decrypt(result.getTelno()));
+////    	}
+		return result;
+
+	}
+	
 	/**
 	 * 상세보기 조회
 	 * 지역정보 조회