Browse Source

feat: 드론원스탑 api 원추/수평 버그 수정 및 변경전 변경후 모두 받도록 설정.

pull/19/head
지대한 2 months ago
parent
commit
aea091c20d
  1. 44
      http/server/server.http
  2. 18
      pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java

44
http/server/server.http

@ -65,7 +65,7 @@ Authorization: {{accessToken}}
"rm": "수정ㅂㅣ고" "rm": "수정ㅂㅣ고"
}] }]
### dos(드론원스톱) api 연동 테스트 ### dos(드론원스톱) new api 연동 테스트
POST {{appHost}}/api/external/dos/plan/laanc POST {{appHost}}/api/external/dos/plan/laanc
Content-Type: application/json 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 ### dos(드론원스톱) excel download
GET {{appHost}}/api/bas/dos/plan/download/excel?searchStDt=2024-06-14&searchEndDt=2024-06-14 GET {{appHost}}/api/bas/dos/plan/download/excel?searchStDt=2024-06-14&searchEndDt=2024-06-14
Authorization: {{accessToken}} Authorization: {{accessToken}}

18
pav-server/src/main/java/com/palnet/biz/api/external/service/DronOneStopService.java vendored

@ -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;
} }
} }

Loading…
Cancel
Save