pav
/
pav-be-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

드론 상세정보 데이터 누락 

https://www.notion.so/cozy-han/f776272c332a48aca329d7c052dd24fd?pvs=4
pull/16/head
지대한 10 months ago
parent
bcb2c9c782
commit
82b8d0c60d
3 changed files with 881 additions and 843 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java
  2. 60
      pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
  3. 76
      pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

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

@ -1,10 +1,9 @@
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 {
@ -16,6 +15,7 @@ private String messageTypeCd;
private int arcrftSno;
private String prdctNum;
private String arcrftTypeCd;
private String arcrftTypeNm;
private String arcrftModelNm;
private String prdctCmpnNm;
private String wghtTypeCd;

60
pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
Unescape View File

@ -73,7 +73,6 @@ public class CtrCntrlService {
private final FltPlanQueryRepository fltPlanQueryRepository;
public List<GPHistoryModel> getListHistory(String objectId) {
List<GPHistoryModel> filterList = new ArrayList<GPHistoryModel>();
@ -102,14 +101,21 @@ public class CtrCntrlService {
CtrCntrlDtlModel result;
result = query.detailCntrl(controlId);
// result = query.detailCntrl(controlId);
result = query.detailCntrlForKac(controlId);
List<CtrCntrlHstryArea> areaList = query.detailArea(controlId);
String stAreaNm = "";
if (result.getHpno() == null || result.getHpno().isEmpty()) {
} else {
result.setHpno(EncryptUtils.decrypt(result.getHpno()));
if (result.getHpno() != null && !result.getHpno().isEmpty()) {
try {
String decHpno = EncryptUtils.decrypt(result.getHpno());
if (decHpno != null && !decHpno.isEmpty()) {
result.setHpno(decHpno);
}
} catch (Exception e) {
log.error("ERROR: ", e);
}
}
for (CtrCntrlHstryArea data : areaList) {
@ -368,6 +374,7 @@ public class CtrCntrlService {
* 식별 번호에 해당되는 비행구역 조회
* KAC에서는 기초데이터를 먼저 입력하는 것이 아닌 비행계획서만 작성하므로 생략되는 로직이 있음
* 따라서 별도로 구성함
*
* @param idntfNum
* @return
*/
@ -625,50 +632,38 @@ public class CtrCntrlService {
if (length <= 1) {
strminute = 0 + Integer.toString(minute);
}if(hourlength<=1){
}
if (hourlength <= 1) {
strhour = 0 + Integer.toString(hour);
}
// 시, 분, 초 출력
if ((Integer.parseInt(strhour) >= 2 && Integer.parseInt(strminute) > 9) && Integer.parseInt(strhour) <= 5) {
basetime = "0200";
}
else if ((Integer.parseInt(strhour) >= 5 && Integer.parseInt(strminute ) > 9) && Integer.parseInt(strhour) < 8) {
} else if ((Integer.parseInt(strhour) >= 5 && Integer.parseInt(strminute) > 9) && Integer.parseInt(strhour) < 8) {
basetime = "0500";
}
else if (Integer.parseInt(strhour) <= 8 && Integer.parseInt(strminute ) < 10) {
} else if (Integer.parseInt(strhour) <= 8 && Integer.parseInt(strminute) < 10) {
basetime = "0500";
}
else if ((Integer.parseInt(strhour) >= 8 && Integer.parseInt(strminute ) > 9) && Integer.parseInt(strhour) < 11) {
} else if ((Integer.parseInt(strhour) >= 8 && Integer.parseInt(strminute) > 9) && Integer.parseInt(strhour) < 11) {
basetime = "0800";
}
else if (Integer.parseInt(strhour) <= 11 && Integer.parseInt(strminute ) < 10) {
} else if (Integer.parseInt(strhour) <= 11 && Integer.parseInt(strminute) < 10) {
basetime = "0800";
}
else if ((Integer.parseInt(strhour) >= 11 && Integer.parseInt(strminute ) > 9) && Integer.parseInt(strhour) < 14) {
} else if ((Integer.parseInt(strhour) >= 11 && Integer.parseInt(strminute) > 9) && Integer.parseInt(strhour) < 14) {
basetime = "1100";
}
else if (Integer.parseInt(strhour) <= 14 && Integer.parseInt(strminute ) < 10) {
} else if (Integer.parseInt(strhour) <= 14 && Integer.parseInt(strminute) < 10) {
basetime = "1100";
}
else if ((Integer.parseInt(strhour) >= 14 && Integer.parseInt(strminute ) > 9) && Integer.parseInt(strhour) < 17) {
} else if ((Integer.parseInt(strhour) >= 14 && Integer.parseInt(strminute) > 9) && Integer.parseInt(strhour) < 17) {
basetime = "1400";
}
else if (Integer.parseInt(strhour) <= 17 && Integer.parseInt(strminute ) < 10) {
} else if (Integer.parseInt(strhour) <= 17 && Integer.parseInt(strminute) < 10) {
basetime = "1400";
}
else if ((Integer.parseInt(strhour) >= 17 && Integer.parseInt(strminute ) > 9) && Integer.parseInt(strhour) < 20) {
} else if ((Integer.parseInt(strhour) >= 17 && Integer.parseInt(strminute) > 9) && Integer.parseInt(strhour) < 20) {
basetime = "1700";
}
else if (Integer.parseInt(strhour) <= 20 && Integer.parseInt(strminute ) < 10) {
} else if (Integer.parseInt(strhour) <= 20 && Integer.parseInt(strminute) < 10) {
basetime = "1700";
}
else if ((Integer.parseInt(strhour) >= 20 && Integer.parseInt(strminute ) > 9) && Integer.parseInt(strhour) < 23) {
} else if ((Integer.parseInt(strhour) >= 20 && Integer.parseInt(strminute) > 9) && Integer.parseInt(strhour) < 23) {
basetime = "2000";
}
else if (Integer.parseInt(strhour) <= 23 && Integer.parseInt(strminute ) < 10) {
} else if (Integer.parseInt(strhour) <= 23 && Integer.parseInt(strminute) < 10) {
basetime = "2000";
}
else
} else
basetime = "2300";
@ -727,6 +722,7 @@ public class CtrCntrlService {
return jsonObject;
}
public Coordinate wheather(Coordinate coord) {
double nx;
double ny;

76
pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
Unescape View File

@ -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;
}
/**
* 상세보기 조회
* 지역정보 조회

Write Preview
Loading…
Cancel
Save