From 05aad515d25c804b32791dc361dacc58e1066a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Thu, 2 Mar 2023 13:24:10 +0800 Subject: [PATCH] rename BaseMapper.insertBatchWithFirstEntityColumns to insertBatch --- .../src/main/java/com/mybatisflex/core/BaseMapper.java | 7 ++++--- .../src/main/java/com/mybatisflex/core/FlexConsts.java | 2 ++ .../com/mybatisflex/core/dialect/CommonsDialectImpl.java | 2 +- .../main/java/com/mybatisflex/core/dialect/IDialect.java | 2 +- .../com/mybatisflex/core/mybatis/FlexConfiguration.java | 4 ++-- .../com/mybatisflex/core/provider/EntitySqlProvider.java | 7 ++++--- 6 files changed, 14 insertions(+), 10 deletions(-) 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 38413176..87b0c275 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 @@ -46,10 +46,11 @@ public interface BaseMapper { * * @param entities 插入的数据列表 * @return 返回影响的行数 - * @see com.mybatisflex.core.provider.EntitySqlProvider#insertBatchWithFirstEntityColumns(Map, ProviderContext) + * @see com.mybatisflex.core.provider.EntitySqlProvider#insertBatch(Map, ProviderContext) + * @see com.mybatisflex.core.FlexConsts#METHOD_INSERT_BATCH */ - @InsertProvider(type = EntitySqlProvider.class, method = "insertBatchWithFirstEntityColumns") - int insertBatchWithFirstEntityColumns(@Param(FlexConsts.ENTITIES) List entities); + @InsertProvider(type = EntitySqlProvider.class, method = FlexConsts.METHOD_INSERT_BATCH) + int insertBatch(@Param(FlexConsts.ENTITIES) List entities); /** * 根据 id 删除数据 diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java index bf7ee433..d655f1ad 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java @@ -36,4 +36,6 @@ public class FlexConsts { public static final String ENTITY = "$$entity"; public static final String ENTITIES = "$$entities"; public static final String IGNORE_NULLS = "$$ignoreNulls"; + + public static final String METHOD_INSERT_BATCH = "insertBatch"; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java index 000dec40..1b8e2c23 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java @@ -374,7 +374,7 @@ public class CommonsDialectImpl implements IDialect { } @Override - public String forInsertBatchWithFirstEntityColumns(TableInfo tableInfo, List entities) { + public String forInsertEntityBatch(TableInfo tableInfo, List entities) { StringBuilder sql = new StringBuilder(); sql.append("INSERT INTO ").append(wrap(tableInfo.getTableName())); String[] insertColumns = tableInfo.obtainInsertColumns(); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/IDialect.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/IDialect.java index 43d8a9b0..e5e919ca 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/IDialect.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/IDialect.java @@ -61,7 +61,7 @@ public interface IDialect { //////for entity ///// String forInsertEntity(TableInfo tableInfo, Object entity); - String forInsertBatchWithFirstEntityColumns(TableInfo tableInfo, List entities); + String forInsertEntityBatch(TableInfo tableInfo, List entities); String forDeleteEntityById(TableInfo tableInfo); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java index 5a718682..220bcbee 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java @@ -101,7 +101,7 @@ public class FlexConfiguration extends Configuration { ms = replaceRowKeyGenerator(ms); } //entity insert methods - else if (StringUtil.endsWithAny(ms.getId(), "insert", "insertBatchWithFirstEntityColumns") + else if (StringUtil.endsWithAny(ms.getId(), "insert", FlexConsts.METHOD_INSERT_BATCH) && ms.getKeyGenerator() == NoKeyGenerator.INSTANCE) { ms = replaceEntityKeyGenerator(ms); } @@ -208,7 +208,7 @@ public class FlexConfiguration extends Configuration { } //批量插入 - if (ms.getId().endsWith("insertBatchWithFirstEntityColumns")) { + if (ms.getId().endsWith(FlexConsts.METHOD_INSERT_BATCH)) { keyGenerator = new MultiEntityKeyGenerator(keyGenerator); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java index d9b92370..d2c4e844 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java @@ -68,9 +68,10 @@ public class EntitySqlProvider { * @param params * @param context * @return sql - * @see com.mybatisflex.core.BaseMapper#insertBatchWithFirstEntityColumns(List) + * @see com.mybatisflex.core.BaseMapper#insertBatch(List) + * @see com.mybatisflex.core.FlexConsts#METHOD_INSERT_BATCH */ - public static String insertBatchWithFirstEntityColumns(Map params, ProviderContext context) { + public static String insertBatch(Map params, ProviderContext context) { List entities = ProviderUtil.getEntities(params); if (CollectionUtil.isEmpty(entities)) { throw FlexExceptions.wrap("entities can not be null or empty."); @@ -84,7 +85,7 @@ public class EntitySqlProvider { ProviderUtil.setSqlArgs(params, values); - return DialectFactory.getDialect().forInsertBatchWithFirstEntityColumns(tableInfo, entities); + return DialectFactory.getDialect().forInsertEntityBatch(tableInfo, entities); }