From 394291b0dcc75bea1d35146faae58d9e80416a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Mon, 7 Nov 2022 17:35:11 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=A0=EC=94=A8API=20-=20=EB=B9=84=ED=96=89?= =?UTF-8?q?=EA=B3=84=ED=9A=8D=EC=84=9C=20=EA=B2=80=EC=83=89=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/ctr/cntrl/controller/CtrCntrlController.java | 8 ++++++++ .../biz/api/ctr/cntrl/model/CtrCntrlWeatherModel.java | 9 +++++++++ .../biz/scheduler/ctr/service/CtrTrnsLctnService.java | 3 +++ 3 files changed, 20 insertions(+) diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java index 326107e..5ec53a6 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java @@ -12,6 +12,8 @@ import java.time.LocalTime; import java.util.*; import com.palnet.biz.api.ctr.cntrl.model.*; +import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel; +import com.palnet.biz.scheduler.ctr.service.CtrTrnsLctnService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -41,6 +43,8 @@ public class CtrCntrlController { private final CtrCntrlService service; + private CtrTrnsLctnService ctrTrnsLctnService; + public CtrCntrlController(CtrCntrlService service) { this.service = service; } @@ -197,6 +201,7 @@ public class CtrCntrlController { coord.setX(rs.getNx()); coord.setY(rs.getNy()); returnCoord = service.wheather(coord); + CtrTrnsLctnModel weatherResult = ctrTrnsLctnService.convertLatlonToAddress(returnCoord.x,returnCoord.y); double nx = returnCoord.getX(); double ny = returnCoord.getY(); @@ -227,6 +232,9 @@ public class CtrCntrlController { while ((line = rd.readLine()) != null) { sb.append(line); } + sb.append(weatherResult.getArea1()); + sb.append(weatherResult.getArea2()); + sb.append(weatherResult.getArea3()); String str = sb.toString(); JSONParser parser = new JSONParser(); JSONObject jsonObject = (JSONObject) parser.parse(str); diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWeatherModel.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWeatherModel.java index 7b13653..43c7cbd 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWeatherModel.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWeatherModel.java @@ -8,5 +8,14 @@ public class CtrCntrlWeatherModel { private double ny; private String Snx; private String Sny; + private Integer hstryAreaSno; + private String area1; + private String area2; + private String area3; + private String zipCd; + private String landNm; + private String landNum; + private String areaType; + private String areaNm; } diff --git a/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java b/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java index 76d7e3e..65e6e57 100644 --- a/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java +++ b/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java @@ -99,6 +99,9 @@ public class CtrTrnsLctnService { Map result = (Map)results.get(typeIndex); result.forEach((resultKey, resultValue) -> { // log.debug(">>> resultKey / resultValue : {} / {}",resultKey, resultValue); + model.setArea1(((Map)((Map)resultValue).get("area1")).get("name").toString()); + model.setArea2(((Map)((Map)resultValue).get("area2")).get("name").toString()); + model.setArea3(((Map)((Map)resultValue).get("area3")).get("name").toString()); if("region".equals(resultKey)){ model.setArea1(((Map)((Map)resultValue).get("area1")).get("name").toString()); model.setArea2(((Map)((Map)resultValue).get("area2")).get("name").toString());