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);