From 30929f210dbc99769c2ddb2c30ba88be11911016 Mon Sep 17 00:00:00 2001 From: hagjoon Date: Thu, 29 Sep 2022 16:17:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=84=9C=20=EA=B6=8C=ED=95=9C=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/anls/hstry/service/AnlsHstryService.java | 1 - .../biz/api/bas/flight/service/BasFlightService.java | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java index 1bda77c..b8959ac 100644 --- a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java +++ b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java @@ -76,7 +76,6 @@ public class AnlsHstryService { } ComnPagingRs response = new ComnPagingRs<>(); - List returnList = new ArrayList<>(); Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index b0e3062..a5e4e20 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -90,18 +90,21 @@ public class BasFlightService { List 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")) { - masterAccount = userAccount; + if(userAccount.equals("MASTER")||userAccount.equals("LEADER") || appAuth.equals("USER") || appAuth.equals("ROLE_USER")) { + masterAccount = "ADMIN"; }else { // masterAccount = "USER"; masterAccount = "NORMAL"; } } } + log.info("masterAccount : >>>>> {}" , appAuth); return fltPlanQueryRepository.listPlan(rq, masterAccount); } From cf559d90bcbda69a09e290a66cd8aff2b3644aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Thu, 29 Sep 2022 17:06:36 +0900 Subject: [PATCH 2/2] =?UTF-8?q?drone=20history=20=EA=B5=AC=EB=B6=84=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/ctr/cntrl/service/CtrCntrlService.java | 2 -- .../message/service/impl/MessageServiceImpl.java | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 6d59340..c9896b6 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -116,7 +116,6 @@ public class CtrCntrlService { List 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; - } /** diff --git a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java index c4faec3..d9504e9 100644 --- a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java @@ -132,11 +132,14 @@ public class MessageServiceImpl implements MessageService { ctrCntrlJpaService.insertCtrCntrlBas(dbModel); } - CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel); - - if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) { - ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno()); - } + // Drone인 경우에만 history 생성 + if (model.getObjectId().indexOf("PALDRONE") > -1) { + CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel); + + if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) { + ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno()); + } + } } @Override