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..3727c4e 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 @@ -66,24 +66,17 @@ public class AnlsHstryService { //비행이력현황 list public ComnPagingRs list(AnlsHstryGroupModel rq){ - List group = jwtTokenUtil.getGroupAuthByToken(); Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); - String userAccount = null; - for(JwtGroupModel list : group) { - if(rq.getGroupId().equals(list.getGroupId())) { - userAccount = list.getGroupAuthCd(); - } - } + ComnPagingRs response = new ComnPagingRs<>(); - List returnList = new ArrayList<>(); Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); - PageImpl result = query.listCntrlBasRs(rq, userAccount, pageable); + PageImpl result = query.listCntrlBasRs(rq, pageable); - long total = query.countCntrlBasRs(rq, cstmrSno, userAccount); + long total = query.countCntrlBasRs(rq, cstmrSno); long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord(); 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 a75ef15..1dac49a 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 @@ -5,17 +5,15 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; -import com.palnet.biz.jpa.entity.*; -import com.palnet.comn.model.GPHistoryModel; -import com.querydsl.core.QueryResults; -import com.querydsl.core.Tuple; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; +import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryGroupModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; @@ -26,8 +24,18 @@ import com.palnet.biz.api.anls.smlt.model.AnlsSmltStcsModel; import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel; import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlEndModel; import com.palnet.biz.api.main.dash.model.MainDashStcsModel; +import com.palnet.biz.jpa.entity.ComArcrftBas; +import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; +import com.palnet.biz.jpa.entity.QComArcrftBas; +import com.palnet.biz.jpa.entity.QComIdntfBas; +import com.palnet.biz.jpa.entity.QCtrCntrlBas; +import com.palnet.biz.jpa.entity.QCtrCntrlHstry; +import com.palnet.biz.jpa.entity.QCtrCntrlHstryArea; +import com.palnet.biz.jpa.entity.QPtyCstmrBas; +import com.palnet.biz.jpa.entity.QPtyCstmrGroup; +import com.palnet.biz.jpa.entity.QPtyGroupBas; +import com.palnet.comn.model.GPHistoryModel; import com.palnet.comn.utils.DateUtils; -import com.palnet.comn.utils.EncryptUtils; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.ConstantImpl; import com.querydsl.core.types.Projections; @@ -47,6 +55,8 @@ public class CtrCntrlQueryRepository{ private final JPAQueryFactory query; + @Autowired + private JwtTokenUtil jwtTokenUtil; /** * 비행 현황 데이터 조회 * @param rq @@ -143,7 +153,7 @@ public class CtrCntrlQueryRepository{ } @Cacheable(value = "cntrl-count") - public long countCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno, String userAccount) { + public long countCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno) { QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; @@ -182,7 +192,7 @@ public class CtrCntrlQueryRepository{ @Cacheable(value = "cntrl-list") - public PageImpl listCntrlBasRs(AnlsHstryGroupModel rq, String userAccount, Pageable pageable){ + public PageImpl listCntrlBasRs(AnlsHstryGroupModel rq, Pageable pageable){ QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; @@ -190,7 +200,6 @@ public class CtrCntrlQueryRepository{ BooleanBuilder builder = new BooleanBuilder(); - builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate())));