From 5e04beaaa016f816513b8d211207ef6c19e2026b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 28 Aug 2019 17:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E8=A1=A8=E5=89=8D=E7=BC=80=E9=85=8D=E7=BD=AE=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/generator/config/GenConfig.java |  6 +++---
 .../com/ruoyi/generator/util/GenUtils.java    | 19 ++++++++++++++++++-
 .../src/main/resources/generator.yml          |  4 ++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
index 49b42e7a..38748da1 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
@@ -22,7 +22,7 @@ public class GenConfig
     public static String packageName;
 
     /** 自动去除表前缀，默认是true */
-    public static String autoRemovePre;
+    public static boolean autoRemovePre;
 
     /** 表前缀(类名不会包含表前缀) */
     public static String tablePrefix;
@@ -49,13 +49,13 @@ public class GenConfig
         GenConfig.packageName = packageName;
     }
 
-    public static String getAutoRemovePre()
+    public static boolean getAutoRemovePre()
     {
         return autoRemovePre;
     }
 
     @Value("${autoRemovePre}")
-    public void setAutoRemovePre(String autoRemovePre)
+    public void setAutoRemovePre(boolean autoRemovePre)
     {
         GenConfig.autoRemovePre = autoRemovePre;
     }
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index bfbe238d..2fb67e79 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -19,7 +19,7 @@ public class GenUtils
      */
     public static void initTable(GenTable genTable, String operName)
     {
-        genTable.setClassName(StringUtils.convertToCamelCase(genTable.getTableName()));
+        genTable.setClassName(convertClassName(genTable.getTableName()));
         genTable.setPackageName(GenConfig.getPackageName());
         genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
         genTable.setBusinessName(getBusinessName(genTable.getTableName()));
@@ -152,6 +152,23 @@ public class GenUtils
         return businessName;
     }
 
+    /**
+     * 表名转换成Java类名
+     * 
+     * @param tableName 表名称
+     * @return 类名
+     */
+    public static String convertClassName(String tableName)
+    {
+        boolean autoRemovePre = GenConfig.getAutoRemovePre();
+        String tablePrefix = GenConfig.getTablePrefix();
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
+        {
+            tableName = tableName.replaceFirst(tablePrefix, "");
+        }
+        return StringUtils.convertToCamelCase(tableName);
+    }
+
     /**
      * 关键字替换
      * 
diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml
index 9e76f23f..fedd7cf6 100644
--- a/ruoyi-generator/src/main/resources/generator.yml
+++ b/ruoyi-generator/src/main/resources/generator.yml
@@ -5,7 +5,7 @@ gen:
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
   packageName: com.ruoyi.system
-  # 自动去除表前缀，默认是true
-  autoRemovePre: true
+  # 自动去除表前缀，默认是false
+  autoRemovePre: false
   # 表前缀(类名不会包含表前缀)
   tablePrefix: sys_
\ No newline at end of file