From 133b767992c6073deca04dc99d2a3d41ce5579d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Thu, 22 Sep 2022 11:50:14 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=83=81?=
 =?UTF-8?q?=ED=99=A9=20=EA=B0=90=EC=A7=80=20api=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cntrl/controller/CtrCntrlController.java  | 23 +++++++++++++++----
 .../ctr/cntrl/service/CtrCntrlService.java    | 11 +++++++--
 .../palnet/biz/config/WebSecurityConfig.java  |  1 +
 3 files changed, 28 insertions(+), 7 deletions(-)

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 d25c631..9d5394f 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
@@ -199,13 +199,26 @@ public class CtrCntrlController {
 		return ResponseEntity.ok().body(new SuccessResponse(rs));
 	}
 
-	@GetMapping("/id/{id}/{lat}/{lon}")
-	public ResponseEntity<? extends BasicResponse> getId(@PathVariable String id,
-														 @PathVariable Double lat,
-														 @PathVariable Double lon) {
+	@GetMapping("/id/{id}")
+	public ResponseEntity<? extends BasicResponse> getId(@PathVariable String id) {
 		Map<String, String> result;
 		try {
-			result = service.getId(id, lat, lon);
+			result = service.getId(id);
+		} catch (Exception e) {
+			log.error("IGNORE : {}", e);
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(new ErrorResponse("Server Error", "-1"));
+		}
+		return ResponseEntity.ok().body(new SuccessResponse(result));
+	}
+
+	@GetMapping("/warn/{id}/{lat}/{lon}")
+	public ResponseEntity<? extends BasicResponse> checkWarring(@PathVariable String id,
+																@PathVariable Double lat,
+																@PathVariable Double lon) {
+		Map<String, String> result;
+		try {
+			result = service.checkWarring(id, lat, lon);
 		} catch (Exception e) {
 			log.error("IGNORE : {}", e);
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
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 8fe6e2b..5e3ae8f 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
@@ -255,7 +255,7 @@ public class CtrCntrlService {
 				if (arcrftList != null && !arcrftList.isEmpty()) {
 					arcrftList.forEach(arcrft -> {
 						FltPlanBas plan = planBasRepository.
-								findByGroupFlightPlan(arcrft.getPlanSno(), "N", fltNowDt).orElse(null);
+								findByGroupFlightPlan(arcrft.getPlanSno(), "Y", fltNowDt).orElse(null);
 
 						if (plan != null ) {
 							BasFlightPlanModel planMapping = BasFlightMapper.mapper.entityToModel(plan);
@@ -380,7 +380,7 @@ public class CtrCntrlService {
 	}
 
 
-	public Map<String, String> getId(String id, Double lat, Double lon) {
+	public Map<String, String> getId(String id) {
 		Map<String, String> result = new HashMap<>();
 
 
@@ -424,8 +424,15 @@ public class CtrCntrlService {
 			shareContext.putIdntfKey(id, controlID);
 		}
 
+		return result;
+	}
+
+	public Map<String, String> checkWarring(String id, Double lat, Double lon) {
+		Map<String, String> result = new HashMap<>();
+
 		List<BasFlightPlanModel> planList = this.getFlightPlan(id);
 
+		result.put("controlWarnCd", "N");
 		if(planList != null && !planList.isEmpty()) {
 			CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq();
 			containsRq.setIdntfNum(id);
diff --git a/src/main/java/com/palnet/biz/config/WebSecurityConfig.java b/src/main/java/com/palnet/biz/config/WebSecurityConfig.java
index 71e8336..f24a967 100644
--- a/src/main/java/com/palnet/biz/config/WebSecurityConfig.java
+++ b/src/main/java/com/palnet/biz/config/WebSecurityConfig.java
@@ -38,6 +38,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	private final String[] PERMITTED_URL = {
 			"/api/acnt/**",
 			"/api/ctr/cntrl/id/**",
+			"/api/ctr/cntrl/warn/**",
 			/* swagger v2 */
 			"/v2/api-docs",
 			"/swagger-resources",