🐛 修复insertBatchSomeColumn无法插入除list以外的其他 Collection 类型数据
This commit is contained in:
@@ -4,18 +4,17 @@ import com.baomidou.mybatisplus.annotation.DbType;
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
|
||||
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
|
||||
import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
|
||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
||||
import com.hccake.extend.mybatis.plus.injector.CustomSqlInjector;
|
||||
import com.hccake.extend.mybatis.plus.methods.InsertBatchSomeColumnByCollection;
|
||||
import com.hccake.extend.mybatis.plus.methods.SelectByPage;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author hccake
|
||||
* @date 2020/04/19 默认配置MybatisPlus分页插件,通过conditional注解达到覆盖效用
|
||||
@@ -55,7 +54,7 @@ public class MybatisPlusConfig {
|
||||
public ISqlInjector customSqlInjector() {
|
||||
List<AbstractMethod> list = new ArrayList<>();
|
||||
// 对于只在更新时进行填充的字段不做插入处理
|
||||
list.add(new InsertBatchSomeColumn(t -> t.getFieldFill() != FieldFill.UPDATE));
|
||||
list.add(new InsertBatchSomeColumnByCollection(t -> t.getFieldFill() != FieldFill.UPDATE));
|
||||
// 分页查询 返回 VO 对象
|
||||
list.add(new SelectByPage());
|
||||
return new CustomSqlInjector(list);
|
||||
|
||||
@@ -34,7 +34,7 @@ public interface ExtendMapper<T> extends BaseMapper<T> {
|
||||
* @return int 改动行
|
||||
* @author lingting 2020-08-26 22:11
|
||||
*/
|
||||
int insertBatchSomeColumn(@Param("list") Collection<T> list);
|
||||
int insertBatchSomeColumn(@Param("collection") Collection<T> list);
|
||||
|
||||
/**
|
||||
* 根据 entity 条件,查询全部记录(并翻页)
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
package com.hccake.extend.mybatis.plus.methods;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.core.enums.SqlMethod;
|
||||
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfo;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
|
||||
import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
|
||||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
|
||||
import org.apache.ibatis.executor.keygen.KeyGenerator;
|
||||
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
|
||||
import org.apache.ibatis.mapping.MappedStatement;
|
||||
import org.apache.ibatis.mapping.SqlSource;
|
||||
|
||||
/**
|
||||
* 从 {@link InsertBatchSomeColumn} 复制
|
||||
*
|
||||
* @author lingting 2021/2/23 15:32
|
||||
*/
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class InsertBatchSomeColumnByCollection extends AbstractMethod {
|
||||
|
||||
/**
|
||||
* 字段筛选条件
|
||||
*/
|
||||
@Setter
|
||||
@Accessors(chain = true)
|
||||
private Predicate<TableFieldInfo> predicate;
|
||||
|
||||
@Override
|
||||
public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
|
||||
KeyGenerator keyGenerator = new NoKeyGenerator();
|
||||
SqlMethod sqlMethod = SqlMethod.INSERT_ONE;
|
||||
List<TableFieldInfo> fieldList = tableInfo.getFieldList();
|
||||
String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(false)
|
||||
+ this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY);
|
||||
String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET;
|
||||
String insertSqlProperty = tableInfo.getKeyInsertSqlProperty(ENTITY_DOT, false)
|
||||
+ this.filterTableFieldInfo(fieldList, predicate, i -> i.getInsertSqlProperty(ENTITY_DOT), EMPTY);
|
||||
insertSqlProperty = LEFT_BRACKET + insertSqlProperty.substring(0, insertSqlProperty.length() - 1)
|
||||
+ RIGHT_BRACKET;
|
||||
// 从 list 改为 collection. 允许传入除 list外的参数类型
|
||||
String valuesScript = SqlScriptUtils.convertForeach(insertSqlProperty, "collection", null, ENTITY, COMMA);
|
||||
String keyProperty = null;
|
||||
String keyColumn = null;
|
||||
// 表包含主键处理逻辑,如果不包含主键当普通字段处理
|
||||
if (tableInfo.havePK()) {
|
||||
if (tableInfo.getIdType() == IdType.AUTO) {
|
||||
/* 自增主键 */
|
||||
keyGenerator = new Jdbc3KeyGenerator();
|
||||
keyProperty = tableInfo.getKeyProperty();
|
||||
keyColumn = tableInfo.getKeyColumn();
|
||||
}
|
||||
else {
|
||||
if (null != tableInfo.getKeySequence()) {
|
||||
keyGenerator = TableInfoHelper.genKeyGenerator(getMethod(sqlMethod), tableInfo, builderAssistant);
|
||||
keyProperty = tableInfo.getKeyProperty();
|
||||
keyColumn = tableInfo.getKeyColumn();
|
||||
}
|
||||
}
|
||||
}
|
||||
String sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), columnScript, valuesScript);
|
||||
SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
|
||||
return this.addInsertMappedStatement(mapperClass, modelClass, getMethod(sqlMethod), sqlSource, keyGenerator,
|
||||
keyProperty, keyColumn);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMethod(SqlMethod sqlMethod) {
|
||||
// 自定义 mapper 方法名
|
||||
return "insertBatchSomeColumn";
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user