From d17ae34a39b3905e517e91692d3b6303710c54ce Mon Sep 17 00:00:00 2001 From: xuejiaming <326308290@qq.com> Date: Wed, 20 Sep 2023 08:20:05 +0800 Subject: [PATCH] =?UTF-8?q?1.4.25=20=E4=BC=98=E5=8C=96toPageResult?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pagination/DefaultShardingPageResult.java | 2 - .../easy/query/core/api/pagination/Pager.java | 5 +- .../query/core/api/pagination/Pagination.java | 27 ----------- .../api/pagination/ShardingPagination.java | 29 ------------ .../query/core/basic/api/select/Query.java | 46 ++----------------- .../java/com/easy/query/test/QueryTest3.java | 8 ++-- .../com/easy/query/test/common/MyPager.java | 19 +++++--- 7 files changed, 21 insertions(+), 115 deletions(-) delete mode 100644 sql-core/src/main/java/com/easy/query/core/api/pagination/Pagination.java delete mode 100644 sql-core/src/main/java/com/easy/query/core/api/pagination/ShardingPagination.java diff --git a/sql-core/src/main/java/com/easy/query/core/api/pagination/DefaultShardingPageResult.java b/sql-core/src/main/java/com/easy/query/core/api/pagination/DefaultShardingPageResult.java index a814ea500..c0f8d80f8 100644 --- a/sql-core/src/main/java/com/easy/query/core/api/pagination/DefaultShardingPageResult.java +++ b/sql-core/src/main/java/com/easy/query/core/api/pagination/DefaultShardingPageResult.java @@ -1,7 +1,6 @@ package com.easy.query.core.api.pagination; import com.easy.query.core.sharding.manager.SequenceCountLine; -import com.easy.query.core.util.EasyCollectionUtil; import java.util.List; @@ -18,7 +17,6 @@ public class DefaultShardingPageResult implements EasyShardingPageResult { public DefaultShardingPageResult(long total, List data,SequenceCountLine sequenceCountLine) { this.total = total; - this.data = data; this.sequenceCountLine = sequenceCountLine; } diff --git a/sql-core/src/main/java/com/easy/query/core/api/pagination/Pager.java b/sql-core/src/main/java/com/easy/query/core/api/pagination/Pager.java index f24f577f6..2fbec03d3 100644 --- a/sql-core/src/main/java/com/easy/query/core/api/pagination/Pager.java +++ b/sql-core/src/main/java/com/easy/query/core/api/pagination/Pager.java @@ -2,8 +2,6 @@ import com.easy.query.core.basic.api.select.Query; -import java.util.List; - /** * create time 2023/9/19 21:57 * 文件说明 @@ -11,7 +9,6 @@ * @author xuejiaming */ public interface Pager { - TPageResult toResult(Query query,long pageIndex,long pageSize, long pageTotal); - TPageResult toResult(Query query,long pageIndex,long pageSize, List totalLines); + TPageResult toResult(Query query); } diff --git a/sql-core/src/main/java/com/easy/query/core/api/pagination/Pagination.java b/sql-core/src/main/java/com/easy/query/core/api/pagination/Pagination.java deleted file mode 100644 index 0fa10c4fb..000000000 --- a/sql-core/src/main/java/com/easy/query/core/api/pagination/Pagination.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.easy.query.core.api.pagination; - -import com.easy.query.core.basic.api.select.Query; - -/** - * create time 2023/9/19 21:57 - * 文件说明 - * - * @author xuejiaming - */ -public class Pagination { - private final Query query; - private final long pageIndex; - private final long pageSize; - private final long pageTotal; - - public Pagination(Query query, long pageIndex, long pageSize, long pageTotal){ - - this.query = query; - this.pageIndex = pageIndex; - this.pageSize = pageSize; - this.pageTotal = pageTotal; - } - public TPageResult toResult(Pager pager){ - return pager.toResult(query,pageIndex,pageSize,pageTotal); - } -} diff --git a/sql-core/src/main/java/com/easy/query/core/api/pagination/ShardingPagination.java b/sql-core/src/main/java/com/easy/query/core/api/pagination/ShardingPagination.java deleted file mode 100644 index 23ff35d89..000000000 --- a/sql-core/src/main/java/com/easy/query/core/api/pagination/ShardingPagination.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.easy.query.core.api.pagination; - -import com.easy.query.core.basic.api.select.Query; - -import java.util.List; - -/** - * create time 2023/9/19 21:57 - * 文件说明 - * - * @author xuejiaming - */ -public class ShardingPagination { - private final Query query; - private final long pageIndex; - private final long pageSize; - private final List totalLines; - - public ShardingPagination(Query query, long pageIndex, long pageSize, List totalLines){ - - this.query = query; - this.pageIndex = pageIndex; - this.pageSize = pageSize; - this.totalLines = totalLines; - } - public TPageResult toResult(Pager pager){ - return pager.toResult(query,pageIndex,pageSize,totalLines); - } -} diff --git a/sql-core/src/main/java/com/easy/query/core/basic/api/select/Query.java b/sql-core/src/main/java/com/easy/query/core/basic/api/select/Query.java index 135973a7e..76a3b14c6 100644 --- a/sql-core/src/main/java/com/easy/query/core/basic/api/select/Query.java +++ b/sql-core/src/main/java/com/easy/query/core/basic/api/select/Query.java @@ -1,8 +1,7 @@ package com.easy.query.core.basic.api.select; import com.easy.query.core.api.pagination.EasyPageResult; -import com.easy.query.core.api.pagination.Pagination; -import com.easy.query.core.api.pagination.ShardingPagination; +import com.easy.query.core.api.pagination.Pager; import com.easy.query.core.basic.jdbc.executor.internal.enumerable.JdbcStreamResult; import com.easy.query.core.basic.jdbc.parameter.DefaultToSQLContext; import com.easy.query.core.basic.jdbc.parameter.ToSQLContext; @@ -299,26 +298,8 @@ default EasyPageResult toPageResult(long pageIndex, long pageSize) { * @return 分页结果 */ EasyPageResult toPageResult(long pageIndex, long pageSize, long pageTotal); - - /** - * 进行用户自定义分页结果 - * @param pageIndex - * @param pageSize - * @param pageTotal - * @return - */ - default Pagination toPage(long pageIndex, long pageSize, long pageTotal) { - return new Pagination<>(this, pageIndex, pageSize, pageTotal); - } - - /** - * 进行用户自定义分页结果 - * @param pageIndex - * @param pageSize - * @return - */ - default Pagination toPage(long pageIndex, long pageSize) { - return toPage(pageIndex, pageSize, -1); + default TPageResult toPageResult(Pager pager){ + return pager.toResult(this); } /** @@ -342,27 +323,6 @@ default EasyPageResult toShardingPageResult(long pageIndex, long pageSize) { */ EasyPageResult toShardingPageResult(long pageIndex, long pageSize, List totalLines); - - /** - * 进行用户自定义分页结果 - * @param pageIndex - * @param pageSize - * @param totalLines - * @return - */ - default ShardingPagination toShardingPage(long pageIndex, long pageSize, List totalLines) { - return new ShardingPagination<>(this, pageIndex, pageSize, totalLines); - } - - /** - * 进行用户自定义分页结果 - * @param pageIndex - * @param pageSize - * @return - */ - default ShardingPagination toShardingPage(long pageIndex, long pageSize) { - return toShardingPage(pageIndex, pageSize, null); - } /** * 去重 * eg. SELECT DISTINCT projects FROM table t [WHERE t.`columns` = ?] diff --git a/sql-test/src/main/java/com/easy/query/test/QueryTest3.java b/sql-test/src/main/java/com/easy/query/test/QueryTest3.java index 7a44e9555..c1dafd9a3 100644 --- a/sql-test/src/main/java/com/easy/query/test/QueryTest3.java +++ b/sql-test/src/main/java/com/easy/query/test/QueryTest3.java @@ -2085,12 +2085,12 @@ public void testGenericKey1(){ } @Test public void testGenericKey2(){ - PageResult result = easyQuery + PageResult pageResult = easyQuery .queryable(TopicGenericKey.class) .whereById("1") - .toPage(1, 2) - .toResult(new MyPager<>()); - Assert.assertEquals(1,result.getTotalCount()); + .toPageResult(new MyPager<>(1, 2)); + Assert.assertEquals(1,pageResult.getTotalCount()); + Assert.assertEquals("1",pageResult.getList().get(0).getId()); } } diff --git a/sql-test/src/main/java/com/easy/query/test/common/MyPager.java b/sql-test/src/main/java/com/easy/query/test/common/MyPager.java index b5e13c08d..5379b82b1 100644 --- a/sql-test/src/main/java/com/easy/query/test/common/MyPager.java +++ b/sql-test/src/main/java/com/easy/query/test/common/MyPager.java @@ -13,15 +13,22 @@ * @author xuejiaming */ public class MyPager implements Pager> { - @Override - public PageResult toResult(Query query, long pageIndex, long pageSize, long pageTotal) { - EasyPageResult pageResult = query.toPageResult(pageIndex, pageSize,pageTotal); - return new MyPageResult<>(pageResult.getTotal(),pageResult.getData()); + private final long pageIndex; + private final long pageSize; + private final long pageTotal; + + public MyPager(long pageIndex, long pageSize){ + this(pageIndex,pageSize,-1); } + public MyPager(long pageIndex, long pageSize, long pageTotal){ + this.pageIndex = pageIndex; + this.pageSize = pageSize; + this.pageTotal = pageTotal; + } @Override - public PageResult toResult(Query query, long pageIndex, long pageSize, List totalLines) { - EasyPageResult pageResult = query.toShardingPageResult(pageIndex, pageSize,totalLines); + public PageResult toResult(Query query) { + EasyPageResult pageResult = query.toPageResult(pageIndex, pageSize,pageTotal); return new MyPageResult<>(pageResult.getTotal(),pageResult.getData()); } }