refactor: add totalPage field to PageResult

ShiinaKin · Oct 20, 2024 · f15bcaa · f15bcaa
1 parent 5e470a1
commit f15bcaa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/app/src/main/kotlin/io/sakurasou/controller/vo/CommonVO.kt b/app/src/main/kotlin/io/sakurasou/controller/vo/CommonVO.kt
@@ -11,6 +11,7 @@ data class PageResult<T>(
     val page: Long,
     val pageSize: Int,
     val total: Long,
+    val totalPage: Long,
     val data: List<T>
 )
 

diff --git a/app/src/main/kotlin/io/sakurasou/model/dao/common/PaginationDao.kt b/app/src/main/kotlin/io/sakurasou/model/dao/common/PaginationDao.kt
@@ -26,6 +26,7 @@ interface PaginationDao {
         val offset = (page - 1) * pageSize
 
         val totalRecords: Long = customWhereCond(table.selectAll()).count()
+        val totalPage: Long = (totalRecords + pageSize - 1) / pageSize
         val query = table.selectAll().limit(pageSize).offset(offset)
 
         pageRequest.orderBy?.let {
@@ -42,6 +43,7 @@ interface PaginationDao {
             page = page,
             pageSize = pageSize,
             total = totalRecords,
+            totalPage = totalPage,
             data = data
         )
         return pageResult

diff --git a/app/src/main/kotlin/io/sakurasou/model/dao/user/UserDaoImpl.kt b/app/src/main/kotlin/io/sakurasou/model/dao/user/UserDaoImpl.kt
@@ -123,6 +123,7 @@ class UserDaoImpl : UserDao {
             page = page,
             pageSize = pageSize,
             total = totalRecords,
+            totalPage = (totalRecords + pageSize - 1) / pageSize,
             data = data
         )
         return pageResult

diff --git a/app/src/main/kotlin/io/sakurasou/service/strategy/StrategyServiceImpl.kt b/app/src/main/kotlin/io/sakurasou/service/strategy/StrategyServiceImpl.kt
@@ -92,6 +92,7 @@ class StrategyServiceImpl(
             page = strategyPageResult.page,
             pageSize = strategyPageResult.pageSize,
             total = strategyPageResult.total,
+            totalPage = strategyPageResult.totalPage,
             data = pageVOList
         )
     }