From 96c93c58a168bbe956acb8ae880a7e0f73b6af46 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: Fri, 14 Oct 2022 14:46:33 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hstry/controller/AnlsHstryController.java | 8 ++-- .../anls/hstry/service/AnlsHstryService.java | 26 +++++------- .../ctr/CtrCntrlQueryRepository.java | 42 +++++++++---------- 3 files changed, 33 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java index adb38f0..c44b708 100644 --- a/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java +++ b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java @@ -88,14 +88,14 @@ public class AnlsHstryController { } - @GetMapping(value = "/log") + @GetMapping(value = "/log/{id}") @ApiOperation(value = "비행 이력 데이터") @Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API") @ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class) - public ResponseEntity log(AnlsHstryRqModel rq) { - ComnPagingRs result = null; + public ResponseEntity log(@PathVariable String id) { + List result = null; try { - result = service.hstryList(rq); + result = service.hstryList(id); } catch (Exception e) { log.error("IGNORE : {}", e); 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 78a8105..a9c92f3 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 @@ -18,6 +18,7 @@ import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PathVariable; import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; @@ -81,6 +82,7 @@ public class AnlsHstryService { public ComnPagingRs list(AnlsHstryGroupModel rq){ Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); List groupAuthList = jwtTokenUtil.getGroupAuthByToken(); + List adminAuth = new ArrayList<>(); String groupAuth = null; String appAuth = jwtTokenUtil.getUserAuthByToken(); PageImplresultList; @@ -96,6 +98,11 @@ public class AnlsHstryService { } } if("NORMAL".equals(groupAuth)) { + for (JwtGroupModel list : groupAuthList) { + if("MASTER".equals(list.getGroupAuthCd()) || "LEADER".equals(list.getGroupAuthCd())) { + adminAuth.add(list); + } + } List idntfList = comIdntBasRepository.findIdntfNumber(cstmrSno); List basResult = fltPlanBasRepository.findByPlanSno(cstmrSno); List pilotList = fltPlanPilotRepository.findByPlanSno(cstmrSno); @@ -149,23 +156,10 @@ public class AnlsHstryService { } - public ComnPagingRs hstryList(AnlsHstryRqModel rq) { - - ComnPagingRs response = new ComnPagingRs<>(); - - Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); - - PageImpl result = query.listCntrlHstryPage(rq.getCntrlId(), pageable); - - long total = query.listCntrlHstryCount(rq.getCntrlId()); - - long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord(); + public List hstryList(@PathVariable String id) { - response.setItems(result.getContent()); - response.setTotal(total); - response.setPage(rq.getPage()); - response.setTotalPage(totalPage); + List result = query.listCntrlHstryPage(id); - return response; + return result; } } 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 b2cbc30..df493e1 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 @@ -268,7 +268,11 @@ public class CtrCntrlQueryRepository{ return result; } - public PageImpl cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Pageable pageable, List idntfList, List basResult, List pilotResult){ + public PageImpl cntrlBasNormalHstryList(AnlsHstryGroupModel rq, + Pageable pageable, + List idntfList, + List basResult, + List pilotResult){ QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; @@ -357,6 +361,7 @@ public class CtrCntrlQueryRepository{ .or(basBuilder) .or(pilotBuilder))) .orderBy(qCntrlBasEntity.cntrlStDt.asc()) + .groupBy(qFltPlanBasEntity.planSno) .offset(pageable.getOffset()) .limit(pageable.getPageSize()) .fetch(); @@ -618,7 +623,10 @@ public class CtrCntrlQueryRepository{ return result; } - public long cntrlBasNormalHstryCount(AnlsHstryGroupModel rq, List idntfList, List basResult, List pilotResult){ + public long cntrlBasNormalHstryCount(AnlsHstryGroupModel rq, + List idntfList, + List basResult, + List pilotResult){ QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; @@ -708,6 +716,7 @@ public class CtrCntrlQueryRepository{ .or(basBuilder) .or(pilotBuilder))) .orderBy(qCntrlBasEntity.cntrlStDt.asc()) + .groupBy(qFltPlanBasEntity.planSno) .fetchCount(); return result; @@ -910,8 +919,6 @@ public class CtrCntrlQueryRepository{ @Cacheable(value = "cntrl-count") public long countCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno) { QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; - QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; - QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas; @@ -922,7 +929,7 @@ public class CtrCntrlQueryRepository{ end.setTime(DateUtils.stringToDate(rq.getEndDate())); end.add(Calendar.DATE, 1); Date endDate = end.getTime(); - builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); + builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId())); builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate()))); builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); @@ -934,11 +941,7 @@ public class CtrCntrlQueryRepository{ long count = query .select(qCntrlBasEntity) - .from(qComArcrftBasEntity) - .leftJoin(qComIdntfBasEntity) - .on(qComArcrftBasEntity.arcrftSno.eq(qComIdntfBasEntity.arcrftSno)) - .leftJoin(qCntrlBasEntity) - .on(qComIdntfBasEntity.idntfNum.eq(qCntrlBasEntity.idntfNum)) + .from(qCntrlBasEntity) .leftJoin(qCntrlHstryAreaEntity) .on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) .leftJoin(qFltPlanCtrCntrlRelEntity) @@ -947,6 +950,7 @@ public class CtrCntrlQueryRepository{ .on(qFltPlanCtrCntrlRelEntity.planSno.eq(qFltPlanBasEntity.planSno)) .where(builder) .orderBy(qCntrlBasEntity.cntrlStDt.desc()) + .groupBy(qCntrlBasEntity.cntrlId) .fetchCount(); return count; @@ -954,11 +958,9 @@ public class CtrCntrlQueryRepository{ } - @Cacheable(value = "cntrl-list") + public PageImpl listCntrlBasRs(AnlsHstryGroupModel rq, Pageable pageable){ QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; - QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; - QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas; @@ -969,7 +971,7 @@ public class CtrCntrlQueryRepository{ end.setTime(DateUtils.stringToDate(rq.getEndDate())); end.add(Calendar.DATE, 1); Date endDate = end.getTime(); - builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); + builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId())); builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate()))); builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); @@ -991,11 +993,7 @@ public class CtrCntrlQueryRepository{ qCntrlHstryAreaEntity.landNm, qCntrlHstryAreaEntity.landNum )) - .from(qComArcrftBasEntity) - .leftJoin(qComIdntfBasEntity) - .on(qComArcrftBasEntity.arcrftSno.eq(qComIdntfBasEntity.arcrftSno)) - .leftJoin(qCntrlBasEntity) - .on(qComIdntfBasEntity.idntfNum.eq(qCntrlBasEntity.idntfNum)) + .from(qCntrlBasEntity) .leftJoin(qCntrlHstryAreaEntity) .on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) .leftJoin(qFltPlanCtrCntrlRelEntity) @@ -1045,7 +1043,7 @@ public class CtrCntrlQueryRepository{ * @param id * @return */ - public PageImpl listCntrlHstryPage(String id, Pageable pageable){ + public List listCntrlHstryPage(String id){ QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; QCtrCntrlHstry qCtrCntrHstry = QCtrCntrlHstry.ctrCntrlHstry; @@ -1079,11 +1077,9 @@ public class CtrCntrlQueryRepository{ .on(qCntrlBasEntity.cntrlId.eq(qCtrCntrHstry.cntrlId)) .where(builder) .orderBy(qCtrCntrHstry.srvrRcvDt.asc()) - .offset(pageable.getOffset()) - .limit(pageable.getPageSize()) .fetch(); - return new PageImpl<>(result, pageable, result.size()); + return result; } public List listCntrlHstry(String id){