diff --git a/mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/RelationOneToMany.java b/mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/RelationOneToMany.java index 9fefdf44..eeafeb08 100644 --- a/mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/RelationOneToMany.java +++ b/mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/RelationOneToMany.java @@ -116,7 +116,7 @@ public @interface RelationOneToMany { * * @return 数据量 */ - int limit() default 0; + long limit() default 0; /** * 默认使用哪个数据源,若系统找不到该指定的数据源时,默认使用第一个数据源。 diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java index c12428a9..4413d60a 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java @@ -426,7 +426,7 @@ public interface BaseMapper { */ default T selectOneByMap(Map 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 { */ default T selectOneByCondition(QueryCondition 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 { */ default T selectOneWithRelationsByMap(Map 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 { */ default T selectOneWithRelationsByCondition(QueryCondition 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 { * @param count 数据量 * @return 数据列表 */ - default List selectListByMap(Map whereConditions, int count) { + default List selectListByMap(Map whereConditions, Long count) { FlexAssert.notEmpty(whereConditions, "whereConditions"); return selectListByQuery(QueryWrapper.create().where(whereConditions).limit(count)); } @@ -579,7 +579,7 @@ public interface BaseMapper { * @param count 数据量 * @return 数据列表 */ - default List selectListByCondition(QueryCondition whereConditions, int count) { + default List selectListByCondition(QueryCondition whereConditions, Long count) { FlexAssert.notNull(whereConditions, "whereConditions"); return selectListByQuery(QueryWrapper.create().where(whereConditions).limit(count)); } @@ -861,7 +861,7 @@ public interface BaseMapper { * @param queryWrapper 条件 * @return 分页数据 */ - default Page paginate(int pageNumber, int pageSize, QueryWrapper queryWrapper) { + default Page paginate(Number pageNumber, Number pageSize, QueryWrapper queryWrapper) { Page page = new Page<>(pageNumber, pageSize); return paginate(page, queryWrapper); } @@ -874,7 +874,7 @@ public interface BaseMapper { * @param queryWrapper 条件 * @return 分页数据 */ - default Page paginateWithRelations(int pageNumber, int pageSize, QueryWrapper queryWrapper) { + default Page paginateWithRelations(Number pageNumber, Number pageSize, QueryWrapper queryWrapper) { Page page = new Page<>(pageNumber, pageSize); return paginateWithRelations(page, queryWrapper); } @@ -887,7 +887,7 @@ public interface BaseMapper { * @param whereConditions 条件 * @return 分页数据 */ - default Page paginate(int pageNumber, int pageSize, QueryCondition whereConditions) { + default Page paginate(Number pageNumber, Number pageSize, QueryCondition whereConditions) { Page page = new Page<>(pageNumber, pageSize); return paginate(page, new QueryWrapper().where(whereConditions)); } @@ -900,7 +900,7 @@ public interface BaseMapper { * @param whereConditions 条件 * @return 分页数据 */ - default Page paginateWithRelations(int pageNumber, int pageSize, QueryCondition whereConditions) { + default Page paginateWithRelations(Number pageNumber, Number pageSize, QueryCondition whereConditions) { Page page = new Page<>(pageNumber, pageSize); return paginateWithRelations(page, new QueryWrapper().where(whereConditions)); } @@ -914,7 +914,7 @@ public interface BaseMapper { * @param queryWrapper 条件 * @return 分页数据 */ - default Page paginate(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { + default Page paginate(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) { Page page = new Page<>(pageNumber, pageSize, totalRow); return paginate(page, queryWrapper); } @@ -928,7 +928,7 @@ public interface BaseMapper { * @param queryWrapper 条件 * @return 分页数据 */ - default Page paginateWithRelations(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { + default Page paginateWithRelations(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) { Page page = new Page<>(pageNumber, pageSize, totalRow); return paginateWithRelations(page, queryWrapper); } @@ -942,7 +942,7 @@ public interface BaseMapper { * @param whereConditions 条件 * @return 分页数据 */ - default Page paginate(int pageNumber, int pageSize, int totalRow, QueryCondition whereConditions) { + default Page paginate(Number pageNumber, Number pageSize, Number totalRow, QueryCondition whereConditions) { FlexAssert.notNull(whereConditions, "whereConditions"); Page page = new Page<>(pageNumber, pageSize, totalRow); return paginate(page, new QueryWrapper().where(whereConditions)); @@ -957,7 +957,7 @@ public interface BaseMapper { * @param whereConditions 条件 * @return 分页数据 */ - default Page paginateWithRelations(int pageNumber, int pageSize, int totalRow, QueryCondition whereConditions) { + default Page paginateWithRelations(Number pageNumber, Number pageSize, Number totalRow, QueryCondition whereConditions) { FlexAssert.notNull(whereConditions, "whereConditions"); Page page = new Page<>(pageNumber, pageSize, totalRow); return paginateWithRelations(page, new QueryWrapper().where(whereConditions)); @@ -1018,7 +1018,7 @@ public interface BaseMapper { * @param asType 接收数据类型 * @return 分页数据 */ - default Page paginateAs(int pageNumber, int pageSize, QueryWrapper queryWrapper, Class asType) { + default Page paginateAs(Number pageNumber, Number pageSize, QueryWrapper queryWrapper, Class asType) { Page page = new Page<>(pageNumber, pageSize); return MapperUtil.doPaginate(this, page, queryWrapper, asType, false); } @@ -1033,7 +1033,7 @@ public interface BaseMapper { * @param asType 接收数据类型 * @return 分页数据 */ - default Page paginateAs(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper, Class asType) { + default Page paginateAs(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper, Class asType) { Page page = new Page<>(pageNumber, pageSize, totalRow); return MapperUtil.doPaginate(this, page, queryWrapper, asType, false); } @@ -1072,7 +1072,7 @@ public interface BaseMapper { * @param asType 接收数据类型 * @return 分页数据 */ - default Page paginateWithRelationsAs(int pageNumber, int pageSize, QueryWrapper queryWrapper, Class asType) { + default Page paginateWithRelationsAs(Number pageNumber, Number pageSize, QueryWrapper queryWrapper, Class asType) { Page page = new Page<>(pageNumber, pageSize); return MapperUtil.doPaginate(this, page, queryWrapper, asType, true); } @@ -1087,7 +1087,7 @@ public interface BaseMapper { * @param asType 接收数据类型 * @return 分页数据 */ - default Page paginateWithRelationsAs(int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper, Class asType) { + default Page paginateWithRelationsAs(Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper, Class asType) { Page page = new Page<>(pageNumber, pageSize, totalRow); return MapperUtil.doPaginate(this, page, queryWrapper, asType, true); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java index 93ad42a8..7645e0ac 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java @@ -97,7 +97,7 @@ public abstract class Model> * @return 数据 */ public T oneWithRelations() { - return baseMapper().selectOneWithRelationsByQuery(queryWrapper().limit(1)); + return baseMapper().selectOneWithRelationsByQuery(queryWrapper().limit(1L)); } /** diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java index cfa2ac2a..ceb382f6 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java @@ -356,17 +356,17 @@ public abstract class QueryModel> { return new OrderByBuilder<>((T) this, column); } - public T limit(Integer rows) { + public T limit(Number rows) { queryWrapper().limit(rows); return (T) this; } - public T offset(Integer offset) { + public T offset(Number offset) { queryWrapper().offset(offset); return (T) this; } - public T limit(Integer offset, Integer rows) { + public T limit(Number offset, Number rows) { queryWrapper().limit(offset, rows); return (T) this; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java index 34d3b081..21f79b45 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java @@ -39,7 +39,7 @@ public interface LimitOffsetProcessor { * @param limitRows 用户传入的 limit 参数 可能为 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) -> { if (limitRows != null) { if (limitOffset == null) { - limitOffset = 0; + limitOffset = 0L; } List queryTables = CPI.getQueryTables(queryWrapper); @@ -196,7 +196,7 @@ public interface LimitOffsetProcessor { LimitOffsetProcessor ORACLE = (dialect, sql, queryWrapper, limitRows, limitOffset) -> { if (limitRows != null) { if (limitOffset == null) { - limitOffset = 0; + limitOffset = 0L; } StringBuilder newSql = new StringBuilder("SELECT * FROM (SELECT TEMP_DATAS.*, ROWNUM RN FROM ("); newSql.append(sql); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java index 4e5a28a6..5067e4ea 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java @@ -382,8 +382,8 @@ public class CommonsDialectImpl implements IDialect { } } - Integer limitRows = CPI.getLimitRows(queryWrapper); - Integer limitOffset = CPI.getLimitOffset(queryWrapper); + Long limitRows = CPI.getLimitRows(queryWrapper); + Long limitOffset = CPI.getLimitOffset(queryWrapper); if (limitRows != null || limitOffset != null) { sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset); } @@ -418,8 +418,8 @@ public class CommonsDialectImpl implements IDialect { } } - Integer limitRows = CPI.getLimitRows(queryWrapper); - Integer limitOffset = CPI.getLimitOffset(queryWrapper); + Long limitRows = CPI.getLimitRows(queryWrapper); + Long limitOffset = CPI.getLimitOffset(queryWrapper); if (limitRows != null || limitOffset != null) { sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset); } @@ -1051,7 +1051,7 @@ public class CommonsDialectImpl implements IDialect { /** * 构建 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); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/paginate/Page.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/paginate/Page.java index d14b50bc..8592e53e 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/paginate/Page.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/paginate/Page.java @@ -44,12 +44,12 @@ public class Page 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 implements Serializable { * @param 数据类型 * @return 分页对象 */ - public static Page of(int pageNumber, int pageSize) { + public static Page of(Number pageNumber, Number pageSize) { return new Page<>(pageNumber, pageSize); } @@ -87,7 +87,7 @@ public class Page implements Serializable { * @param 数据类型 * @return 分页对象 */ - public static Page of(int pageNumber, int pageSize, long totalRow) { + public static Page of(Number pageNumber, Number pageSize, Number totalRow) { return new Page<>(pageNumber, pageSize, totalRow); } @@ -103,7 +103,7 @@ public class Page implements Serializable { * @param pageNumber 当前页码 * @param pageSize 每页数据数量 */ - public Page(int pageNumber, int pageSize) { + public Page(Number pageNumber, Number pageSize) { this.setPageNumber(pageNumber); this.setPageSize(pageSize); } @@ -115,7 +115,7 @@ public class Page implements Serializable { * @param pageSize 每页数据数量 * @param totalRow 总数居数量 */ - public Page(int pageNumber, int pageSize, long totalRow) { + public Page(Number pageNumber, Number pageSize, Number totalRow) { this.setPageNumber(pageNumber); this.setPageSize(pageSize); this.setTotalRow(totalRow); @@ -129,7 +129,7 @@ public class Page implements Serializable { * @param pageSize 每页数据数量 * @param totalRow 总数居数量 */ - public Page(List records, int pageNumber, int pageSize, long totalRow) { + public Page(List records, Number pageNumber, Number pageSize, Number totalRow) { this.setRecords(records); this.setPageNumber(pageNumber); this.setPageSize(pageSize); @@ -162,7 +162,7 @@ public class Page implements Serializable { * * @return 页码 */ - public int getPageNumber() { + public long getPageNumber() { return pageNumber; } @@ -171,11 +171,11 @@ public class Page implements Serializable { * * @param pageNumber 页码 */ - public void setPageNumber(int pageNumber) { - if (pageNumber < 1) { + public void setPageNumber(Number pageNumber) { + if (pageNumber.longValue() < 1) { 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 implements Serializable { * * @return 每页数据数量 */ - public int getPageSize() { + public long getPageSize() { return pageSize; } @@ -192,11 +192,11 @@ public class Page implements Serializable { * * @param pageSize 每页数据数量 */ - public void setPageSize(int pageSize) { - if (pageSize < 0) { + public void setPageSize(Number pageSize) { + if (pageSize.longValue() < 0) { throw new IllegalArgumentException("pageSize must greater than or equal 0,current value is: " + pageSize); } - this.pageSize = pageSize; + this.pageSize = pageSize.longValue(); this.calcTotalPage(); } @@ -232,8 +232,8 @@ public class Page implements Serializable { * * @param totalRow 数据总数 */ - public void setTotalRow(long totalRow) { - this.totalRow = totalRow; + public void setTotalRow(Number totalRow) { + this.totalRow = totalRow.longValue(); this.calcTotalPage(); } @@ -280,7 +280,7 @@ public class Page implements Serializable { * * @return 偏移量 */ - public int offset() { + public long offset() { return getPageSize() * (getPageNumber() - 1); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java index 1198fa65..8f30df24 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java @@ -40,8 +40,8 @@ public class BaseQueryWrapper> implements CloneSup protected List unions; - protected Integer limitOffset; - protected Integer limitRows; + protected Long limitOffset; + protected Long limitRows; protected List endFragments; @@ -219,19 +219,19 @@ public class BaseQueryWrapper> implements CloneSup this.unions = unions; } - protected Integer getLimitOffset() { + protected Long getLimitOffset() { return limitOffset; } - protected void setLimitOffset(Integer limitOffset) { + protected void setLimitOffset(Long limitOffset) { this.limitOffset = limitOffset; } - protected Integer getLimitRows() { + protected Long getLimitRows() { return limitRows; } - protected void setLimitRows(Integer limitRows) { + protected void setLimitRows(Long limitRows) { this.limitRows = limitRows; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java index 3a8a3ba7..7ffdc962 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java @@ -167,19 +167,19 @@ public class CPI { } - public static Integer getLimitOffset(QueryWrapper queryWrapper) { + public static Long getLimitOffset(QueryWrapper queryWrapper) { return queryWrapper.getLimitOffset(); } - public static void setLimitOffset(QueryWrapper queryWrapper, Integer limitOffset) { + public static void setLimitOffset(QueryWrapper queryWrapper, Long limitOffset) { queryWrapper.setLimitOffset(limitOffset); } - public static Integer getLimitRows(QueryWrapper queryWrapper) { + public static Long getLimitRows(QueryWrapper queryWrapper) { return queryWrapper.getLimitRows(); } - public static void setLimitRows(QueryWrapper queryWrapper, Integer limitRows) { + public static void setLimitRows(QueryWrapper queryWrapper, Long limitRows) { queryWrapper.setLimitRows(limitRows); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java index bc82cb23..6017a491 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java @@ -654,19 +654,27 @@ public class QueryWrapper extends BaseQueryWrapper { return this; } - public QueryWrapper limit(Integer rows) { - setLimitRows(rows); + public QueryWrapper limit(Number rows) { + if (rows != null) { + setLimitRows(rows.longValue()); + }else { + setLimitRows(null); + } return this; } - public QueryWrapper offset(Integer offset) { - setLimitOffset(offset); + public QueryWrapper offset(Number offset) { + if (offset!= null) { + setLimitOffset(offset.longValue()); + }else { + setLimitOffset(null); + } return this; } - public QueryWrapper limit(Integer offset, Integer rows) { - setLimitOffset(offset); - setLimitRows(rows); + public QueryWrapper limit(Number offset, Number rows) { + offset(offset); + limit(rows); return this; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java index 8d859f92..d1576cbc 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java @@ -583,19 +583,19 @@ public class QueryWrapperAdapter> extends Query } @Override - public R limit(Integer rows) { + public R limit(Number rows) { super.limit(rows); return (R) this; } @Override - public R offset(Integer offset) { + public R offset(Number offset) { super.offset(offset); return (R) this; } @Override - public R limit(Integer offset, Integer rows) { + public R limit(Number offset, Number rows) { super.limit(offset, rows); return (R) this; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/ToManyRelation.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/ToManyRelation.java index 95bac0a1..694c3ca6 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/ToManyRelation.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/ToManyRelation.java @@ -28,7 +28,7 @@ class ToManyRelation extends AbstractRelation { protected String mapKeyField; protected FieldWrapper mapKeyFieldWrapper; protected String orderBy; - protected int limit = 0; + protected long limit = 0; public ToManyRelation(String selfField, String targetSchema, String targetTable, String targetField, diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java index c83b41d4..52ab0b9e 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java @@ -610,7 +610,7 @@ public class Db { * @param whereColumns where条件 */ 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条件 */ 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 条件 */ 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 条件 */ 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 count 数据量 */ - public static List selectListByMap(String schema, String tableName, Map whereColumns, int count) { + public static List selectListByMap(String schema, String tableName, Map whereColumns, Long count) { return invoker().selectListByQuery(schema, tableName, new QueryWrapper().where(whereColumns).limit(count)); } @@ -734,7 +734,7 @@ public class Db { * @param whereColumns 条件 * @param count 数据量 */ - public static List selectListByMap(String tableName, Map whereColumns, int count) { + public static List selectListByMap(String tableName, Map whereColumns, Long count) { return invoker().selectListByQuery(null, tableName, new QueryWrapper().where(whereColumns).limit(count)); } @@ -769,7 +769,7 @@ public class Db { * @param condition 条件 * @param count 数据量 */ - public static List selectListByCondition(String schema, String tableName, QueryCondition condition, int count) { + public static List selectListByCondition(String schema, String tableName, QueryCondition condition, Long count) { return invoker().selectListByQuery(schema, tableName, new QueryWrapper().where(condition).limit(count)); } @@ -780,7 +780,7 @@ public class Db { * @param condition 条件 * @param count 数据量 */ - public static List selectListByCondition(String tableName, QueryCondition condition, int count) { + public static List selectListByCondition(String tableName, QueryCondition condition, Long count) { return invoker().selectListByQuery(null, tableName, new QueryWrapper().where(condition).limit(count)); } @@ -1012,7 +1012,7 @@ public class Db { * @param pageSize 每页的数据量 * @param condition 条件 */ - public static Page paginate(String schema, String tableName, int pageNumber, int pageSize, QueryCondition condition) { + public static Page paginate(String schema, String tableName, Number pageNumber, Number pageSize, QueryCondition condition) { return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize), QueryWrapper.create().where(condition)); } @@ -1025,7 +1025,7 @@ public class Db { * @param pageSize 每页的数据量 * @param condition 条件 */ - public static Page paginate(String tableName, int pageNumber, int pageSize, QueryCondition condition) { + public static Page paginate(String tableName, Number pageNumber, Number pageSize, QueryCondition condition) { return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize), QueryWrapper.create().where(condition)); } @@ -1040,7 +1040,7 @@ public class Db { * @param totalRow 数据总量 * @param condition 条件 */ - public static Page paginate(String schema, String tableName, int pageNumber, int pageSize, int totalRow, QueryCondition condition) { + public static Page 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)); } @@ -1053,7 +1053,7 @@ public class Db { * @param totalRow 数据总量 * @param condition 条件 */ - public static Page paginate(String tableName, int pageNumber, int pageSize, int totalRow, QueryCondition condition) { + public static Page 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)); } @@ -1067,7 +1067,7 @@ public class Db { * @param pageSize 每页的数据量 * @param queryWrapper 条件 */ - public static Page paginate(String schema, String tableName, int pageNumber, int pageSize, QueryWrapper queryWrapper) { + public static Page paginate(String schema, String tableName, Number pageNumber, Number pageSize, QueryWrapper queryWrapper) { return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize), queryWrapper); } @@ -1079,7 +1079,7 @@ public class Db { * @param pageSize 每页的数据量 * @param queryWrapper 条件 */ - public static Page paginate(String tableName, int pageNumber, int pageSize, QueryWrapper queryWrapper) { + public static Page paginate(String tableName, Number pageNumber, Number pageSize, QueryWrapper queryWrapper) { return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize), queryWrapper); } @@ -1094,7 +1094,7 @@ public class Db { * @param totalRow 数据总量 * @param queryWrapper 条件 */ - public static Page paginate(String schema, String tableName, int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { + public static Page paginate(String schema, String tableName, Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) { return invoker().paginate(schema, tableName, new Page<>(pageNumber, pageSize, totalRow), queryWrapper); } @@ -1107,7 +1107,7 @@ public class Db { * @param totalRow 数据总量 * @param queryWrapper 条件 */ - public static Page paginate(String tableName, int pageNumber, int pageSize, int totalRow, QueryWrapper queryWrapper) { + public static Page paginate(String tableName, Number pageNumber, Number pageSize, Number totalRow, QueryWrapper queryWrapper) { return invoker().paginate(null, tableName, new Page<>(pageNumber, pageSize, totalRow), queryWrapper); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java index 6ed9d166..356e34f0 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java @@ -289,7 +289,7 @@ public interface RowMapper { * @return row or null */ default Row selectOneByQuery(String schema, String tableName, QueryWrapper queryWrapper) { - List rows = selectListByQuery(schema, tableName, queryWrapper.limit(1)); + List rows = selectListByQuery(schema, tableName, queryWrapper.limit(1L)); if (rows == null || rows.isEmpty()) { return null; } else { @@ -384,7 +384,7 @@ public interface RowMapper { * @return 数据 */ default Object selectObjectByQuery(String schema, String tableName, QueryWrapper queryWrapper) { - queryWrapper.limit(1); + queryWrapper.limit(1L); List objects = selectObjectListByQuery(schema, tableName, queryWrapper); if (objects == null || objects.isEmpty()) { return null;