From f3d86af4e05e28a57f463bf9dacf7f7fdae9b9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= <박재우@DESKTOP-EF7ECBO> Date: Wed, 12 Oct 2022 11:35:40 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"=EB=B9=84=ED=96=89=EC=9D=B4?= =?UTF-8?q?=EB=A0=A5=20=ED=98=84=ED=99=A9=20=ED=95=84=ED=84=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 66ec05ecf9f36de43b5ae64f232aac1cf4934877. --- .../anls/hstry/service/AnlsHstryService.java | 78 +++++++++++-------- .../ctr/CtrCntrlQueryRepository.java | 1 - 2 files changed, 46 insertions(+), 33 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 bbd7572..4507ca4 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 @@ -80,6 +80,8 @@ public class AnlsHstryService { //비행이력현황 list public ComnPagingRs list(AnlsHstryGroupModel rq){ Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); + List groupAuthList = jwtTokenUtil.getGroupAuthByToken(); + String groupAuth = null; String appAuth = jwtTokenUtil.getUserAuthByToken(); ListresultList = new ArrayList<>(); @@ -87,40 +89,53 @@ public class AnlsHstryService { Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) { - if("NORMAL".equals(rq.getGroupId())) { - List idntfList = comIdntBasRepository.findIdntfNumber(cstmrSno); /* App 권한이 유저이면서 group 권한도 모두 NORMAL인 ID인 경우 본인이 생성한 기체만 조회 */ - if (idntfList.size() > 0) { - for (ComIdntfBas list : idntfList) { - List results = query.cntrlBasNormalHstryList(rq, list.getIdntfNum()); - if (results.size() > 0) { - resultList.addAll(results); + for(JwtGroupModel list : groupAuthList) { + if(list.getGroupId().equals(rq.getGroupId())) { + groupAuth = list.getGroupAuthCd(); + } + } + if("NORMAL".equals(groupAuth)) { + List idntfList = comIdntBasRepository.findIdntfNumber(cstmrSno); /* App 권한이 유저이면서 group 권한도 모두 NORMAL인 ID인 경우 본인이 생성한 기체만 조회 */ + if (idntfList.size() > 0) { + for (ComIdntfBas list : idntfList) { + List results = query.cntrlBasNormalHstryList(rq, list.getIdntfNum()); + if (results.size() > 0) { + resultList.addAll(results); + } } } - } - List basResult = fltPlanBasRepository.findByPlanSno(cstmrSno); /* App 권한이 유저이면서 group 권한도 모두 - NORMAL인 ID인 경우 cstmrSno로 비행계획서 조회 */ - for (FltPlanBas list : basResult) { - resultList.addAll(query.cntrlBasNormalPlanHstryList(rq, list.getPlanSno())); - } - List pilotResult = fltPlanPilotRepository.findByPlanSno(cstmrSno); /* App 권한이 유저이면서 group 권한도 - 모두 NORMAL인 ID인 경우 cstmrSno로 조종사 조회 */ - - for (FltPlanPilot list : pilotResult) { - resultList.addAll(query.cntrlBasNormalPlanHstryList(rq, list.getPlanSno())); - } - - Comparator comparator = (o1, o2) -> { - if (DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) < 0) { - return 1; - } else if(DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) > 0) { - return -1; + List basResult = fltPlanBasRepository.findByPlanSno(cstmrSno); /* App 권한이 유저이면서 group 권한도 모두 + NORMAL인 ID인 경우 cstmrSno로 비행계획서 조회 */ + for (FltPlanBas list : basResult) { + resultList.addAll(query.cntrlBasNormalPlanHstryList(rq, list.getPlanSno())); } - return 0; - }; - Collections.sort(resultList, comparator); - - } - }else { + List pilotResult = fltPlanPilotRepository.findByPlanSno(cstmrSno); /* App 권한이 유저이면서 group 권한도 + 모두 NORMAL인 ID인 경우 cstmrSno로 조종사 조회 */ + + for (FltPlanPilot list : pilotResult) { + resultList.addAll(query.cntrlBasNormalPlanHstryList(rq, list.getPlanSno())); + } + + Comparator comparator = (o1, o2) -> { + if (DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) < 0) { + return 1; + } else if(DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) > 0) { + return -1; + } + return 0; + }; + Collections.sort(resultList, comparator); + + long totalPage = resultList.size() % rq.getRecord() > 0 ? (resultList.size()/rq.getRecord()) + 1 : resultList.size()/rq.getRecord(); + PageImpl result = new PageImpl<>(resultList, pageable, resultList.size()); + response.setItems(result.getContent()); + response.setTotal(resultList.size()); + response.setTotalPage(totalPage); + response.setPage(rq.getPage()); + + return response; + } + } PageImpl result = query.listCntrlBasRs(rq, pageable); long total = query.countCntrlBasRs(rq, cstmrSno); @@ -129,7 +144,6 @@ public class AnlsHstryService { response.setTotal(total); response.setTotalPage(totalPage); response.setPage(rq.getPage()); - } return response; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 92e3d5d..8748001 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -263,7 +263,6 @@ public List cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Stri BooleanBuilder builder = new BooleanBuilder(); - log.debug("Params ===> " +rq.toString()); Calendar end = Calendar.getInstance(); end.setTime(DateUtils.stringToDate(rq.getEndDate())); end.add(Calendar.DATE, 1);