|
|
@ -11,17 +11,16 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; |
|
|
|
import com.palnet.biz.api.bas.flight.service.BasFlightMapper; |
|
|
|
import com.palnet.biz.api.bas.flight.service.BasFlightMapper; |
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRq; |
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRq; |
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRs; |
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRs; |
|
|
|
|
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlWarnLogModel; |
|
|
|
import com.palnet.biz.jpa.entity.*; |
|
|
|
import com.palnet.biz.jpa.entity.*; |
|
|
|
import com.palnet.biz.jpa.repository.com.ComArcrftBasRepository; |
|
|
|
import com.palnet.biz.jpa.repository.com.ComArcrftBasRepository; |
|
|
|
import com.palnet.biz.jpa.repository.com.ComIdntBasRepository; |
|
|
|
import com.palnet.biz.jpa.repository.com.ComIdntBasRepository; |
|
|
|
import com.palnet.biz.jpa.repository.ctr.CtrCntrlWarnLogRepository; |
|
|
|
import com.palnet.biz.jpa.repository.ctr.CtrCntrlWarnLogRepository; |
|
|
|
import com.palnet.biz.jpa.repository.flt.*; |
|
|
|
import com.palnet.biz.jpa.repository.flt.*; |
|
|
|
import com.palnet.comn.model.GPModel; |
|
|
|
|
|
|
|
import com.palnet.comn.utils.AreaUtils; |
|
|
|
import com.palnet.comn.utils.AreaUtils; |
|
|
|
import com.palnet.comn.utils.DateUtils; |
|
|
|
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.locationtech.jts.geom.GeometryFactory; |
|
|
|
|
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
@ -37,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
@Log4j2 |
|
|
|
@Log4j2 |
|
|
|
public class CtrCntrlService { |
|
|
|
public class CtrCntrlService { |
|
|
|
private final CtrCntrlQueryRepository query; |
|
|
|
private final CtrCntrlQueryRepository query; |
|
|
|
|
|
|
|
private final CtrCntrlWarnLogRepository warnLogRepository; |
|
|
|
private final ComIdntBasRepository idntfRepository; |
|
|
|
private final ComIdntBasRepository idntfRepository; |
|
|
|
private final ComArcrftBasRepository arcrftRepository; |
|
|
|
private final ComArcrftBasRepository arcrftRepository; |
|
|
|
private final FltPlanBasRepository planBasRepository; |
|
|
|
private final FltPlanBasRepository planBasRepository; |
|
|
@ -48,6 +48,7 @@ public class CtrCntrlService { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public CtrCntrlService(CtrCntrlQueryRepository query, |
|
|
|
public CtrCntrlService(CtrCntrlQueryRepository query, |
|
|
|
|
|
|
|
CtrCntrlWarnLogRepository warnLogRepository, |
|
|
|
ComIdntBasRepository idntfRepository, |
|
|
|
ComIdntBasRepository idntfRepository, |
|
|
|
ComArcrftBasRepository arcrftRepository, |
|
|
|
ComArcrftBasRepository arcrftRepository, |
|
|
|
FltPlanBasRepository planBasRepository, |
|
|
|
FltPlanBasRepository planBasRepository, |
|
|
@ -57,6 +58,7 @@ public class CtrCntrlService { |
|
|
|
FltPlanAreaCoordRepository planCoordRepository, |
|
|
|
FltPlanAreaCoordRepository planCoordRepository, |
|
|
|
AreaUtils areaUtils) { |
|
|
|
AreaUtils areaUtils) { |
|
|
|
this.query = query; |
|
|
|
this.query = query; |
|
|
|
|
|
|
|
this.warnLogRepository = warnLogRepository; |
|
|
|
this.idntfRepository = idntfRepository; |
|
|
|
this.idntfRepository = idntfRepository; |
|
|
|
this.arcrftRepository = arcrftRepository; |
|
|
|
this.arcrftRepository = arcrftRepository; |
|
|
|
this.planBasRepository = planBasRepository; |
|
|
|
this.planBasRepository = planBasRepository; |
|
|
@ -141,6 +143,23 @@ public class CtrCntrlService { |
|
|
|
return list; |
|
|
|
return list; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<CtrCntrlWarnLogModel> getWarnLog(String controlId) { |
|
|
|
|
|
|
|
List<CtrCntrlWarnLog> logs = warnLogRepository.findAllByCntrlId(controlId); |
|
|
|
|
|
|
|
List<CtrCntrlWarnLogModel> warnLog = new ArrayList<CtrCntrlWarnLogModel>(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for(CtrCntrlWarnLog log : logs) { |
|
|
|
|
|
|
|
CtrCntrlWarnLogModel model = new CtrCntrlWarnLogModel(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
model.setCntrlId(log.getCntrlId()); |
|
|
|
|
|
|
|
model.setCreateDt(log.getCreateDt()); |
|
|
|
|
|
|
|
model.setWarnLogSno(log.getWarnLogSno()); |
|
|
|
|
|
|
|
model.setWarnType(log.getWarnType()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
warnLog.add(model); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return warnLog; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Transactional(readOnly = true) |
|
|
|
@Transactional(readOnly = true) |
|
|
|
public List<BasFlightPlanModel> getFlightPlan(String idntfNum) { |
|
|
|
public List<BasFlightPlanModel> getFlightPlan(String idntfNum) { |
|
|
|
List<BasFlightPlanModel> rs = new ArrayList<>(); |
|
|
|
List<BasFlightPlanModel> rs = new ArrayList<>(); |
|
|
|