[관제] 비정상 로직 수정

src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java

@@ -199,11 +199,13 @@ public class CtrCntrlController {
 		return ResponseEntity.ok().body(new SuccessResponse(rs));
 	}
 
-	@GetMapping("/id/{id}")
+	@GetMapping("/id/{id}/{lat}/{lon}")
-	public ResponseEntity<? extends BasicResponse> getId(@PathVariable String id) {
+	public ResponseEntity<? extends BasicResponse> getId(@PathVariable String id,
+														 @PathVariable Double lat,
+														 @PathVariable Double lon) {
 		Map<String, String> result;
 		try {
-			result = service.getId(id);
+			result = service.getId(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

@@ -380,7 +380,7 @@ public class CtrCntrlService {
 	}
 
 
-	public Map<String, String> getId(String id) {
+	public Map<String, String> getId(String id, Double lat, Double lon) {
 		Map<String, String> result = new HashMap<>();
 
 		/* 식별번호의 가장 최근 이력 불러오기 */
@@ -418,6 +418,20 @@ public class CtrCntrlService {
 			// 기체 식별번호의 관제 ID 저장 (single ton)
 			shareContext.putIdntfKey(id, controlID);
 		}
+
+		List<BasFlightPlanModel> planList = this.getFlightPlan(id);
+
+		if(planList != null && !planList.isEmpty()) {
+			CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq();
+			containsRq.setIdntfNum(id);
+			containsRq.setLat(lat);
+			containsRq.setLon(lon);
+			containsRq.setPlanList(planList);
+
+			CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = this.checkPlanContains(containsRq);
+			result.put("controlWarnCd", ctrCntrlPlanContainsRs.isWarning() ? "Y" : "N");
+		}
+
 		return result;
 	}
 }

src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java

@@ -36,9 +36,9 @@ public class MessageConsumer {
             e.printStackTrace();
         }
 
-        GPModel mapper = messageService.mapper(model);
+//        GPModel mapper = messageService.mapper(model);
 
-        messageService.insert(mapper); // GPS 정보 DB 동기화 처리
+        messageService.insert(model); // GPS 정보 DB 동기화 처리
 
         /* Websocket Model 메세지 서버로 위임 */
 //        messageService.sendToMessage(mapper);

src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java

@@ -130,18 +130,18 @@ public class MessageServiceImpl implements MessageService {
 //        }
 
         // 비행구역 Contains Check
-        List<BasFlightPlanModel> planList = ctrCntrlService.getFlightPlan(model.getObjectId());
+//        List<BasFlightPlanModel> planList = ctrCntrlService.getFlightPlan(model.getObjectId());
-
+//
-        if(planList != null && !planList.isEmpty()) {
+//        if(planList != null && !planList.isEmpty()) {
-            CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq();
+//            CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq();
-            containsRq.setIdntfNum(model.getObjectId());
+//            containsRq.setIdntfNum(model.getObjectId());
-            containsRq.setLat(model.getLat());
+//            containsRq.setLat(model.getLat());
-            containsRq.setLon(model.getLng());
+//            containsRq.setLon(model.getLng());
-            containsRq.setPlanList(planList);
+//            containsRq.setPlanList(planList);
-
+//
-            CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = ctrCntrlService.checkPlanContains(containsRq);
+//            CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = ctrCntrlService.checkPlanContains(containsRq);
-            model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning());
+//            model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning());
-        }
+//        }
 
         return model;
     }

src/main/resources/application.yml

@@ -47,8 +47,8 @@ spring:
       hibernate:
 #        use_sql_comments: true
 #        use_sql_comments: false
-        show_sql: true
+#        show_sql: true
-        format_sql: true
+#        format_sql: true
   rabbitmq:
     host: 192.168.0.24
     port: 5672