From 1f56bd5d89b32d580db37d0cdfd46e78fe764ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Fri, 14 Jun 2024 11:01:21 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=93=9C=EB=A1=A0=EC=9B=90=EC=8A=A4?= =?UTF-8?q?=ED=86=B1=20=EC=A3=BC=EC=86=8C(addr)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http/http-client.env.json | 10 +++ http/server/server.http | 75 +++++++++++++++++++ .../api/bas/dos/model/BasDosPlanAreaRs.java | 2 + .../api/bas/dos/service/BasDosService.java | 1 + .../biz/api/external/model/DosPlanRq.java | 1 + .../external/service/DronOneStopService.java | 1 + .../palnet/biz/jpa/entity/DosFltPlanArea.java | 3 + 7 files changed, 93 insertions(+) create mode 100644 http/http-client.env.json create mode 100644 http/server/server.http diff --git a/http/http-client.env.json b/http/http-client.env.json new file mode 100644 index 00000000..bf85d2ec --- /dev/null +++ b/http/http-client.env.json @@ -0,0 +1,10 @@ +{ + "local": { + "appHost": "http://localhost:8080", + "wsHost": "ws://localhost:8001" + }, + "prod": { + "appHost": "http://localhost:8080", + "wsHost": "ws://localhost:8001" + } +} diff --git a/http/server/server.http b/http/server/server.http new file mode 100644 index 00000000..60343436 --- /dev/null +++ b/http/server/server.http @@ -0,0 +1,75 @@ +### login dev +POST {{appHost}}/api/acnt/jwt/login +Content-Type: application/json + +{ + "userId": "palnet", + "userPswd": "palnet!234" +} + +> {% + const accessToken = 'palnet ' + response.body.data.accessToken + client.global.set("accessToken", accessToken) +%} + +### login prod +POST {{appHost}}/api/acnt/jwt/login +Content-Type: application/json + +{ + "userId": "loginSample01", + "userPswd": "sample1234" +} + +> {% + const accessToken = 'palnet ' + response.body.data.accessToken + client.global.set("accessToken", accessToken) +%} + + +### dos(드론원스톱) 목록 조회 +GET {{appHost}}/api/bas/dos/plan?searchStDt=2024-06-14&searchEndDt=2024-06-14 +Authorization: {{accessToken}} + + +### dos(드론원스톱) 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.512, + "lon": 126.662, + "elev": 100, + "radius": 5, + "addr": "경기도 머시기3" + } + ] + } + ] +} \ No newline at end of file diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java index 8d07aba1..714e4983 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java @@ -32,6 +32,8 @@ public class BasDosPlanAreaRs { private Double lat; // 경도 private Double lon; + // 주소 + private String addr; // 수정일시 private Instant updateDt; // 생성일시 diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java index 3e6e79e8..f3fd76d7 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java @@ -105,6 +105,7 @@ public class BasDosService { .fltElev(area.getFltElev()) .lat(area.getLat()) .lon(area.getLon()) + .addr(area.getAddr()) .approvalCd(approvalCd) .fltElevMax(fltElevMax) .bufferCoordList(bufferCoordList) diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/model/DosPlanRq.java b/pav-server/src/main/java/com/palnet/biz/api/external/model/DosPlanRq.java index 983c4abd..85eb4cc6 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/model/DosPlanRq.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/model/DosPlanRq.java @@ -45,6 +45,7 @@ public class DosPlanRq { private Double radius; private Double lat; private Double lon; + private String addr; } 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 21961d40..4bfeccd9 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 @@ -73,6 +73,7 @@ public class DronOneStopService { .zoneNo(area.getZoneno()) .lat(area.getLat()) .lon(area.getLon()) + .addr(area.getAddr()) .updateDt(Instant.now()) .createDt(Instant.now()) .build(); diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java index c5ac7f2f..7a024cda 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/DosFltPlanArea.java @@ -38,6 +38,9 @@ public class DosFltPlanArea { // 경도 @Column(name = "LON") private Double lon; + // 주소 + @Column(name = "ADDR") + private String addr; // 수정일시 @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP") private Instant updateDt;