From 3207525ffbd404410fae27cc30904e305d65e9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Fri, 18 Nov 2022 14:32:32 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=EA=B4=80=EC=A0=9C=20-=20?= =?UTF-8?q?=EB=82=A0=EC=94=A8=20=EB=8D=B0=EC=9D=B4=ED=84=B0=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/service/CtrCntrlService.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 80f66ca..94f081c 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -18,6 +18,8 @@ import java.util.Map; import java.util.UUID; 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 org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; @@ -67,7 +69,8 @@ public class CtrCntrlService { @Autowired private JwtTokenUtil jwtTokenUtil; - + @Autowired + private CtrTrnsLctnService ctrTrnsLctnService; private final CtrCntrlQueryRepository query; private final CtrCntrlBasRepository cntrlBasRepository; private final CtrCntrlHstryRepository cntrlHstryRepository; @@ -635,10 +638,19 @@ public class CtrCntrlService { while ((line = rd.readLine()) != null) { sb.append(line); } + CtrTrnsLctnModel weatherResult = ctrTrnsLctnService.convertLatlonToAddress(rq.getNx(),rq.getNy()); + log.info("weatherResult >>>> : {}", weatherResult); String str = sb.toString(); JSONParser parser = new JSONParser(); JSONObject jsonObject = (JSONObject) parser.parse(str); + if(weatherResult != null) { + jsonObject.put("area1",weatherResult.getArea1()); + jsonObject.put("area2",weatherResult.getArea2()); + jsonObject.put("area3",weatherResult.getArea3()); + jsonObject.put("landNm",weatherResult.getLandNm()); + jsonObject.put("landNum",weatherResult.getLandNum()); + } rd.close(); conn.disconnect(); log.info(sb.toString());