날씨API - 비행계획서 검색 추가

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

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

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