From 214ef305a075f2f9e5260bd408deb70ead30d506 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: Tue, 11 Oct 2022 16:57:06 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=8B=9C=EB=AE=AC?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=ED=8E=98=EC=9D=B4=EC=A7=95?=
 =?UTF-8?q?=EC=9E=91=EC=97=85(super=20,=20admin=EB=A7=8C=20=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anls/smlt/service/AnlsSmltService.java    | 48 +++++++++++--------
 .../ctr/CtrCntrlQueryRepository.java          |  7 +--
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java b/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java
index 7296b29..9922d54 100644
--- a/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java
+++ b/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java
@@ -69,20 +69,28 @@ public class AnlsSmltService {
 		String appAuth = jwtTokenUtil.getUserAuthByToken();
 		List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken();
  		Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
- 		
+ 		ComnPagingRs<AnlsHstryModel> response = new ComnPagingRs<>();
+		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
 
-		List<AnlsHstryModel> resultList = new ArrayList<>();
-		
+		PageImpl<AnlsHstryModel> result;
+		List<AnlsHstryModel>resultList = new ArrayList<>();
+		long total = resultList.size();
+		long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();
 		if("SUPER".equals(appAuth)||"ADMIN".equals(appAuth)) { // App 권한이 수퍼 / 어드민일 경우 목록 전부 표출
-			resultList = query.listCntrlBas(rq);
+			result = query.listCntrlBas(rq, pageable);
+			response.setItems(result.getContent());
+			response.setTotal(total);
+			response.setTotalPage(totalPage);
+			response.setPage(rq.getPage());
+			return response;
 		}
 		
 		if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) {  // App 권한은 user이지만 group 권한이 LEADER / MASTER인 그룹이 있는 경우 해당 그룹의 비행 이력 목록 표출
 			for (JwtGroupModel list : groupAuth) {
 				if("MASTER".equals(list.getGroupAuthCd()) || "LEADER".equals(list.getGroupAuthCd())) {
-					List<AnlsHstryModel> result = query.cntrlBasAuthList(rq, list.getGroupId());
-					if (result.size() > 0) {
-						resultList.addAll(result);
+					List<AnlsHstryModel> results = query.cntrlBasAuthList(rq, list.getGroupId());
+					if (results.size() > 0) {
+						resultList.addAll(results);
 					}
 				}
 			} 
@@ -91,9 +99,9 @@ public class AnlsSmltService {
 			List<ComIdntfBas> idntfList = comIdntBasRepository.findIdntfNumber(cstmrSno);
 			if (idntfList.size() > 0) {
 				for (ComIdntfBas list : idntfList) {
-					List<AnlsHstryModel> result = query.cntrlBasNormalList(rq, list.getIdntfNum());
-					if (result.size() > 0) {
-						resultList.addAll(result);
+					List<AnlsHstryModel> results = query.cntrlBasNormalList(rq, list.getIdntfNum());
+					if (results.size() > 0) {
+						resultList.addAll(results);
 					}
 				}
 			}
@@ -117,20 +125,18 @@ public class AnlsSmltService {
 				}
 				return 0;
 			};
-
+			
 			Collections.sort(resultList, comparator);
-
+			PageImpl<AnlsHstryModel> res = new PageImpl<>(resultList, pageable, resultList.size());
+			response.setItems(res.getContent());
+			response.setTotal(total);
+			response.setTotalPage(totalPage);
+			response.setPage(rq.getPage());
 		}
 		
-		ComnPagingRs<AnlsHstryModel> response = new ComnPagingRs<>();
-		Pageable pageable = PageRequest.of(rq.getPage()-1, 5);
-		PageImpl<AnlsHstryModel> result =new PageImpl<AnlsHstryModel>(resultList, pageable, resultList.size());
-		long total = resultList.size();
-		long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();
-		response.setItems(result.getContent());
-		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 bfccae2..08436a2 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
@@ -70,7 +70,7 @@ public class CtrCntrlQueryRepository{
 	 * @param rq
 	 * @return
 	 */
-	public List<AnlsHstryModel> listCntrlBas(AnlsHstryRqModel rq){
+	public PageImpl<AnlsHstryModel> listCntrlBas(AnlsHstryRqModel rq, Pageable pageable){
 		
 		QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
 		QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
@@ -78,7 +78,6 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder builder = new BooleanBuilder();
 		
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
-		log.debug("Params ===> " +rq.toString());
 		Calendar end = Calendar.getInstance(); 
 		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
 		end.add(Calendar.DATE, 1);
@@ -128,6 +127,8 @@ public class CtrCntrlQueryRepository{
 				.on(qCntrlHstryAreaEntity.actnType.eq("01"))
 				.where(builder)
 				.orderBy(qCntrlBasEntity.cntrlStDt.asc())
+				.offset(pageable.getOffset())
+				.limit(5)
 				.fetch();
 		
 		for(AnlsHstryModel model: queryList) {
@@ -158,7 +159,7 @@ public class CtrCntrlQueryRepository{
 
 		
 				
-		return result;
+		return new PageImpl<>(result, pageable, result.size());
 	}
 	
 	public List<AnlsHstryModel> cntrlBasAuthList(AnlsHstryRqModel rq, String groupId){