diff --git a/src/main/java/com/imyeyu/spring/annotation/table/PageIgnore.java b/src/main/java/com/imyeyu/spring/annotation/table/PageIgnore.java
index 8e55a44..461f32d 100644
--- a/src/main/java/com/imyeyu/spring/annotation/table/PageIgnore.java
+++ b/src/main/java/com/imyeyu/spring/annotation/table/PageIgnore.java
@@ -8,7 +8,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * 在 {@link com.imyeyu.spring.mapper.BaseMapper#page(Page)} 方法忽略查询该属性
+ * 在 {@link com.imyeyu.spring.mapper.BaseMapper#selectPageResult(Page)} 方法忽略查询该属性
*
* {@link com.imyeyu.spring.service.AbstractEntityService#page(Page)} 同上
*
diff --git a/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java b/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java
index 5475b19..50a0f94 100644
--- a/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java
+++ b/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java
@@ -46,8 +46,8 @@ public interface BaseMapper {
* @param page 分页参数
* @return 数据列表
*/
- @SelectProvider(type = SQLProvider.class, method = "listByPage")
- List listByPage(Page page);
+ @SelectProvider(type = SQLProvider.class, method = "selectByPage")
+ List selectByPage(Page page);
/**
* 根据 Page 对象统计数据量
@@ -64,15 +64,15 @@ public interface BaseMapper {
* @param page 分页参数
* @return 分页结果
*/
- default PageResult page(Page page) {
+ default PageResult selectPageResult(Page page) {
PageResult result = new PageResult<>();
result.setTotal(countByPage(page));
- result.setList(listByPage(page));
+ result.setList(selectByPage(page));
return result;
}
- @SelectProvider(type = SQLProvider.class, method = "listAll")
- List listAll();
+ @SelectProvider(type = SQLProvider.class, method = "selectAll")
+ List selectAll();
/**
* 创建数据。默认自增主键为 id,如需修改请重写此接口
diff --git a/src/main/java/com/imyeyu/spring/service/AbstractEntityService.java b/src/main/java/com/imyeyu/spring/service/AbstractEntityService.java
index fd16677..ea6628d 100644
--- a/src/main/java/com/imyeyu/spring/service/AbstractEntityService.java
+++ b/src/main/java/com/imyeyu/spring/service/AbstractEntityService.java
@@ -3,7 +3,6 @@ package com.imyeyu.spring.service;
import com.imyeyu.java.bean.timi.TimiException;
import com.imyeyu.spring.bean.Page;
import com.imyeyu.spring.bean.PageResult;
-import com.imyeyu.spring.entity.Creatable;
import com.imyeyu.spring.entity.Deletable;
import com.imyeyu.spring.entity.Updatable;
import com.imyeyu.spring.mapper.BaseMapper;
@@ -35,7 +34,7 @@ public abstract class AbstractEntityService implements BaseService {
@Override
public PageResult page(Page page) {
checkMapper();
- return baseMapper.page(page);
+ return baseMapper.selectPageResult(page);
}
public void create(T t) {
diff --git a/src/main/java/com/imyeyu/spring/util/SQLProvider.java b/src/main/java/com/imyeyu/spring/util/SQLProvider.java
index b2d6061..13ac490 100644
--- a/src/main/java/com/imyeyu/spring/util/SQLProvider.java
+++ b/src/main/java/com/imyeyu/spring/util/SQLProvider.java
@@ -52,7 +52,7 @@ public class SQLProvider {
* @param page 分页参数
* @return SQL
*/
- public String listByPage(ProviderContext context, @Param("page") Page> page) {
+ public String selectByPage(ProviderContext context, @Param("page") Page> page) {
EntityMeta meta = getEntityMeta(context);
StringBuilder sql = new StringBuilder();
sql.append("SELECT %s FROM `%s` WHERE 1 = 1".formatted(meta.selectPageClause, meta.table));
@@ -148,7 +148,7 @@ public class SQLProvider {
return sql.toString();
}
- public String listAll(ProviderContext context) {
+ public String selectAll(ProviderContext context) {
EntityMeta meta = getEntityMeta(context);
StringBuilder sql = new StringBuilder();
sql.append("SELECT * FROM %s WHERE 1 = 1".formatted(meta.table));