|
|
|
@ -33,7 +33,7 @@ class DronOneStopServiceTest {
|
|
|
|
|
void saveDosPlan() { |
|
|
|
|
List<DosFltPlanArea> areaList = dosFltPlanAreaRepository.findAll(); |
|
|
|
|
List<DosFltPlanResult> resultList = dosFltPlanResultRepository.findAll(); |
|
|
|
|
for(DosFltPlanArea area : areaList) { |
|
|
|
|
for (DosFltPlanArea area : areaList) { |
|
|
|
|
|
|
|
|
|
// Circle만 체크
|
|
|
|
|
Double bufferZone = area.getBufferZone(); |
|
|
|
@ -47,10 +47,10 @@ class DronOneStopServiceTest {
|
|
|
|
|
|
|
|
|
|
List<DosFltPlanResult> rList = resultList.stream().filter(result -> result.getPlanSno().equals(area.getPlanSno()) && result.getPlanAreaSno().equals(area.getPlanAreaSno())).collect(Collectors.toList()); |
|
|
|
|
log.info("rList size: {}", rList.size()); |
|
|
|
|
if(!rList.isEmpty()){ |
|
|
|
|
if (!rList.isEmpty()) { |
|
|
|
|
rList.forEach(r -> { |
|
|
|
|
|
|
|
|
|
if(r.getApprovalCd().equals(approvalResult.getApprovalCd().getCode())) { |
|
|
|
|
if (r.getApprovalCd().equals(approvalResult.getApprovalCd().getCode())) { |
|
|
|
|
log.info("approvalCd is same"); |
|
|
|
|
} else { |
|
|
|
|
log.info("approvalCd is different{} -> {}", r.getApprovalCd(), approvalResult.getApprovalCd().getCode()); |
|
|
|
@ -77,11 +77,11 @@ class DronOneStopServiceTest {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
void updateFltElevMax() { |
|
|
|
|
void updateFltElevMaxAndApprovalCd() { |
|
|
|
|
List<DosFltPlanArea> areaList = dosFltPlanAreaRepository.findAll(); |
|
|
|
|
List<DosFltPlanResult> resultList = dosFltPlanResultRepository.findAll(); |
|
|
|
|
|
|
|
|
|
for(DosFltPlanArea area : areaList) { |
|
|
|
|
for (DosFltPlanArea area : areaList) { |
|
|
|
|
// Circle만 체크
|
|
|
|
|
Double bufferZone = area.getBufferZone(); |
|
|
|
|
Double fltElev = area.getFltElev() != null ? area.getFltElev() : 0; |
|
|
|
@ -94,16 +94,13 @@ class DronOneStopServiceTest {
|
|
|
|
|
|
|
|
|
|
List<DosFltPlanResult> rList = resultList.stream().filter(result -> result.getPlanSno().equals(area.getPlanSno()) && result.getPlanAreaSno().equals(area.getPlanAreaSno())).collect(Collectors.toList()); |
|
|
|
|
log.info("rList size: {}", rList.size()); |
|
|
|
|
if(!rList.isEmpty()){ |
|
|
|
|
if (!rList.isEmpty()) { |
|
|
|
|
rList.forEach(r -> { |
|
|
|
|
|
|
|
|
|
if(r.getFltElevMax() == null){ |
|
|
|
|
log.info("fltElevMax is null"); |
|
|
|
|
r.setFltElevMax(approvalResult.getFltElevMax()); |
|
|
|
|
r.setUpdateDt(Instant.now()); |
|
|
|
|
DosFltPlanResult save = dosFltPlanResultRepository.save(r); |
|
|
|
|
log.info("update: {}", save); |
|
|
|
|
} |
|
|
|
|
r.setApprovalCd(approvalResult.getApprovalCd().getCode()); |
|
|
|
|
r.setFltElevMax(approvalResult.getFltElevMax()); |
|
|
|
|
r.setUpdateDt(Instant.now()); |
|
|
|
|
DosFltPlanResult save = dosFltPlanResultRepository.save(r); |
|
|
|
|
log.info("update: {}", save); |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
log.info("result is empty"); |
|
|
|
|