Merge branch 'master' of http://gitea.palntour.com/pav/pav-server.git

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,
+	@GetMapping("/id/{id}")
+	public ResponseEntity<? extends BasicResponse> getId(@PathVariable String id) {
+		Map<String, String> result;
+		try {
+			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.getId(id, lat, lon);
+			result = service.checkWarring(id, lat, lon);
 		} catch (Exception e) {
 			log.error("IGNORE : {}", e);
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)

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

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",