改为 fill 方便理解

build.gradle

@@ -80,7 +80,6 @@ def common = [
         "org.springframework:spring-tx:${springVersion}",
         "org.springframework:spring-jdbc:${springVersion}",
         "org.springframework:spring-context-support:${springVersion}",
-        "com.alibaba:druid:1.0.29",
         "org.apache.velocity:velocity:1.7"
 ]
 

src/main/java/com/baomidou/mybatisplus/annotations/TableField.java

@@ -20,7 +20,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.enums.FieldStrategy;
 
 /**
@@ -75,8 +75,8 @@ public @interface TableField {
 
     /**
      * <p>
-     * 字段忽略策略
+     * 字段自动填充策略
      * </p>
      */
-    FieldIgnore ignore() default FieldIgnore.DEFAULT;
+    FieldFill fill() default FieldFill.DEFAULT;
 }

src/main/java/com/baomidou/mybatisplus/entity/TableFieldInfo.java

@@ -19,7 +19,7 @@ import java.lang.reflect.Field;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableLogic;
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.enums.FieldStrategy;
 import com.baomidou.mybatisplus.toolkit.SqlReservedWords;
 import com.baomidou.mybatisplus.toolkit.StringUtils;
@@ -79,7 +79,7 @@ public class TableFieldInfo {
     /**
      * 字段忽略策略
      */
-    private FieldIgnore fieldIgnore = FieldIgnore.DEFAULT;
+    private FieldFill fieldFill = FieldFill.DEFAULT;
 
     /**
      * <p>
@@ -118,9 +118,9 @@ public class TableFieldInfo {
         }
         tableInfo.setLogicDelete(this.initLogicDelete(globalConfig, field));
         /*
-         * 保存当前字段的插入忽略，更新忽略值
+         * 保存当前字段的填充策略
 		 */
-        this.fieldIgnore = tableField.ignore();
+        this.fieldFill = tableField.fill();
     }
 
     public TableFieldInfo(GlobalConfiguration globalConfig, TableInfo tableInfo, Field field) {
@@ -245,11 +245,11 @@ public class TableFieldInfo {
         this.logicNotDeleteValue = logicNotDeleteValue;
     }
 
-    public FieldIgnore getFieldIgnore() {
-        return fieldIgnore;
+    public FieldFill getFieldFill() {
+        return fieldFill;
     }
 
-    public void setFieldIgnore(FieldIgnore fieldIgnore) {
-        this.fieldIgnore = fieldIgnore;
+    public void setFieldFill(FieldFill fieldFill) {
+        this.fieldFill = fieldFill;
     }
 }

src/main/java/com/baomidou/mybatisplus/enums/FieldIgnore.java → src/main/java/com/baomidou/mybatisplus/enums/FieldFill.java

@@ -17,13 +17,13 @@ package com.baomidou.mybatisplus.enums;
 
 /**
  * <p>
- * 字段忽略策略枚举类
+ * 字段填充策略枚举类
  * </p>
  *
  * @author hubin
- * @Date 2016-09-09
+ * @Date 2017-06-27
  */
-public enum FieldIgnore {
+public enum FieldFill {
     DEFAULT(0, "默认方式"),
     INSERT(1, "忽略插入"),
     UPDATE(2, "忽略更新"),
@@ -39,19 +39,19 @@ public enum FieldIgnore {
      */
     private final String desc;
 
-    FieldIgnore(final int key, final String desc) {
+    FieldFill(final int key, final String desc) {
         this.key = key;
         this.desc = desc;
     }
 
-    public static FieldIgnore getIgnore(int key) {
-        FieldIgnore[] fis = FieldIgnore.values();
-        for (FieldIgnore fi : fis) {
+    public static FieldFill getIgnore(int key) {
+        FieldFill[] fis = FieldFill.values();
+        for (FieldFill fi : fis) {
             if (fi.getKey() == key) {
                 return fi;
             }
         }
-        return FieldIgnore.DEFAULT;
+        return FieldFill.DEFAULT;
     }
 
     public int getKey() {

src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.generator.config.ConstVal;
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 import com.baomidou.mybatisplus.generator.config.GlobalConfig;
@@ -510,7 +510,7 @@ public class ConfigBuilder {
                 if (null != tfs) {
                     for (TableFill tf : tfs) {
                         if (tf.getFieldName().equals(field.getName())) {
-                            field.setIgnore(FieldIgnore.INSERT.name());
+                            field.setIgnore(FieldFill.INSERT.name());
                             break;
                         }
                     }

src/main/java/com/baomidou/mybatisplus/generator/config/po/TableFill.java

@@ -15,7 +15,7 @@
  */
 package com.baomidou.mybatisplus.generator.config.po;
 
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 
 /**
  * <p>
@@ -30,13 +30,13 @@ public class TableFill {
     /* 字段名称 */
     private String fieldName;
     /* 忽略类型 */
-    private FieldIgnore ignore;
+    private FieldFill ignore;
 
     private TableFill() {
         // to do nothing
     }
 
-    public TableFill(String fieldName, FieldIgnore ignore) {
+    public TableFill(String fieldName, FieldFill ignore) {
         this.fieldName = fieldName;
         this.ignore = ignore;
     }
@@ -49,11 +49,11 @@ public class TableFill {
         this.fieldName = fieldName;
     }
 
-    public FieldIgnore getIgnore() {
+    public FieldFill getIgnore() {
         return ignore;
     }
 
-    public void setIgnore(FieldIgnore ignore) {
+    public void setIgnore(FieldFill ignore) {
         this.ignore = ignore;
     }
 }

src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -42,7 +42,7 @@ import org.apache.ibatis.session.Configuration;
 import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.entity.TableFieldInfo;
 import com.baomidou.mybatisplus.entity.TableInfo;
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.enums.FieldStrategy;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.enums.SqlMethod;
@@ -243,8 +243,8 @@ public class AutoSqlInjector implements ISqlInjector {
         List<TableFieldInfo> fieldList = table.getFieldList();
         for (TableFieldInfo fieldInfo : fieldList) {
             // 在FieldIgnore,INSERT_UPDATE,INSERT 时设置为false
-            ifTag = !(FieldIgnore.INSERT == fieldInfo.getFieldIgnore()
-                    || FieldIgnore.INSERT_UPDATE == fieldInfo.getFieldIgnore());
+            ifTag = !(FieldFill.INSERT == fieldInfo.getFieldFill()
+                    || FieldFill.INSERT_UPDATE == fieldInfo.getFieldFill());
             if (selective && ifTag) {
                 fieldBuilder.append(convertIfTagIgnored(fieldInfo, false));
                 fieldBuilder.append(fieldInfo.getColumn()).append(",");
@@ -541,8 +541,8 @@ public class AutoSqlInjector implements ISqlInjector {
         List<TableFieldInfo> fieldList = table.getFieldList();
         for (TableFieldInfo fieldInfo : fieldList) {
             // 判断是否更新忽略,在FieldIgnore,UPDATE,INSERT_UPDATE设置为false
-            ifTag = !(FieldIgnore.UPDATE == fieldInfo.getFieldIgnore()
-                    || FieldIgnore.INSERT_UPDATE == fieldInfo.getFieldIgnore());
+            ifTag = !(FieldFill.UPDATE == fieldInfo.getFieldFill()
+                    || FieldFill.INSERT_UPDATE == fieldInfo.getFieldFill());
             if (selective && ifTag) {
                 set.append(convertIfTag(true, fieldInfo, prefix, false));
                 set.append(fieldInfo.getColumn()).append("=#{");

src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java

@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
@@ -55,7 +55,7 @@ public class MysqlGenerator {
     public static void main(String[] args) {
         // 自定义需要填充的字段
         List<TableFill> tableFillList = new ArrayList<>();
-        tableFillList.add(new TableFill("ASDD_SS", FieldIgnore.INSERT_UPDATE));
+        tableFillList.add(new TableFill("ASDD_SS", FieldFill.INSERT_UPDATE));
 
         // 代码生成器
         AutoGenerator mpg = new AutoGenerator().setGlobalConfig(

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserMetaObj.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.enums.IdType;
 
 import lombok.Data;
@@ -59,7 +59,7 @@ public class H2UserMetaObj implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", ignore = FieldIgnore.INSERT)
+    @TableField(value = "test_type", fill = FieldFill.INSERT)
     private Integer testType;
 
     private String desc;

src/test/java/com/baomidou/mybatisplus/test/mysql/entity/User.java

@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableLogic;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
-import com.baomidou.mybatisplus.enums.FieldIgnore;
+import com.baomidou.mybatisplus.enums.FieldFill;
 
 /**
  * <p>
@@ -55,7 +55,7 @@ public class User implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", ignore = FieldIgnore.INSERT)
+    @TableField(value = "test_type", fill = FieldFill.INSERT)
     @TableLogic(value = "-2") // 该注解为了测试逻辑删除、这里设置 -2 为删除值
     private Integer testType;