|
@@ -15,13 +15,14 @@
|
|
|
*/
|
|
*/
|
|
|
package com.baomidou.mybatisplus.core.injector;
|
|
package com.baomidou.mybatisplus.core.injector;
|
|
|
|
|
|
|
|
-import java.lang.reflect.ParameterizedType;
|
|
|
|
|
-import java.lang.reflect.Type;
|
|
|
|
|
-import java.lang.reflect.TypeVariable;
|
|
|
|
|
-import java.lang.reflect.WildcardType;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
-
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.annotation.DbType;
|
|
|
|
|
+import com.baomidou.mybatisplus.annotation.FieldFill;
|
|
|
|
|
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.*;
|
|
|
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
|
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
|
|
import org.apache.ibatis.executor.keygen.KeyGenerator;
|
|
import org.apache.ibatis.executor.keygen.KeyGenerator;
|
|
|
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
|
|
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
|
|
@@ -32,19 +33,12 @@ import org.apache.ibatis.mapping.StatementType;
|
|
|
import org.apache.ibatis.scripting.LanguageDriver;
|
|
import org.apache.ibatis.scripting.LanguageDriver;
|
|
|
import org.apache.ibatis.session.Configuration;
|
|
import org.apache.ibatis.session.Configuration;
|
|
|
|
|
|
|
|
-import com.baomidou.mybatisplus.annotation.DbType;
|
|
|
|
|
-import com.baomidou.mybatisplus.annotation.FieldFill;
|
|
|
|
|
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
|
|
|
|
|
|
|
+import java.lang.reflect.ParameterizedType;
|
|
|
|
|
+import java.lang.reflect.Type;
|
|
|
|
|
+import java.lang.reflect.TypeVariable;
|
|
|
|
|
+import java.lang.reflect.WildcardType;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* <p>
|
|
* <p>
|
|
@@ -266,7 +260,7 @@ public abstract class AbstractMethod {
|
|
|
|
|
|
|
|
if (size >= 1) {
|
|
if (size >= 1) {
|
|
|
// 字段处理
|
|
// 字段处理
|
|
|
- columns.append(fieldList.stream().filter(i -> i.isSelect()).map(i -> {
|
|
|
|
|
|
|
+ columns.append(fieldList.stream().filter(TableFieldInfo::isSelect).map(i -> {
|
|
|
String v = sqlWordConvert(dbType, i.getColumn(), true);
|
|
String v = sqlWordConvert(dbType, i.getColumn(), true);
|
|
|
if (i.isRelated()) {
|
|
if (i.isRelated()) {
|
|
|
v += (" AS " + sqlWordConvert(dbType, i.getProperty(), false));
|
|
v += (" AS " + sqlWordConvert(dbType, i.getProperty(), false));
|
miemie