From 927f60e99b4b3fa676f4af03d81486fbf3ddb17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Sun, 9 Jul 2023 09:13:53 +0800 Subject: [PATCH] optimize RowSqlProvider.java, remove duplicate method --- .../core/provider/RowSqlProvider.java | 22 ------------------- .../com/mybatisflex/core/row/RowMapper.java | 7 +++--- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java index 707b230d..401c52fe 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java @@ -314,28 +314,6 @@ public class RowSqlProvider { public static String selectListByQuery(Map params) { String schema = ProviderUtil.getSchemaName(params); String tableName = ProviderUtil.getTableName(params); - QueryWrapper queryWrapper = ProviderUtil.getQueryWrapper(params); - CPI.setFromIfNecessary(queryWrapper, schema, tableName); - - //优先构建 sql，再构建参数 - String sql = DialectFactory.getDialect().forSelectByQuery(queryWrapper); - - Object[] valueArray = CPI.getValueArray(queryWrapper); - ProviderUtil.setSqlArgs(params, valueArray); - - return sql; - } - - /** - * selectCountByQuery 的 sql 构建 - * - * @param params - * @return sql - * @see RowMapper#selectCountByQuery(String, String, QueryWrapper) - */ - public static String selectObjectByQuery(Map params) { - String schema = ProviderUtil.getSchemaName(params); - String tableName = ProviderUtil.getTableName(params); QueryWrapper queryWrapper = ProviderUtil.getQueryWrapper(params); CPI.setFromIfNecessary(queryWrapper, schema, tableName); 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 14c40c19..2f786642 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 @@ -396,10 +396,11 @@ public interface RowMapper { * * @param queryWrapper 查询包装器 * @return 数据列表 - * @see RowSqlProvider#selectObjectByQuery(Map) + * @see RowSqlProvider#selectListByQuery(Map) */ - @SelectProvider(type = RowSqlProvider.class, method = "selectObjectByQuery") - List selectObjectListByQuery(@Param(FlexConsts.SCHEMA_NAME) String schema, @Param(FlexConsts.TABLE_NAME) String tableName, @Param(FlexConsts.QUERY) QueryWrapper queryWrapper); + @SelectProvider(type = RowSqlProvider.class, method = "selectListByQuery") + List selectObjectListByQuery(@Param(FlexConsts.SCHEMA_NAME) String schema + , @Param(FlexConsts.TABLE_NAME) String tableName, @Param(FlexConsts.QUERY) QueryWrapper queryWrapper); /**