From 8f45a131bf016fe35981872e05d4a2d49e89dd72 Mon Sep 17 00:00:00 2001 From: thkim Date: Wed, 24 Jan 2024 10:40:55 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=BB=A8=ED=85=90=EC=B8=A0=EA=B4=80=EB=A6=AC=20-=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=EA=B4=80=EB=A6=AC=20paging=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TnPopupMngRepositoryWithoutPopupContents.java | 1 - .../popUp/service/impl/PopUpApiServiceImpl.java | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/repository/TnPopupMngRepositoryWithoutPopupContents.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/repository/TnPopupMngRepositoryWithoutPopupContents.java index b89a8f7..b188d61 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/repository/TnPopupMngRepositoryWithoutPopupContents.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/repository/TnPopupMngRepositoryWithoutPopupContents.java @@ -8,5 +8,4 @@ import java.util.List; public interface TnPopupMngRepositoryWithoutPopupContents extends JpaRepository { - } diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java index 4b768a6..6069332 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java @@ -42,13 +42,8 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU "\n--------------------------------------------------------------\n" ); - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(pageable.getPageNumber()); - paginationInfo.setRecordCountPerPage(pageable.getPageSize()); - paginationInfo.setPageSize(5);//hard coded - paginationInfo.setTotalRecordCount(123);//hard coded - + Long totalRecordCount = tnPopupMngRepositoryWithoutPopupContents.count(); //List> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(Sort.by(Sort.Direction.DESC, "popupSeq")) List> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(pageable) .stream() @@ -70,6 +65,12 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU }) .collect(Collectors.toList()); + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(pageable.getPageNumber()+1); + paginationInfo.setRecordCountPerPage(pageable.getPageSize()); + paginationInfo.setPageSize(5);//hard coded + paginationInfo.setTotalRecordCount(totalRecordCount.intValue());//hard coded + Map dto = new HashMap(); dto.put("listPopup", listPopup); dto.put("paginationInfo", paginationInfo);