!388 Db.selectMap 支持，查询的结果列1作为key，列2作为value

Merge pull request !388 from tangxin/main

docs/zh/base/db-row.md

@@ -27,6 +27,9 @@ String listsql = "select * from tb_account where age > ?"
 List<Row> 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));

mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java

@@ -290,9 +290,21 @@ public class FlexDefaultResultSetHandler extends DefaultResultSetHandler {
             if (parentMapping != null) {
                 handleRowValues(rsw, resultMap, null, RowBounds.DEFAULT, parentMapping);
             } else if (resultHandler == null) {
-                DefaultResultHandler defaultResultHandler = new DefaultResultHandler(objectFactory);
+                if(resultMap.getId().startsWith("com.mybatisflex.core.row.RowMapper.selectFirstAndSecondColumnsAsMap")){
-                handleRowValues(rsw, resultMap, defaultResultHandler, rowBounds, null);
+                    ResultSet resultSet = rsw.getResultSet();
-                multipleResults.add(defaultResultHandler.getResultList());
+                    skipRows(resultSet, rowBounds);
+                    Map<Object,Object> row = new HashMap<>();
+                    while (!resultSet.isClosed() && resultSet.next()) {
+                        row.put(resultSet.getObject(1),resultSet.getObject(2));
+                    }
+                    List<Map<Object,Object>> mapArrayList = new ArrayList<>(1);
+                    mapArrayList.add(row);
+                    multipleResults.add(mapArrayList);
+                }else {
+                    DefaultResultHandler defaultResultHandler = new DefaultResultHandler(objectFactory);
+                    handleRowValues(rsw, resultMap, defaultResultHandler, rowBounds, null);
+                    multipleResults.add(defaultResultHandler.getResultList());
+                }
             } else {
                 handleRowValues(rsw, resultMap, resultHandler, rowBounds, null);
             }

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

@@ -854,6 +854,48 @@ public class Db {
         return invoker().selectObjectByQuery(null, null, queryWrapper);
     }
 
+    /**
+     * 根据 queryWrapper 查询内容，数据返回为Map  第一列的值作为key 第二列的值作为value
+     *
+     * @param queryWrapper query 封装
+     * @return 数据内容
+     */
+    public static Map selectFirstAndSecondColumnsAsMap(QueryWrapper queryWrapper) {
+        return invoker().selectFirstAndSecondColumnsAsMapByQuery(null, null, queryWrapper);
+    }
+
+    /**
+     * 查询某个内容，数据返回为Map  第一列的值作为key 第二列的值作为value
+     *
+     * @param sql  sql 内容
+     * @param args sql 参数
+     */
+    public static Map selectFirstAndSecondColumnsAsMap(String sql, Object... args) {
+        return invoker().selectFirstAndSecondColumnsAsMap(sql, args);
+    }
+
+    /**
+     * 根据 queryWrapper 查询内容，数据返回为Map  第一列的值作为key 第二列的值作为value
+     *
+     * @param schema       模式
+     * @param tableName    表名
+     * @param queryWrapper query 封装
+     * @return 数据内容
+     */
+    public static Map selectFirstAndSecondColumnsAsMap(String schema, String tableName, QueryWrapper queryWrapper) {
+        return invoker().selectFirstAndSecondColumnsAsMapByQuery(schema, tableName, queryWrapper);
+    }
+
+    /**
+     * 根据 queryWrapper 查询内容，数据返回为Map  第一列的值作为key 第二列的值作为value
+     *
+     * @param tableName    表名
+     * @param queryWrapper query 封装
+     * @return 数据内容
+     */
+    public static Map selectFirstAndSecondColumnsAsMap(String tableName, QueryWrapper queryWrapper) {
+        return invoker().selectFirstAndSecondColumnsAsMapByQuery(null, tableName, queryWrapper);
+    }
 
     /**
      * 查询某列内容，数据返回应该有 多行 1 列

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

@@ -327,6 +327,12 @@ public interface RowMapper {
     Object selectObject(@Param(FlexConsts.SQL) String sql, @Param(FlexConsts.SQL_ARGS) Object... args);
 
 
+    @SelectProvider(value = RowSqlProvider.class, method = RowSqlProvider.METHOD_RAW_SQL)
+    Map selectFirstAndSecondColumnsAsMap(@Param(FlexConsts.SQL) String sql, @Param(FlexConsts.SQL_ARGS) Object... args);
+
+    @SelectProvider(type = RowSqlProvider.class, method = "selectListByQuery")
+    Map selectFirstAndSecondColumnsAsMapByQuery(@Param(FlexConsts.SCHEMA_NAME) String schema
+        , @Param(FlexConsts.TABLE_NAME) String tableName, @Param(FlexConsts.QUERY) QueryWrapper queryWrapper);
     /**
      * 通过 sql 查询多行数据，sql 执行的结果应该只有 1 列
      *
@@ -453,4 +459,5 @@ public interface RowMapper {
 
     }
 
+
 }

mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java

@@ -24,6 +24,7 @@ import org.apache.ibatis.session.SqlSessionFactory;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
@@ -188,7 +189,12 @@ public class RowMapperInvoker {
     public List<Row> selectAll(String schema, String tableName) {
         return execute(mapper -> mapper.selectAll(schema, tableName));
     }
-
+    public Map selectFirstAndSecondColumnsAsMapByQuery(String schema, String tableName, QueryWrapper queryWrapper) {
+        return execute(mapper -> mapper.selectFirstAndSecondColumnsAsMapByQuery(schema, tableName, queryWrapper));
+    }
+    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));
     }

mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTest.java

@@ -17,6 +17,7 @@
 package com.mybatisflex.test;
 
 import com.mybatisflex.core.MybatisFlexBootstrap;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.row.Db;
 import com.mybatisflex.core.row.Row;
 import org.apache.ibatis.session.Configuration;
@@ -28,6 +29,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import javax.sql.DataSource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author 王帅
@@ -70,4 +72,13 @@ public class DbTest {
             .forEach(Assert::assertNull);
     }
 
+    @Test
+    public void test02() {
+        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);
+    }
+
 }