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

src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@@ -90,18 +90,21 @@ public class BasFlightService {
         List<BasGroupJoinModel> groupList = ptyPlanQueryRepository.joinList(rq.getCstmrSno());
         String userAccount = null;
         String masterAccount = null;
+        String appAuth = jwtTokenUtil.getUserAuthByToken();
+
         for(BasGroupJoinModel list : groupList) {
         	if(list.getGroupId().equals(rq.getGroupId())) {
         		userAccount = list.getGroupAuthCd();
 //        		if(userAccount.equals("CREATER")||userAccount.equals("ADMIN")) {
-        			if(userAccount.equals("MASTER")||userAccount.equals("LEADER")) {
+        			if(userAccount.equals("MASTER")||userAccount.equals("LEADER") || appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
-        			masterAccount = userAccount;
+        			masterAccount = "ADMIN";
         		}else {
 //        			masterAccount = "USER";
         			masterAccount = "NORMAL";
         		}
         	}
         }
+        log.info("masterAccount :  >>>>> {}" , appAuth);
         return fltPlanQueryRepository.listPlan(rq, masterAccount);
     }
 

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

@@ -116,7 +116,6 @@ public class CtrCntrlService {
 		
 		List<CtrCntrlHstryArea> areaList = query.detailArea(controlId);
 		String stAreaNm = "";
-//		log.debug(">>>>" + areaList );
 		
 		for(CtrCntrlHstryArea data : areaList) {
 			if(data.getActnType().equals("01")) {
@@ -148,7 +147,6 @@ public class CtrCntrlService {
 		result.setStAreaNm(stAreaNm);
 		
 		return result;
-		
 	}
 
 	/**

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

@@ -132,10 +132,13 @@ public class MessageServiceImpl implements MessageService {
             ctrCntrlJpaService.insertCtrCntrlBas(dbModel);
         }
 
-        CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel);
+        // Drone인 경우에만 history 생성
+        if (model.getObjectId().indexOf("PALDRONE") > -1) {
+            CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel);
 
-        if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) {
+            if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) {
-            ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno());
+                ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno());
+            }    
         }        
     }