Merge remote-tracking branch 'origin/master'

src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java

@@ -141,12 +141,14 @@ public class JwtTokenUtil implements Serializable {
         List<LinkedHashMap> groupList = payload.get("group", ArrayList.class);
         List<JwtGroupModel> r = new ArrayList<>();
         
+        if(groupList!=null) {
 	        for(LinkedHashMap<String, String> map : groupList){
 	            JwtGroupModel model = new JwtGroupModel();
 	            model.setGroupId(map.get("groupId"));
 	            model.setGroupAuthCd(map.get("groupAuthCd"));
 	            r.add(model);
 	        }
+        }
         return r;
     }
 

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

@@ -239,10 +239,12 @@ 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 {
+				flightPlan = this.getFlightPlan(hisControl.getTrmnlId());
+			}
 			if (flightPlan != null && !flightPlan.isEmpty()) {
 				CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq();
 				containsRq.setIdntfNum(control.getIdntfNum());
@@ -253,13 +255,16 @@ public class CtrCntrlService {
 				CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = this.checkPlanContains(containsRq);
 				model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning());
 			}
-			}
 
 			if (model.isControlWarnCd()) {
 				CtrCntrlWarnLog log = new CtrCntrlWarnLog();
-
+				if(control != null) {
 					log.setCntrlId(control.getCntrlId());
 					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());
@@ -277,15 +282,20 @@ public class CtrCntrlService {
 				model.setCreateDt(warnLog.getCreateDt());
 				model.setCreateUserId(warnLog.getCreateUserId());
 			}
-
+			if(control != null) {
-			
+			model.setCntrlId(control.getCntrlId());
-			if(control.getCntrlId()!=null) model.setCntrlId(control.getCntrlId());
+			model.setIdntfNum(control.getIdntfNum());
-			if(control.getIdntfNum()!=null) model.setIdntfNum(control.getIdntfNum());
+			model.setWarnCount(warnCount);
-			if(warnCount!=null) model.setWarnCount(warnCount);
 
 			result.add(model);
+			return result;
 			}
+			model.setCntrlId(hisControl.getCntrlId());
+			model.setIdntfNum(hisControl.getTrmnlId());
+			model.setWarnCount(warnCount);
 			
+			result.add(model);
+		}
 		return result;
 	}
 

src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -1510,6 +1510,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 		  
 		  
 		  for(CtrCntrlGroupModel list : model) {
+			  if(groupAuth != null) {
 				  for(JwtGroupModel lists : groupAuth) {
 					  if(list.getGroupId().equals(lists.getGroupId())) {
 						  list.setGroupAuthCd(lists.getGroupAuthCd());
@@ -1519,6 +1520,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 					  }
 				  }
 			  }
+		  }
 		  return model;
 		  //
 		

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

@@ -33,8 +33,8 @@ 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);
+//            channel.basicAck(tag, false);
         } catch (RuntimeException e) {
             channel.basicReject(tag, false);
         }