|
|
@ -83,7 +83,10 @@ public class DronOneStopService { |
|
|
|
.build(); |
|
|
|
.build(); |
|
|
|
dosFltPlanDroneRepository.save(dosFltPlanDroneInsert); |
|
|
|
dosFltPlanDroneRepository.save(dosFltPlanDroneInsert); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
log.warn("drone info is empty - planSno: {} / applyNo: {}", saveDosFltPlanBas.getPlanSno(), saveDosFltPlanBas.getApplyNo()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// pilot save
|
|
|
|
// pilot save
|
|
|
|
if (fltaply.getPilot() != null) { |
|
|
|
if (fltaply.getPilot() != null) { |
|
|
|
List<DosPlanRq.DosPlan.DosPlanPilot> pilotList = fltaply.getPilot(); |
|
|
|
List<DosPlanRq.DosPlan.DosPlanPilot> pilotList = fltaply.getPilot(); |
|
|
@ -98,6 +101,8 @@ public class DronOneStopService { |
|
|
|
.build(); |
|
|
|
.build(); |
|
|
|
dosFltPlanPilotRepository.save(dosFltPlanPilotInsert); |
|
|
|
dosFltPlanPilotRepository.save(dosFltPlanPilotInsert); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
log.warn("pilot info is empty - planSno: {} / applyNo: {}", saveDosFltPlanBas.getPlanSno(), saveDosFltPlanBas.getApplyNo()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// area and result save
|
|
|
|
// area and result save
|
|
|
@ -228,11 +233,6 @@ public class DronOneStopService { |
|
|
|
Point centerGeometry = geometryFactory.createPoint(centerPoint); |
|
|
|
Point centerGeometry = geometryFactory.createPoint(centerPoint); |
|
|
|
|
|
|
|
|
|
|
|
// 제한 구역 체크
|
|
|
|
// 제한 구역 체크
|
|
|
|
duplicatedAirspaces.forEach(airspace -> { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 제한 구역
|
|
|
|
|
|
|
|
for (AirspaceUtils.FeatureInfo checkAirspace : duplicatedAirspaces) { |
|
|
|
for (AirspaceUtils.FeatureInfo checkAirspace : duplicatedAirspaces) { |
|
|
|
Geometry airspaceGeometry = checkAirspace.getGeometry(); |
|
|
|
Geometry airspaceGeometry = checkAirspace.getGeometry(); |
|
|
|
if (!airspaceGeometry.contains(centerGeometry)) { |
|
|
|
if (!airspaceGeometry.contains(centerGeometry)) { |
|
|
@ -240,12 +240,12 @@ public class DronOneStopService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if ("0003".equals(checkAirspace.getType())) { |
|
|
|
if ("0003".equals(checkAirspace.getType())) { |
|
|
|
// 0003: 원추
|
|
|
|
// 0003: 원추: C
|
|
|
|
result.setLimitZone(LimitZoneType.HORIZONTAL_SURFACE.getCode()); |
|
|
|
result.setLimitZone(LimitZoneType.CONICAL_SURFACE.getCode()); |
|
|
|
break; |
|
|
|
break; |
|
|
|
} else if ("0006".equals(checkAirspace.getType())) { |
|
|
|
} else if ("0006".equals(checkAirspace.getType())) { |
|
|
|
// 0006: 수평
|
|
|
|
// 0006: 수평: H
|
|
|
|
result.setLimitZone(LimitZoneType.CONICAL_SURFACE.getCode()); |
|
|
|
result.setLimitZone(LimitZoneType.HORIZONTAL_SURFACE.getCode()); |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|