解决EnumTypeStatusPlugin和逻辑删除插件在某些情况下冲突的问题

Author: hewei

src/main/java/com/itfsw/mybatis/generator/plugins/EnumTypeStatusPlugin.java

@@ -16,21 +16,15 @@
 
 package com.itfsw.mybatis.generator.plugins;
 
-import com.itfsw.mybatis.generator.plugins.utils.BasePlugin;
-import com.itfsw.mybatis.generator.plugins.utils.FormatTools;
-import com.itfsw.mybatis.generator.plugins.utils.IntrospectedTableTools;
-import com.itfsw.mybatis.generator.plugins.utils.JavaElementGeneratorTools;
+import com.itfsw.mybatis.generator.plugins.utils.*;
 import org.mybatis.generator.api.CommentGenerator;
 import org.mybatis.generator.api.IntrospectedColumn;
 import org.mybatis.generator.api.IntrospectedTable;
 import org.mybatis.generator.api.dom.java.*;
 import org.mybatis.generator.internal.util.StringUtility;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -113,6 +107,19 @@ public void initialized(IntrospectedTable introspectedTable) {
                 }
             }
         }
+
+        // 逻辑删除插件依赖该插件生成对应枚举
+        if (PluginTools.checkDependencyPlugin(this.getContext(), LogicalDeletePlugin.class)) {
+            // 1. 获取配置的逻辑删除列
+            String logicalDeleteColumnStr = this.getProperties().getProperty(LogicalDeletePlugin.PRO_LOGICAL_DELETE_COLUMN);
+            if (introspectedTable.getTableConfigurationProperty(LogicalDeletePlugin.PRO_LOGICAL_DELETE_COLUMN) != null) {
+                logicalDeleteColumnStr = introspectedTable.getTableConfigurationProperty(LogicalDeletePlugin.PRO_LOGICAL_DELETE_COLUMN);
+            }
+            IntrospectedColumn logicalDeleteColumn = IntrospectedTableTools.safeGetColumn(introspectedTable, logicalDeleteColumnStr);
+            if (logicalDeleteColumn != null) {
+                this.enumColumns.remove(logicalDeleteColumn.getJavaProperty());
+            }
+        }
     }
 
     /**
@@ -127,6 +134,19 @@ public boolean modelPrimaryKeyClassGenerated(TopLevelClass topLevelClass, Intros
         return super.modelPrimaryKeyClassGenerated(topLevelClass, introspectedTable);
     }
 
+    /**
+     * Model 生成
+     * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
+     * @param topLevelClass
+     * @param introspectedTable
+     * @return
+     */
+    @Override
+    public boolean modelBaseRecordClassGenerated(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
+        this.generateModelEnum(topLevelClass, introspectedTable);
+        return super.modelBaseRecordClassGenerated(topLevelClass, introspectedTable);
+    }
+
     /**
      * 生成对应enum
      * @param topLevelClass
@@ -142,20 +162,6 @@ private void generateModelEnum(TopLevelClass topLevelClass, IntrospectedTable in
         }
     }
 
-    /**
-     * Model 生成
-     * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
-     * @param topLevelClass
-     * @param introspectedTable
-     * @return
-     */
-    @Override
-    public boolean modelBaseRecordClassGenerated(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
-        this.generateModelEnum(topLevelClass, introspectedTable);
-        return super.modelBaseRecordClassGenerated(topLevelClass, introspectedTable);
-    }
-
-
     public static class EnumInfo {
         private List<EnumItemInfo> items = new ArrayList<>();
         private IntrospectedColumn column;