diff --git a/docs/zh/base/db-row.md b/docs/zh/base/db-row.md index fa785089..d32cf378 100644 --- a/docs/zh/base/db-row.md +++ b/docs/zh/base/db-row.md @@ -27,6 +27,9 @@ String listsql = "select * from tb_account where age > ?" List rows = Db.selectListBySql(listsql,18); +//查询所有大于 18 岁用户的Id和用户名对应的Map +Map map = Db.selectFirstAndSecondColumnsAsMap("select id,user_name from tb_account where age >?",18); + //分页查询:每页 10 条数据,查询第 3 页的年龄大于 18 的用户 QueryWrapper query=QueryWrapper.create() .where(ACCOUNT.AGE.ge(18)); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java index 09df6eb1..d12353a5 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java @@ -290,7 +290,7 @@ public class FlexDefaultResultSetHandler extends DefaultResultSetHandler { if (parentMapping != null) { handleRowValues(rsw, resultMap, null, RowBounds.DEFAULT, parentMapping); } else if (resultHandler == null) { - if(resultMap.getId().startsWith("com.mybatisflex.core.row.RowMapper.selectMap")){ + if(resultMap.getId().startsWith("com.mybatisflex.core.row.RowMapper.selectFirstAndSecondColumnsAsMap")){ ResultSet resultSet = rsw.getResultSet(); skipRows(resultSet, rowBounds); Map row = new HashMap<>(); 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 688f831c..4cab02bc 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 @@ -860,8 +860,8 @@ public class Db { * @param queryWrapper query 封装 * @return 数据内容 */ - public static Map selectMap(QueryWrapper queryWrapper) { - return invoker().selectMapByQuery(null, null, queryWrapper); + public static Map selectFirstAndSecondColumnsAsMap(QueryWrapper queryWrapper) { + return invoker().selectFirstAndSecondColumnsAsMapByQuery(null, null, queryWrapper); } /** @@ -870,8 +870,8 @@ public class Db { * @param sql sql 内容 * @param args sql 参数 */ - public static Map selectMap(String sql, Object... args) { - return invoker().selectMap(sql, args); + public static Map selectFirstAndSecondColumnsAsMap(String sql, Object... args) { + return invoker().selectFirstAndSecondColumnsAsMap(sql, args); } /** @@ -882,8 +882,8 @@ public class Db { * @param queryWrapper query 封装 * @return 数据内容 */ - public static Map selectMap(String schema, String tableName, QueryWrapper queryWrapper) { - return invoker().selectMapByQuery(schema, tableName, queryWrapper); + public static Map selectFirstAndSecondColumnsAsMap(String schema, String tableName, QueryWrapper queryWrapper) { + return invoker().selectFirstAndSecondColumnsAsMapByQuery(schema, tableName, queryWrapper); } /** @@ -893,8 +893,8 @@ public class Db { * @param queryWrapper query 封装 * @return 数据内容 */ - public static Map selectMap(String tableName, QueryWrapper queryWrapper) { - return invoker().selectMapByQuery(null, tableName, queryWrapper); + public static Map selectFirstAndSecondColumnsAsMap(String tableName, QueryWrapper queryWrapper) { + return invoker().selectFirstAndSecondColumnsAsMapByQuery(null, tableName, 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 bfa1bf6c..7bbad179 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 @@ -328,10 +328,10 @@ public interface RowMapper { @SelectProvider(value = RowSqlProvider.class, method = RowSqlProvider.METHOD_RAW_SQL) - Map selectMap(@Param(FlexConsts.SQL) String sql, @Param(FlexConsts.SQL_ARGS) Object... args); + Map selectFirstAndSecondColumnsAsMap(@Param(FlexConsts.SQL) String sql, @Param(FlexConsts.SQL_ARGS) Object... args); @SelectProvider(type = RowSqlProvider.class, method = "selectListByQuery") - Map selectMapByQuery(@Param(FlexConsts.SCHEMA_NAME) String schema + Map selectFirstAndSecondColumnsAsMapByQuery(@Param(FlexConsts.SCHEMA_NAME) String schema , @Param(FlexConsts.TABLE_NAME) String tableName, @Param(FlexConsts.QUERY) QueryWrapper queryWrapper); /** * 通过 sql 查询多行数据,sql 执行的结果应该只有 1 列 @@ -459,4 +459,5 @@ public interface RowMapper { } + } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java index b67842b7..9a7e77ab 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java @@ -189,11 +189,11 @@ public class RowMapperInvoker { public List selectAll(String schema, String tableName) { return execute(mapper -> mapper.selectAll(schema, tableName)); } - public Map selectMapByQuery(String schema, String tableName, QueryWrapper queryWrapper) { - return execute(mapper -> mapper.selectMapByQuery(schema, tableName, queryWrapper)); + public Map selectFirstAndSecondColumnsAsMapByQuery(String schema, String tableName, QueryWrapper queryWrapper) { + return execute(mapper -> mapper.selectFirstAndSecondColumnsAsMapByQuery(schema, tableName, queryWrapper)); } - public Map selectMap(String sql, Object... args) { - return execute(mapper -> mapper.selectMap(sql, args)); + public Map selectFirstAndSecondColumnsAsMap(String sql, Object... args) { + return execute(mapper -> mapper.selectFirstAndSecondColumnsAsMap(sql, args)); } public Object selectObjectByQuery(String schema, String tableName, QueryWrapper queryWrapper) { return execute(mapper -> mapper.selectObjectByQuery(schema, tableName, queryWrapper)); diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTest.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTest.java index bd270e9c..d06aec07 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTest.java +++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTest.java @@ -74,8 +74,8 @@ public class DbTest { @Test public void test02() { - Map map = Db.selectMap(QueryWrapper.create().from(tb_account)); - Map map2 = Db.selectMap("select * from tb_account"); + Map map = Db.selectFirstAndSecondColumnsAsMap(QueryWrapper.create().from(tb_account)); + Map map2 = Db.selectFirstAndSecondColumnsAsMap("select * from tb_account"); System.out.println(map); System.out.println(map2); Assert.assertEquals(map,map2);