|
|
@ -2,7 +2,6 @@ package com.palnet.biz.api.ctr.cntrl.service; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; |
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaCoordModel; |
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaCoordModel; |
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; |
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; |
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; |
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; |
|
|
@ -21,10 +20,6 @@ import com.palnet.comn.utils.DateUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.locationtech.jts.geom.Coordinate; |
|
|
|
import org.locationtech.jts.geom.Coordinate; |
|
|
|
|
|
|
|
|
|
|
|
import org.slf4j.Logger; |
|
|
|
|
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
|
|
|
|
import org.springframework.cache.annotation.Cacheable; |
|
|
|
|
|
|
|
import org.springframework.cache.annotation.Caching; |
|
|
|
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
|
|
import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; |
|
|
|
import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; |
|
|
@ -35,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
|
|
@Service |
|
|
|
@Service |
|
|
|
@Log4j2 |
|
|
|
@Log4j2 |
|
|
|
@Transactional(readOnly = true) |
|
|
|
|
|
|
|
public class CtrCntrlService { |
|
|
|
public class CtrCntrlService { |
|
|
|
private final CtrCntrlQueryRepository query; |
|
|
|
private final CtrCntrlQueryRepository query; |
|
|
|
private final CtrCntrlBasRepository cntrlBasRepository; |
|
|
|
private final CtrCntrlBasRepository cntrlBasRepository; |
|
|
@ -45,13 +39,11 @@ public class CtrCntrlService { |
|
|
|
private final ComArcrftBasRepository arcrftRepository; |
|
|
|
private final ComArcrftBasRepository arcrftRepository; |
|
|
|
private final FltPlanBasRepository planBasRepository; |
|
|
|
private final FltPlanBasRepository planBasRepository; |
|
|
|
private final FltPlanArcrftRepository planArcrftRepository; |
|
|
|
private final FltPlanArcrftRepository planArcrftRepository; |
|
|
|
private final FltPlanPilotRepository planPilotRepository; |
|
|
|
|
|
|
|
private final FltPlanAreaRepository planAreaRepository; |
|
|
|
private final FltPlanAreaRepository planAreaRepository; |
|
|
|
private final FltPlanAreaCoordRepository planCoordRepository; |
|
|
|
private final FltPlanAreaCoordRepository planCoordRepository; |
|
|
|
private final AreaUtils areaUtils; |
|
|
|
private final AreaUtils areaUtils; |
|
|
|
private final ControlGpsDataContext shareContext; |
|
|
|
private final ControlGpsDataContext shareContext; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public CtrCntrlService(CtrCntrlQueryRepository query, |
|
|
|
public CtrCntrlService(CtrCntrlQueryRepository query, |
|
|
|
CtrCntrlBasRepository cntrlBasRepository, |
|
|
|
CtrCntrlBasRepository cntrlBasRepository, |
|
|
|
CtrCntrlHstryRepository cntrlHstryRepository, |
|
|
|
CtrCntrlHstryRepository cntrlHstryRepository, |
|
|
@ -60,7 +52,6 @@ public class CtrCntrlService { |
|
|
|
ComArcrftBasRepository arcrftRepository, |
|
|
|
ComArcrftBasRepository arcrftRepository, |
|
|
|
FltPlanBasRepository planBasRepository, |
|
|
|
FltPlanBasRepository planBasRepository, |
|
|
|
FltPlanArcrftRepository planArcrftRepository, |
|
|
|
FltPlanArcrftRepository planArcrftRepository, |
|
|
|
FltPlanPilotRepository planPilotRepository, |
|
|
|
|
|
|
|
FltPlanAreaRepository planAreaRepository, |
|
|
|
FltPlanAreaRepository planAreaRepository, |
|
|
|
FltPlanAreaCoordRepository planCoordRepository, |
|
|
|
FltPlanAreaCoordRepository planCoordRepository, |
|
|
|
AreaUtils areaUtils, |
|
|
|
AreaUtils areaUtils, |
|
|
@ -73,18 +64,14 @@ public class CtrCntrlService { |
|
|
|
this.arcrftRepository = arcrftRepository; |
|
|
|
this.arcrftRepository = arcrftRepository; |
|
|
|
this.planBasRepository = planBasRepository; |
|
|
|
this.planBasRepository = planBasRepository; |
|
|
|
this.planArcrftRepository = planArcrftRepository; |
|
|
|
this.planArcrftRepository = planArcrftRepository; |
|
|
|
this.planPilotRepository = planPilotRepository; |
|
|
|
|
|
|
|
this.planAreaRepository = planAreaRepository; |
|
|
|
this.planAreaRepository = planAreaRepository; |
|
|
|
this.planCoordRepository = planCoordRepository; |
|
|
|
this.planCoordRepository = planCoordRepository; |
|
|
|
this.areaUtils = areaUtils; |
|
|
|
this.areaUtils = areaUtils; |
|
|
|
this.shareContext = shareContext; |
|
|
|
this.shareContext = shareContext; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private Logger logger = LoggerFactory.getLogger(getClass()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<GPHistoryModel> getListHistory(String objectId){ |
|
|
|
public List<GPHistoryModel> getListHistory(String objectId){ |
|
|
|
List<GPHistoryModel> resultList = new ArrayList<GPHistoryModel>(); |
|
|
|
|
|
|
|
List<GPHistoryModel> filterList = new ArrayList<GPHistoryModel>(); |
|
|
|
List<GPHistoryModel> filterList = new ArrayList<GPHistoryModel>(); |
|
|
|
|
|
|
|
|
|
|
|
// if(cic.getHistoryData(objectId).size() > 0) {
|
|
|
|
// if(cic.getHistoryData(objectId).size() > 0) {
|
|
|
@ -110,7 +97,7 @@ public class CtrCntrlService { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public CtrCntrlDtlModel getDetail(String controlId) { |
|
|
|
public CtrCntrlDtlModel getDetail(String controlId) { |
|
|
|
|
|
|
|
|
|
|
|
CtrCntrlDtlModel result = new CtrCntrlDtlModel(); |
|
|
|
CtrCntrlDtlModel result; |
|
|
|
|
|
|
|
|
|
|
|
result = query.detailCntrl(controlId); |
|
|
|
result = query.detailCntrl(controlId); |
|
|
|
|
|
|
|
|
|
|
@ -138,10 +125,7 @@ public class CtrCntrlService { |
|
|
|
if(!StringUtils.isEmpty(data.getLandNum())) { |
|
|
|
if(!StringUtils.isEmpty(data.getLandNum())) { |
|
|
|
stAreaNm = stAreaNm + " " + data.getLandNum(); |
|
|
|
stAreaNm = stAreaNm + " " + data.getLandNum(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
// log.debug("data>>" + data.toString());
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
result.setStAreaNm(stAreaNm); |
|
|
|
result.setStAreaNm(stAreaNm); |
|
|
@ -160,13 +144,20 @@ public class CtrCntrlService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* TODO 사용자가 속한 그룹 정보 조회 |
|
|
|
* TODO 그룹의 기체 정보 조회 |
|
|
|
* |
|
|
|
* |
|
|
|
* @param cstmrSno |
|
|
|
* @param cstmrSno |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public List<AcntCstmrGroupModel> getGroupAuthInfo(Integer cstmrSno) { |
|
|
|
public List<CtrCntrlGroupModel> getGroupAuthInfo(Integer cstmrSno) { |
|
|
|
List<AcntCstmrGroupModel> list = query.findByGroupInfo(cstmrSno); |
|
|
|
List<CtrCntrlGroupModel> list = query.findByGroupInfo(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (CtrCntrlGroupModel group : list) { |
|
|
|
|
|
|
|
List<CtrCntrlGroupArcrftModel> arcrftList = query.findByGroupArcrft(group.getGroupId()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
group.setArcrftList(arcrftList); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return list; |
|
|
|
return list; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -270,7 +261,6 @@ public class CtrCntrlService { |
|
|
|
* @param idntfNum |
|
|
|
* @param idntfNum |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
// @Cacheable(value = "flight-plan")
|
|
|
|
|
|
|
|
public List<BasFlightPlanModel> getFlightPlan(String idntfNum) { |
|
|
|
public List<BasFlightPlanModel> getFlightPlan(String idntfNum) { |
|
|
|
List<BasFlightPlanModel> rs = new ArrayList<>(); |
|
|
|
List<BasFlightPlanModel> rs = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
@ -411,7 +401,7 @@ public class CtrCntrlService { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* TODO |
|
|
|
* TODO 비행 이력 Control-Id 발급 |
|
|
|
* |
|
|
|
* |
|
|
|
* @param id |
|
|
|
* @param id |
|
|
|
* @return |
|
|
|
* @return |
|
|
|