admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 17:48:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 统一 Page.java 的相关属性为 long

Browse Source
This commit is contained in:
开源海哥 2023-07-31 15:41:46 +08:00
parent ba617e7c82
commit c6685bc80d
14 changed files with 96 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/RelationOneToMany.java
View File

@ -116,7 +116,7 @@ public @interface RelationOneToMany {
* *
* @return 数据量 * @return 数据量
*/ */
int limit() default 0; long limit() default 0;
/** /**
* 默认使用哪个数据源，若系统找不到该指定的数据源时，默认使用第一个数据源。 * 默认使用哪个数据源，若系统找不到该指定的数据源时，默认使用第一个数据源。

36
mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java
View File

@ -426,7 +426,7 @@ public interface BaseMapper<T> {
*/ */
default T selectOneByMap(Map<String, Object> whereConditions) { default T selectOneByMap(Map<String, Object> whereConditions) {
FlexAssert.notEmpty(whereConditions, "whereConditions"); FlexAssert.notEmpty(whereConditions, "whereConditions");
return selectOneByQuery(QueryWrapper.create().where(whereConditions).limit(1)); return selectOneByQuery(QueryWrapper.create().where(whereConditions).limit(1L));
} }
/** /**
@ -437,7 +437,7 @@ public interface BaseMapper<T> {
*/ */
default T selectOneByCondition(QueryCondition whereConditions) { default T selectOneByCondition(QueryCondition whereConditions) {
FlexAssert.notNull(whereConditions, "whereConditions"); FlexAssert.notNull(whereConditions, "whereConditions");
return selectOneByQuery(QueryWrapper.create().where(whereConditions).limit(1)); return selectOneByQuery(QueryWrapper.create().where(whereConditions).limit(1L));
} }
/** /**
@ -469,7 +469,7 @@ public interface BaseMapper<T> {
*/ */
default T selectOneWithRelationsByMap(Map<String, Object> whereConditions) { default T selectOneWithRelationsByMap(Map<String, Object> whereConditions) {
FlexAssert.notEmpty(whereConditions, "whereConditions"); FlexAssert.notEmpty(whereConditions, "whereConditions");
return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions).limit(1)); return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions).limit(1L));
} }
/** /**
@ -480,7 +480,7 @@ public interface BaseMapper<T> {
*/ */
default T selectOneWithRelationsByCondition(QueryCondition whereConditions) { default T selectOneWithRelationsByCondition(QueryCondition whereConditions) {
FlexAssert.notNull(whereConditions, "whereConditions"); FlexAssert.notNull(whereConditions, "whereConditions");
return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions).limit(1)); return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions).limit(1L));
} }
/** /**
@ -556,7 +556,7 @@ public interface BaseMapper<T> {
* @param count 数据量 * @param count 数据量
* @return 数据列表 * @return 数据列表
*/ */
default List<T> selectListByMap(Map<String, Object> whereConditions, int count) { default List<T> selectListByMap(Map<String, Object> whereConditions, Long count) {
FlexAssert.notEmpty(whereConditions, "whereConditions"); FlexAssert.notEmpty(whereConditions, "whereConditions");
return selectListByQuery(QueryWrapper.create().where(whereConditions).limit(count)); return selectListByQuery(QueryWrapper.create().where(whereConditions).limit(count));
} }
@ -579,7 +579,7 @@ public interface BaseMapper<T> {
* @param count 数据量 * @param count 数据量
* @return 数据列表 * @return 数据列表
*/ */
default List<T> selectListByCondition(QueryCondition whereConditions, int count) { default List<T> selectListByCondition(QueryCondition whereConditions, Long count) {
FlexAssert.notNull(whereConditions, "whereConditions"); FlexAssert.notNull(whereConditions, "whereConditions");
return selectListByQuery(QueryWrapper.create().where(whereConditions).limit(count)); return selectListByQuery(QueryWrapper.create().where(whereConditions).limit(count));
} }
@ -861,7 +861,7 @@ public interface BaseMapper<T> {
* @param queryWrapper 条件 * @param queryWrapper 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginate(int pageNumber, int pageSize, QueryWrapper queryWrapper) { default Page<T> paginate(Number pageNumber, Number pageSize, QueryWrapper queryWrapper) {
Page<T> page = new Page<>(pageNumber, pageSize); Page<T> page = new Page<>(pageNumber, pageSize);
return paginate(page, queryWrapper); return paginate(page, queryWrapper);
} }
@ -874,7 +874,7 @@ public interface BaseMapper<T> {
* @param queryWrapper 条件 * @param queryWrapper 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginateWithRelations(int pageNumber, int pageSize, QueryWrapper queryWrapper) { default Page<T> paginateWithRelations(Number pageNumber, Number pageSize, QueryWrapper queryWrapper) {
Page<T> page = new Page<>(pageNumber, pageSize); Page<T> page = new Page<>(pageNumber, pageSize);
return paginateWithRelations(page, queryWrapper); return paginateWithRelations(page, queryWrapper);
} }
@ -887,7 +887,7 @@ public interface BaseMapper<T> {
* @param whereConditions 条件 * @param whereConditions 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginate(int pageNumber, int pageSize, QueryCondition whereConditions) { default Page<T> paginate(Number pageNumber, Number pageSize, QueryCondition whereConditions) {
Page<T> page = new Page<>(pageNumber, pageSize); Page<T> page = new Page<>(pageNumber, pageSize);
return paginate(page, new QueryWrapper().where(whereConditions)); return paginate(page, new QueryWrapper().where(whereConditions));
} }
@ -900,7 +900,7 @@ public interface BaseMapper<T> {
* @param whereConditions 条件 * @param whereConditions 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginateWithRelations(int pageNumber, int pageSize, QueryCondition whereConditions) { default Page<T> paginateWithRelations(Number pageNumber, Number pageSize, QueryCondition whereConditions) {
Page<T> page = new Page<>(pageNumber, pageSize); Page<T> page = new Page<>(pageNumber, pageSize);
return paginateWithRelations(page, new QueryWrapper().where(whereConditions)); return paginateWithRelations(page, new QueryWrapper().where(whereConditions));
} }
@ -914,7 +914,7 @@ public interface BaseMapper<T> {
* @param queryWrapper 条件 * @param queryWrapper 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginate(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { default Page<T> paginate(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) {
Page<T> page = new Page<>(pageNumber, pageSize, totalRow); Page<T> page = new Page<>(pageNumber, pageSize, totalRow);
return paginate(page, queryWrapper); return paginate(page, queryWrapper);
} }
@ -928,7 +928,7 @@ public interface BaseMapper<T> {
* @param queryWrapper 条件 * @param queryWrapper 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginateWithRelations(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { default Page<T> paginateWithRelations(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) {
Page<T> page = new Page<>(pageNumber, pageSize, totalRow); Page<T> page = new Page<>(pageNumber, pageSize, totalRow);
return paginateWithRelations(page, queryWrapper); return paginateWithRelations(page, queryWrapper);
} }
@ -942,7 +942,7 @@ public interface BaseMapper<T> {
* @param whereConditions 条件 * @param whereConditions 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginate(int pageNumber, int pageSize, int totalRow, QueryCondition whereConditions) { default Page<T> paginate(Number pageNumber, Number pageSize, Number totalRow, QueryCondition whereConditions) {
FlexAssert.notNull(whereConditions, "whereConditions"); FlexAssert.notNull(whereConditions, "whereConditions");
Page<T> page = new Page<>(pageNumber, pageSize, totalRow); Page<T> page = new Page<>(pageNumber, pageSize, totalRow);
return paginate(page, new QueryWrapper().where(whereConditions)); return paginate(page, new QueryWrapper().where(whereConditions));
@ -957,7 +957,7 @@ public interface BaseMapper<T> {
* @param whereConditions 条件 * @param whereConditions 条件
* @return 分页数据 * @return 分页数据
*/ */
default Page<T> paginateWithRelations(int pageNumber, int pageSize, int totalRow, QueryCondition whereConditions) { default Page<T> paginateWithRelations(Number pageNumber, Number pageSize, Number totalRow, QueryCondition whereConditions) {
FlexAssert.notNull(whereConditions, "whereConditions"); FlexAssert.notNull(whereConditions, "whereConditions");
Page<T> page = new Page<>(pageNumber, pageSize, totalRow); Page<T> page = new Page<>(pageNumber, pageSize, totalRow);
return paginateWithRelations(page, new QueryWrapper().where(whereConditions)); return paginateWithRelations(page, new QueryWrapper().where(whereConditions));
@ -1018,7 +1018,7 @@ public interface BaseMapper<T> {
* @param asType 接收数据类型 * @param asType 接收数据类型
* @return 分页数据 * @return 分页数据
*/ */
default <R> Page<R> paginateAs(int pageNumber, int pageSize, QueryWrapper queryWrapper, Class<R> asType) { default <R> Page<R> paginateAs(Number pageNumber, Number pageSize, QueryWrapper queryWrapper, Class<R> asType) {
Page<R> page = new Page<>(pageNumber, pageSize); Page<R> page = new Page<>(pageNumber, pageSize);
return MapperUtil.doPaginate(this, page, queryWrapper, asType, false); return MapperUtil.doPaginate(this, page, queryWrapper, asType, false);
} }
@ -1033,7 +1033,7 @@ public interface BaseMapper<T> {
* @param asType 接收数据类型 * @param asType 接收数据类型
* @return 分页数据 * @return 分页数据
*/ */
default <R> Page<R> paginateAs(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper, Class<R> asType) { default <R> Page<R> paginateAs(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper, Class<R> asType) {
Page<R> page = new Page<>(pageNumber, pageSize, totalRow); Page<R> page = new Page<>(pageNumber, pageSize, totalRow);
return MapperUtil.doPaginate(this, page, queryWrapper, asType, false); return MapperUtil.doPaginate(this, page, queryWrapper, asType, false);
} }
@ -1072,7 +1072,7 @@ public interface BaseMapper<T> {
* @param asType 接收数据类型 * @param asType 接收数据类型
* @return 分页数据 * @return 分页数据
*/ */
default <R> Page<R> paginateWithRelationsAs(int pageNumber, int pageSize, QueryWrapper queryWrapper, Class<R> asType) { default <R> Page<R> paginateWithRelationsAs(Number pageNumber, Number pageSize, QueryWrapper queryWrapper, Class<R> asType) {
Page<R> page = new Page<>(pageNumber, pageSize); Page<R> page = new Page<>(pageNumber, pageSize);
return MapperUtil.doPaginate(this, page, queryWrapper, asType, true); return MapperUtil.doPaginate(this, page, queryWrapper, asType, true);
} }
@ -1087,7 +1087,7 @@ public interface BaseMapper<T> {
* @param asType 接收数据类型 * @param asType 接收数据类型
* @return 分页数据 * @return 分页数据
*/ */
default <R> Page<R> paginateWithRelationsAs(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper, Class<R> asType) { default <R> Page<R> paginateWithRelationsAs(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper, Class<R> asType) {
Page<R> page = new Page<>(pageNumber, pageSize, totalRow); Page<R> page = new Page<>(pageNumber, pageSize, totalRow);
return MapperUtil.doPaginate(this, page, queryWrapper, asType, true); return MapperUtil.doPaginate(this, page, queryWrapper, asType, true);
} }

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
View File

@ -97,7 +97,7 @@ public abstract class Model<T extends Model<T>>
* @return 数据 * @return 数据
*/ */
public T oneWithRelations() { public T oneWithRelations() {
return baseMapper().selectOneWithRelationsByQuery(queryWrapper().limit(1)); return baseMapper().selectOneWithRelationsByQuery(queryWrapper().limit(1L));
} }
/** /**

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
View File

@ -356,17 +356,17 @@ public abstract class QueryModel<T extends QueryModel<T>> {
return new OrderByBuilder<>((T) this, column); return new OrderByBuilder<>((T) this, column);
} }
public T limit(Integer rows) { public T limit(Number rows) {
queryWrapper().limit(rows); queryWrapper().limit(rows);
return (T) this; return (T) this;
} }
public T offset(Integer offset) { public T offset(Number offset) {
queryWrapper().offset(offset); queryWrapper().offset(offset);
return (T) this; return (T) this;
} }
public T limit(Integer offset, Integer rows) { public T limit(Number offset, Number rows) {
queryWrapper().limit(offset, rows); queryWrapper().limit(offset, rows);
return (T) this; return (T) this;
} }

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java
View File

@ -39,7 +39,7 @@ public interface LimitOffsetProcessor {
* @param limitRows 用户传入的 limit 参数 可能为 null * @param limitRows 用户传入的 limit 参数 可能为 null
* @param limitOffset 用户传入的 offset 参数，可能为 null * @param limitOffset 用户传入的 offset 参数，可能为 null
*/ */
StringBuilder process(IDialect dialect, StringBuilder sql, QueryWrapper queryWrapper, Integer limitRows, Integer limitOffset); StringBuilder process(IDialect dialect, StringBuilder sql, QueryWrapper queryWrapper, Long limitRows, Long limitOffset);
/** /**
@ -110,7 +110,7 @@ public interface LimitOffsetProcessor {
LimitOffsetProcessor SQLSERVER_2005 = (dialect, sql, queryWrapper, limitRows, limitOffset) -> { LimitOffsetProcessor SQLSERVER_2005 = (dialect, sql, queryWrapper, limitRows, limitOffset) -> {
if (limitRows != null) { if (limitRows != null) {
if (limitOffset == null) { if (limitOffset == null) {
limitOffset = 0; limitOffset = 0L;
} }
List<QueryTable> queryTables = CPI.getQueryTables(queryWrapper); List<QueryTable> queryTables = CPI.getQueryTables(queryWrapper);
@ -196,7 +196,7 @@ public interface LimitOffsetProcessor {
LimitOffsetProcessor ORACLE = (dialect, sql, queryWrapper, limitRows, limitOffset) -> { LimitOffsetProcessor ORACLE = (dialect, sql, queryWrapper, limitRows, limitOffset) -> {
if (limitRows != null) { if (limitRows != null) {
if (limitOffset == null) { if (limitOffset == null) {
limitOffset = 0; limitOffset = 0L;
} }
StringBuilder newSql = new StringBuilder("SELECT * FROM (SELECT TEMP_DATAS.*, ROWNUM RN FROM ("); StringBuilder newSql = new StringBuilder("SELECT * FROM (SELECT TEMP_DATAS.*, ROWNUM RN FROM (");
newSql.append(sql); newSql.append(sql);

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java
View File

@ -382,8 +382,8 @@ public class CommonsDialectImpl implements IDialect {
} }
} }
Integer limitRows = CPI.getLimitRows(queryWrapper); Long limitRows = CPI.getLimitRows(queryWrapper);
Integer limitOffset = CPI.getLimitOffset(queryWrapper); Long limitOffset = CPI.getLimitOffset(queryWrapper);
if (limitRows != null || limitOffset != null) { if (limitRows != null || limitOffset != null) {
sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset); sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset);
} }
@ -418,8 +418,8 @@ public class CommonsDialectImpl implements IDialect {
} }
} }
Integer limitRows = CPI.getLimitRows(queryWrapper); Long limitRows = CPI.getLimitRows(queryWrapper);
Integer limitOffset = CPI.getLimitOffset(queryWrapper); Long limitOffset = CPI.getLimitOffset(queryWrapper);
if (limitRows != null || limitOffset != null) { if (limitRows != null || limitOffset != null) {
sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset); sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset);
} }
@ -1051,7 +1051,7 @@ public class CommonsDialectImpl implements IDialect {
/** /**
* 构建 limit 和 offset 的参数 * 构建 limit 和 offset 的参数
*/ */
protected StringBuilder buildLimitOffsetSql(StringBuilder sqlBuilder, QueryWrapper queryWrapper, Integer limitRows, Integer limitOffset) { protected StringBuilder buildLimitOffsetSql(StringBuilder sqlBuilder, QueryWrapper queryWrapper, Long limitRows, Long limitOffset) {
return limitOffsetProcessor.process(this, sqlBuilder, queryWrapper, limitRows, limitOffset); return limitOffsetProcessor.process(this, sqlBuilder, queryWrapper, limitRows, limitOffset);
} }

36
mybatis-flex-core/src/main/java/com/mybatisflex/core/paginate/Page.java
View File

@ -44,12 +44,12 @@ public class Page<T> implements Serializable {
/** /**
* 当前页码。 * 当前页码。
*/ */
private int pageNumber = 1; private long pageNumber = 1;
/** /**
* 每页数据数量。 * 每页数据数量。
*/ */
private int pageSize = FlexGlobalConfig.getDefaultConfig().getDefaultPageSize(); private long pageSize = FlexGlobalConfig.getDefaultConfig().getDefaultPageSize();
/** /**
* 总页数。 * 总页数。
@ -74,7 +74,7 @@ public class Page<T> implements Serializable {
* @param <T> 数据类型 * @param <T> 数据类型
* @return 分页对象 * @return 分页对象
*/ */
public static <T> Page<T> of(int pageNumber, int pageSize) { public static <T> Page<T> of(Number pageNumber, Number pageSize) {
return new Page<>(pageNumber, pageSize); return new Page<>(pageNumber, pageSize);
} }
@ -87,7 +87,7 @@ public class Page<T> implements Serializable {
* @param <T> 数据类型 * @param <T> 数据类型
* @return 分页对象 * @return 分页对象
*/ */
public static <T> Page<T> of(int pageNumber, int pageSize, long totalRow) { public static <T> Page<T> of(Number pageNumber, Number pageSize, Number totalRow) {
return new Page<>(pageNumber, pageSize, totalRow); return new Page<>(pageNumber, pageSize, totalRow);
} }
@ -103,7 +103,7 @@ public class Page<T> implements Serializable {
* @param pageNumber 当前页码 * @param pageNumber 当前页码
* @param pageSize 每页数据数量 * @param pageSize 每页数据数量
*/ */
public Page(int pageNumber, int pageSize) { public Page(Number pageNumber, Number pageSize) {
this.setPageNumber(pageNumber); this.setPageNumber(pageNumber);
this.setPageSize(pageSize); this.setPageSize(pageSize);
} }
@ -115,7 +115,7 @@ public class Page<T> implements Serializable {
* @param pageSize 每页数据数量 * @param pageSize 每页数据数量
* @param totalRow 总数居数量 * @param totalRow 总数居数量
*/ */
public Page(int pageNumber, int pageSize, long totalRow) { public Page(Number pageNumber, Number pageSize, Number totalRow) {
this.setPageNumber(pageNumber); this.setPageNumber(pageNumber);
this.setPageSize(pageSize); this.setPageSize(pageSize);
this.setTotalRow(totalRow); this.setTotalRow(totalRow);
@ -129,7 +129,7 @@ public class Page<T> implements Serializable {
* @param pageSize 每页数据数量 * @param pageSize 每页数据数量
* @param totalRow 总数居数量 * @param totalRow 总数居数量
*/ */
public Page(List<T> records, int pageNumber, int pageSize, long totalRow) { public Page(List<T> records, Number pageNumber, Number pageSize, Number totalRow) {
this.setRecords(records); this.setRecords(records);
this.setPageNumber(pageNumber); this.setPageNumber(pageNumber);
this.setPageSize(pageSize); this.setPageSize(pageSize);
@ -162,7 +162,7 @@ public class Page<T> implements Serializable {
* *
* @return 页码 * @return 页码
*/ */
public int getPageNumber() { public long getPageNumber() {
return pageNumber; return pageNumber;
} }
@ -171,11 +171,11 @@ public class Page<T> implements Serializable {
* *
* @param pageNumber 页码 * @param pageNumber 页码
*/ */
public void setPageNumber(int pageNumber) { public void setPageNumber(Number pageNumber) {
if (pageNumber < 1) { if (pageNumber.longValue() < 1) {
throw new IllegalArgumentException("pageNumber must greater than or equal 1，current value is: " + pageNumber); throw new IllegalArgumentException("pageNumber must greater than or equal 1，current value is: " + pageNumber);
} }
this.pageNumber = pageNumber; this.pageNumber = pageNumber.longValue();
} }
/** /**
@ -183,7 +183,7 @@ public class Page<T> implements Serializable {
* *
* @return 每页数据数量 * @return 每页数据数量
*/ */
public int getPageSize() { public long getPageSize() {
return pageSize; return pageSize;
} }
@ -192,11 +192,11 @@ public class Page<T> implements Serializable {
* *
* @param pageSize 每页数据数量 * @param pageSize 每页数据数量
*/ */
public void setPageSize(int pageSize) { public void setPageSize(Number pageSize) {
if (pageSize < 0) { if (pageSize.longValue() < 0) {
throw new IllegalArgumentException("pageSize must greater than or equal 0，current value is: " + pageSize); throw new IllegalArgumentException("pageSize must greater than or equal 0，current value is: " + pageSize);
} }
this.pageSize = pageSize; this.pageSize = pageSize.longValue();
this.calcTotalPage(); this.calcTotalPage();
} }
@ -232,8 +232,8 @@ public class Page<T> implements Serializable {
* *
* @param totalRow 数据总数 * @param totalRow 数据总数
*/ */
public void setTotalRow(long totalRow) { public void setTotalRow(Number totalRow) {
this.totalRow = totalRow; this.totalRow = totalRow.longValue();
this.calcTotalPage(); this.calcTotalPage();
} }
@ -280,7 +280,7 @@ public class Page<T> implements Serializable {
* *
* @return 偏移量 * @return 偏移量
*/ */
public int offset() { public long offset() {
return getPageSize() * (getPageNumber() - 1); return getPageSize() * (getPageNumber() - 1);
} }

12
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java
View File

@ -40,8 +40,8 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
protected List<UnionWrapper> unions; protected List<UnionWrapper> unions;
protected Integer limitOffset; protected Long limitOffset;
protected Integer limitRows; protected Long limitRows;
protected List<String> endFragments; protected List<String> endFragments;
@ -219,19 +219,19 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
this.unions = unions; this.unions = unions;
} }
protected Integer getLimitOffset() { protected Long getLimitOffset() {
return limitOffset; return limitOffset;
} }
protected void setLimitOffset(Integer limitOffset) { protected void setLimitOffset(Long limitOffset) {
this.limitOffset = limitOffset; this.limitOffset = limitOffset;
} }
protected Integer getLimitRows() { protected Long getLimitRows() {
return limitRows; return limitRows;
} }
protected void setLimitRows(Integer limitRows) { protected void setLimitRows(Long limitRows) {
this.limitRows = limitRows; this.limitRows = limitRows;
} }

8
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
View File

@ -167,19 +167,19 @@ public class CPI {
} }
public static Integer getLimitOffset(QueryWrapper queryWrapper) { public static Long getLimitOffset(QueryWrapper queryWrapper) {
return queryWrapper.getLimitOffset(); return queryWrapper.getLimitOffset();
} }
public static void setLimitOffset(QueryWrapper queryWrapper, Integer limitOffset) { public static void setLimitOffset(QueryWrapper queryWrapper, Long limitOffset) {
queryWrapper.setLimitOffset(limitOffset); queryWrapper.setLimitOffset(limitOffset);
} }
public static Integer getLimitRows(QueryWrapper queryWrapper) { public static Long getLimitRows(QueryWrapper queryWrapper) {
return queryWrapper.getLimitRows(); return queryWrapper.getLimitRows();
} }
public static void setLimitRows(QueryWrapper queryWrapper, Integer limitRows) { public static void setLimitRows(QueryWrapper queryWrapper, Long limitRows) {
queryWrapper.setLimitRows(limitRows); queryWrapper.setLimitRows(limitRows);
} }

22
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
View File

@ -654,19 +654,27 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
return this; return this;
} }
public QueryWrapper limit(Integer rows) { public QueryWrapper limit(Number rows) {
setLimitRows(rows); if (rows != null) {
setLimitRows(rows.longValue());
}else {
setLimitRows(null);
}
return this; return this;
} }
public QueryWrapper offset(Integer offset) { public QueryWrapper offset(Number offset) {
setLimitOffset(offset); if (offset!= null) {
setLimitOffset(offset.longValue());
}else {
setLimitOffset(null);
}
return this; return this;
} }
public QueryWrapper limit(Integer offset, Integer rows) { public QueryWrapper limit(Number offset, Number rows) {
setLimitOffset(offset); offset(offset);
setLimitRows(rows); limit(rows);
return this; return this;
} }

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
View File

@ -583,19 +583,19 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
} }
@Override @Override
public R limit(Integer rows) { public R limit(Number rows) {
super.limit(rows); super.limit(rows);
return (R) this; return (R) this;
} }
@Override @Override
public R offset(Integer offset) { public R offset(Number offset) {
super.offset(offset); super.offset(offset);
return (R) this; return (R) this;
} }
@Override @Override
public R limit(Integer offset, Integer rows) { public R limit(Number offset, Number rows) {
super.limit(offset, rows); super.limit(offset, rows);
return (R) this; return (R) this;
} }

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/ToManyRelation.java
View File

@ -28,7 +28,7 @@ class ToManyRelation<SelfEntity> extends AbstractRelation<SelfEntity> {
protected String mapKeyField; protected String mapKeyField;
protected FieldWrapper mapKeyFieldWrapper; protected FieldWrapper mapKeyFieldWrapper;
protected String orderBy; protected String orderBy;
protected int limit = 0; protected long limit = 0;
public ToManyRelation(String selfField, String targetSchema, String targetTable, String targetField, public ToManyRelation(String selfField, String targetSchema, String targetTable, String targetField,

32
mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java
View File

@ -610,7 +610,7 @@ public class Db {
* @param whereColumns where条件 * @param whereColumns where条件
*/ */
public static Row selectOneByMap(String schema, String tableName, Map whereColumns) { public static Row selectOneByMap(String schema, String tableName, Map whereColumns) {
return invoker().selectOneByQuery(schema, tableName, new QueryWrapper().where(whereColumns).limit(1)); return invoker().selectOneByQuery(schema, tableName, new QueryWrapper().where(whereColumns).limit(1L));
} }
@ -621,7 +621,7 @@ public class Db {
* @param whereColumns where条件 * @param whereColumns where条件
*/ */
public static Row selectOneByMap(String tableName, Map whereColumns) { public static Row selectOneByMap(String tableName, Map whereColumns) {
return invoker().selectOneByQuery(null, tableName, new QueryWrapper().where(whereColumns).limit(1)); return invoker().selectOneByQuery(null, tableName, new QueryWrapper().where(whereColumns).limit(1L));
} }
/** /**
@ -632,7 +632,7 @@ public class Db {
* @param condition 条件 * @param condition 条件
*/ */
public static Row selectOneByCondition(String schema, String tableName, QueryCondition condition) { public static Row selectOneByCondition(String schema, String tableName, QueryCondition condition) {
return invoker().selectOneByQuery(schema, tableName, new QueryWrapper().where(condition).limit(1)); return invoker().selectOneByQuery(schema, tableName, new QueryWrapper().where(condition).limit(1L));
} }
/** /**
@ -642,7 +642,7 @@ public class Db {
* @param condition 条件 * @param condition 条件
*/ */
public static Row selectOneByCondition(String tableName, QueryCondition condition) { public static Row selectOneByCondition(String tableName, QueryCondition condition) {
return invoker().selectOneByQuery(null, tableName, new QueryWrapper().where(condition).limit(1)); return invoker().selectOneByQuery(null, tableName, new QueryWrapper().where(condition).limit(1L));
} }
@ -723,7 +723,7 @@ public class Db {
* @param whereColumns 条件 * @param whereColumns 条件
* @param count 数据量 * @param count 数据量
*/ */
public static List<Row> selectListByMap(String schema, String tableName, Map<String, Object> whereColumns, int count) { public static List<Row> selectListByMap(String schema, String tableName, Map<String, Object> whereColumns, Long count) {
return invoker().selectListByQuery(schema, tableName, new QueryWrapper().where(whereColumns).limit(count)); return invoker().selectListByQuery(schema, tableName, new QueryWrapper().where(whereColumns).limit(count));
} }
@ -734,7 +734,7 @@ public class Db {
* @param whereColumns 条件 * @param whereColumns 条件
* @param count 数据量 * @param count 数据量
*/ */
public static List<Row> selectListByMap(String tableName, Map<String, Object> whereColumns, int count) { public static List<Row> selectListByMap(String tableName, Map<String, Object> whereColumns, Long count) {
return invoker().selectListByQuery(null, tableName, new QueryWrapper().where(whereColumns).limit(count)); return invoker().selectListByQuery(null, tableName, new QueryWrapper().where(whereColumns).limit(count));
} }
@ -769,7 +769,7 @@ public class Db {
* @param condition 条件 * @param condition 条件
* @param count 数据量 * @param count 数据量
*/ */
public static List<Row> selectListByCondition(String schema, String tableName, QueryCondition condition, int count) { public static List<Row> selectListByCondition(String schema, String tableName, QueryCondition condition, Long count) {
return invoker().selectListByQuery(schema, tableName, new QueryWrapper().where(condition).limit(count)); return invoker().selectListByQuery(schema, tableName, new QueryWrapper().where(condition).limit(count));
} }
@ -780,7 +780,7 @@ public class Db {
* @param condition 条件 * @param condition 条件
* @param count 数据量 * @param count 数据量
*/ */
public static List<Row> selectListByCondition(String tableName, QueryCondition condition, int count) { public static List<Row> selectListByCondition(String tableName, QueryCondition condition, Long count) {
return invoker().selectListByQuery(null, tableName, new QueryWrapper().where(condition).limit(count)); return invoker().selectListByQuery(null, tableName, new QueryWrapper().where(condition).limit(count));
} }
@ -1012,7 +1012,7 @@ public class Db {
* @param pageSize 每页的数据量 * @param pageSize 每页的数据量
* @param condition 条件 * @param condition 条件
*/ */
public static Page<Row> paginate(String schema, String tableName, int pageNumber, int pageSize, QueryCondition condition) { public static Page<Row> paginate(String schema, String tableName, Number pageNumber, Number pageSize, QueryCondition condition) {
return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize), QueryWrapper.create().where(condition)); return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize), QueryWrapper.create().where(condition));
} }
@ -1025,7 +1025,7 @@ public class Db {
* @param pageSize 每页的数据量 * @param pageSize 每页的数据量
* @param condition 条件 * @param condition 条件
*/ */
public static Page<Row> paginate(String tableName, int pageNumber, int pageSize, QueryCondition condition) { public static Page<Row> paginate(String tableName, Number pageNumber, Number pageSize, QueryCondition condition) {
return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize), QueryWrapper.create().where(condition)); return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize), QueryWrapper.create().where(condition));
} }
@ -1040,7 +1040,7 @@ public class Db {
* @param totalRow 数据总量 * @param totalRow 数据总量
* @param condition 条件 * @param condition 条件
*/ */
public static Page<Row> paginate(String schema, String tableName, int pageNumber, int pageSize, int totalRow, QueryCondition condition) { public static Page<Row> paginate(String schema, String tableName, Number pageNumber, Number pageSize, Number totalRow, QueryCondition condition) {
return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize, totalRow), QueryWrapper.create().where(condition)); return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize, totalRow), QueryWrapper.create().where(condition));
} }
@ -1053,7 +1053,7 @@ public class Db {
* @param totalRow 数据总量 * @param totalRow 数据总量
* @param condition 条件 * @param condition 条件
*/ */
public static Page<Row> paginate(String tableName, int pageNumber, int pageSize, int totalRow, QueryCondition condition) { public static Page<Row> paginate(String tableName, Number pageNumber, Number pageSize, Number totalRow, QueryCondition condition) {
return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize, totalRow), QueryWrapper.create().where(condition)); return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize, totalRow), QueryWrapper.create().where(condition));
} }
@ -1067,7 +1067,7 @@ public class Db {
* @param pageSize 每页的数据量 * @param pageSize 每页的数据量
* @param queryWrapper 条件 * @param queryWrapper 条件
*/ */
public static Page<Row> paginate(String schema, String tableName, int pageNumber, int pageSize, QueryWrapper queryWrapper) { public static Page<Row> paginate(String schema, String tableName, Number pageNumber, Number pageSize, QueryWrapper queryWrapper) {
return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize), queryWrapper); return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize), queryWrapper);
} }
@ -1079,7 +1079,7 @@ public class Db {
* @param pageSize 每页的数据量 * @param pageSize 每页的数据量
* @param queryWrapper 条件 * @param queryWrapper 条件
*/ */
public static Page<Row> paginate(String tableName, int pageNumber, int pageSize, QueryWrapper queryWrapper) { public static Page<Row> paginate(String tableName, Number pageNumber, Number pageSize, QueryWrapper queryWrapper) {
return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize), queryWrapper); return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize), queryWrapper);
} }
@ -1094,7 +1094,7 @@ public class Db {
* @param totalRow 数据总量 * @param totalRow 数据总量
* @param queryWrapper 条件 * @param queryWrapper 条件
*/ */
public static Page<Row> paginate(String schema, String tableName, int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { public static Page<Row> paginate(String schema, String tableName, Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) {
return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize, totalRow), queryWrapper); return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize, totalRow), queryWrapper);
} }
@ -1107,7 +1107,7 @@ public class Db {
* @param totalRow 数据总量 * @param totalRow 数据总量
* @param queryWrapper 条件 * @param queryWrapper 条件
*/ */
public static Page<Row> paginate(String tableName, int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { public static Page<Row> paginate(String tableName, Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) {
return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize, totalRow), queryWrapper); return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize, totalRow), queryWrapper);
} }

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java
View File

@ -289,7 +289,7 @@ public interface RowMapper {
* @return row or null * @return row or null
*/ */
default Row selectOneByQuery(String schema, String tableName, QueryWrapper queryWrapper) { default Row selectOneByQuery(String schema, String tableName, QueryWrapper queryWrapper) {
List<Row> rows = selectListByQuery(schema, tableName, queryWrapper.limit(1)); List<Row> rows = selectListByQuery(schema, tableName, queryWrapper.limit(1L));
if (rows == null || rows.isEmpty()) { if (rows == null || rows.isEmpty()) {
return null; return null;
} else { } else {
@ -384,7 +384,7 @@ public interface RowMapper {
* @return 数据 * @return 数据
*/ */
default Object selectObjectByQuery(String schema, String tableName, QueryWrapper queryWrapper) { default Object selectObjectByQuery(String schema, String tableName, QueryWrapper queryWrapper) {
queryWrapper.limit(1); queryWrapper.limit(1L);
List<Object> objects = selectObjectListByQuery(schema, tableName, queryWrapper); List<Object> objects = selectObjectListByQuery(schema, tableName, queryWrapper);
if (objects == null || objects.isEmpty()) { if (objects == null || objects.isEmpty()) {
return null; return null;