드론관제 - 날씨 데이터 추가

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());