优化完善

mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldFill.java

@@ -15,8 +15,6 @@
  */
 package com.baomidou.mybatisplus.annotation;
 
-import lombok.Getter;
-
 /**
  * <p>
  * 字段填充策略枚举类
@@ -25,36 +23,21 @@ import lombok.Getter;
  * @author hubin
  * @since 2017-06-27
  */
-@Getter
 public enum FieldFill {
-    DEFAULT(0, "默认不处理"),
-    INSERT(1, "插入填充字段"),
-    UPDATE(2, "更新填充字段"),
-    INSERT_UPDATE(3, "插入和更新填充字段");
-
     /**
-     * 主键
+     * 默认不处理
      */
-    private final int key;
-
+    DEFAULT,
     /**
-     * 描述
+     * 插入填充字段
      */
-    private final String desc;
-
-    FieldFill(final int key, final String desc) {
-        this.key = key;
-        this.desc = desc;
-    }
-
-    public static FieldFill getIgnore(int key) {
-        FieldFill[] fis = FieldFill.values();
-        for (FieldFill fi : fis) {
-            if (fi.getKey() == key) {
-                return fi;
-            }
-        }
-        return FieldFill.DEFAULT;
-    }
-
+    INSERT,
+    /**
+     * 更新填充字段
+     */
+    UPDATE,
+    /**
+     * 插入和更新填充字段
+     */
+    INSERT_UPDATE
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/AbstractMethod.java

@@ -199,6 +199,15 @@ public abstract class AbstractMethod {
         return val;
     }
 
+    /**
+     * <p>
+     * 拼接字符串
+     * </p>
+     */
+    protected String joinStr(String... strings) {
+        return StringUtils.appends(null, strings);
+    }
+
     /**
      * <p>
      * SQL 查询所有表字段

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Constants.java

@@ -47,13 +47,33 @@ public interface Constants {
      */
     String ENTITY_SPOT = ENTITY + SPOT;
     /**
-     * wrapper类
+     * wrapper 类
      */
     String WRAPPER = "ew";
     /**
-     * wrapper类 带后缀 ==> .
+     * wrapper 类 带后缀 ==> .
      */
     String WRAPPER_SPOT = WRAPPER + SPOT;
+    /**
+     * wrapper 类的属性 entity
+     */
+    String WRAPPER_ENTITY = WRAPPER_SPOT + "entity";
+    /**
+     * wrapper 类的属性 sqlSegment
+     */
+    String WRAPPER_SQLSEGMENT = WRAPPER_SPOT + "sqlSegment";
+    /**
+     * wrapper 类的属性 entity 带后缀 ==> .
+     */
+    String WRAPPER_ENTITY_SPOT = WRAPPER_SPOT + "entity" + SPOT;
+    /**
+     * UpdateWrapper 类的属性 sqlSet
+     */
+    String U_WRAPPER_SQL_SET = WRAPPER_SPOT + "sqlSet";
+    /**
+     * QueryWrapper 类的属性 sqlSelect
+     */
+    String Q_WRAPPER_SQL_SELECT = WRAPPER_SPOT + "sqlSelect";
     /**
      * columnMap
      */

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/StringUtils.java

@@ -15,18 +15,14 @@
  */
 package com.baomidou.mybatisplus.core.toolkit;
 
-import static java.util.stream.Collectors.joining;
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 
 import java.sql.Blob;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Pattern;
 
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
+import static java.util.stream.Collectors.joining;
 
 /**
  * <p>
@@ -287,7 +283,7 @@ public class StringUtils {
      * @return 拼接后的字符串
      */
     public static String appends(String delimiter, String... strings) {
-        return Arrays.stream(strings).collect(joining(delimiter == null ? StringPool.EMPTY : delimiter));
+        return String.join(delimiter == null ? StringPool.EMPTY : delimiter, Arrays.asList(strings));
     }
 
     /**