diff --git a/http/server/server.http b/http/server/server.http index 116827f8..3f17f85b 100644 --- a/http/server/server.http +++ b/http/server/server.http @@ -65,7 +65,7 @@ Authorization: {{accessToken}} "rm": "수정ㅂㅣ고" }] -### dos(드론원스톱) api 연동 테스트 +### dos(드론원스톱) new api 연동 테스트 POST {{appHost}}/api/external/dos/plan/laanc Content-Type: application/json @@ -134,6 +134,48 @@ Content-Type: application/json ] } +### dos(드론원스톱) old - api 연동 테스트 +POST {{appHost}}/api/external/dos/plan/laanc +Content-Type: application/json + +{ + "fltaplylist": [ + { + "aplyno": "T201118-1010", + "fbctnno": "163CGBEROA529Y", + "aplyymd": "20240614", + "fltstymd": "20240615", + "fltendymd": "20240615", + "zone": [ + { + "zoneno": "1", + "lat": 37.529, + "lon": 126.699, + "elev": 100, + "radius": 5, + "addr": "경기도 머시기" + }, + { + "zoneno": "2", + "lat": 37.529, + "lon": 126.699, + "elev": 150, + "radius": 5, + "addr": "경기도 머시기2" + }, + { + "zoneno": "3", + "lat": 37.52845, + "lon": 126.7520, + "elev": 45, + "radius": 600, + "addr": "서울시 마포구 150" + } + ] + } + ] +} + ### dos(드론원스톱) excel download GET {{appHost}}/api/bas/dos/plan/download/excel?searchStDt=2024-06-14&searchEndDt=2024-06-14 Authorization: {{accessToken}} diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java b/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java index 245e46d6..615660a8 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java @@ -83,7 +83,10 @@ public class DronOneStopService { .build(); dosFltPlanDroneRepository.save(dosFltPlanDroneInsert); }); + } else { + log.warn("drone info is empty - planSno: {} / applyNo: {}", saveDosFltPlanBas.getPlanSno(), saveDosFltPlanBas.getApplyNo()); } + // pilot save if (fltaply.getPilot() != null) { List pilotList = fltaply.getPilot(); @@ -98,6 +101,8 @@ public class DronOneStopService { .build(); dosFltPlanPilotRepository.save(dosFltPlanPilotInsert); }); + } else { + log.warn("pilot info is empty - planSno: {} / applyNo: {}", saveDosFltPlanBas.getPlanSno(), saveDosFltPlanBas.getApplyNo()); } // area and result save @@ -228,11 +233,6 @@ public class DronOneStopService { Point centerGeometry = geometryFactory.createPoint(centerPoint); // 제한 구역 체크 - duplicatedAirspaces.forEach(airspace -> { - - }); - - // 제한 구역 for (AirspaceUtils.FeatureInfo checkAirspace : duplicatedAirspaces) { Geometry airspaceGeometry = checkAirspace.getGeometry(); if (!airspaceGeometry.contains(centerGeometry)) { @@ -240,12 +240,12 @@ public class DronOneStopService { } if ("0003".equals(checkAirspace.getType())) { - // 0003: 원추 - result.setLimitZone(LimitZoneType.HORIZONTAL_SURFACE.getCode()); + // 0003: 원추: C + result.setLimitZone(LimitZoneType.CONICAL_SURFACE.getCode()); break; } else if ("0006".equals(checkAirspace.getType())) { - // 0006: 수평 - result.setLimitZone(LimitZoneType.CONICAL_SURFACE.getCode()); + // 0006: 수평: H + result.setLimitZone(LimitZoneType.HORIZONTAL_SURFACE.getCode()); break; } }