warnlog 수정

src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java

@@ -244,27 +244,32 @@ public class CtrCntrlService {
 
 			CtrCntrlBas control = cntrlBasRepository.findById(cntrlId).orElse(null);
 			CtrCntrlHstry hisControl = cntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(cntrlId).orElse(null);
-
+			List<BasFlightPlanModel> flightPlan = new ArrayList<>();
-			if (hisControl != null) {
+			if (hisControl != null && control != null) {
-				List<BasFlightPlanModel> flightPlan = this.getFlightPlan(control.getIdntfNum());
+				flightPlan = this.getFlightPlan(control.getIdntfNum());
-
+			} else {
-				if (flightPlan != null && !flightPlan.isEmpty()) {
+				flightPlan = this.getFlightPlan(hisControl.getTrmnlId());
-					CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq();
+			}
-					containsRq.setIdntfNum(control.getIdntfNum());
+			if (flightPlan != null && !flightPlan.isEmpty()) {
-					containsRq.setLat(hisControl.getLat());
+				CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq();
-					containsRq.setLon(hisControl.getLon());
+				containsRq.setIdntfNum(control.getIdntfNum());
-					containsRq.setPlanList(flightPlan);
+				containsRq.setLat(hisControl.getLat());
-
+				containsRq.setLon(hisControl.getLon());
-					CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = this.checkPlanContains(containsRq);
+				containsRq.setPlanList(flightPlan);
-					model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning());
+
-				}
+				CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = this.checkPlanContains(containsRq);
+				model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning());
 			}
 
 			if (model.isControlWarnCd()) {
 				CtrCntrlWarnLog log = new CtrCntrlWarnLog();
-
+				if(control != null) {
-				log.setCntrlId(control.getCntrlId());
+					log.setCntrlId(control.getCntrlId());
-				log.setIdntfNum(control.getIdntfNum());
+					log.setIdntfNum(control.getIdntfNum());
+				} else {
+					log.setCntrlId(hisControl.getCntrlId());
+					log.setIdntfNum(hisControl.getTrmnlId());
+				}
 				log.setOccurDt(hisControl.getSrvrRcvDt());
 				log.setLat(hisControl.getLat());
 				log.setLon(hisControl.getLon());
@@ -282,15 +287,20 @@ public class CtrCntrlService {
 				model.setCreateDt(warnLog.getCreateDt());
 				model.setCreateUserId(warnLog.getCreateUserId());
 			}
+			if(control != null) {
+			model.setCntrlId(control.getCntrlId());
+			model.setIdntfNum(control.getIdntfNum());
+			model.setWarnCount(warnCount);
 
-			
+			result.add(model);
-			if(control.getCntrlId()!=null) model.setCntrlId(control.getCntrlId());
+			return result;
-			if(control.getIdntfNum()!=null) model.setIdntfNum(control.getIdntfNum());
+			}
-			if(warnCount!=null) model.setWarnCount(warnCount);
+			model.setCntrlId(hisControl.getCntrlId());
+			model.setIdntfNum(hisControl.getTrmnlId());
+			model.setWarnCount(warnCount);
 			
 			result.add(model);
 		}
-
 		return result;
 	}
 

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

@@ -33,7 +33,7 @@ public class MessageConsumer {
             GPModel model = objectMapper.readValue(message, GPModel.class);
 
             messageService.insert(model); // GPS 정보 DB 동기화 처리
-//            channel.queueDeclare(message, true, false, false, null);
+
             channel.basicAck(tag, false);
         } catch (RuntimeException e) {
             channel.basicReject(tag, false);