From ee927ad6dc103c797e0926e44f88cfce181839b5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 26 八月 2021 12:33:02 +0800
Subject: [PATCH] !83 update 优化生成的业务名 Merge pull request !83 from 友杰/auto-8071125-dev-1629950351765

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

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 5e778d6..a64ac3e 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
@@ -61,7 +61,7 @@
             column.setHtmlType(GenConstants.HTML_INPUT);
 
             // 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal
-            String[] str = StringUtils.splitToArray(StringUtils.subBetween(column.getColumnType(), "(", ")"), ",");
+            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
             if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
             {
                 column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
@@ -98,33 +98,33 @@
         }
 
         // 鏌ヨ瀛楁绫诲瀷
-        if (StringUtils.endWithIgnoreCase(columnName, "name"))
+        if (StringUtils.endsWithIgnoreCase(columnName, "name"))
         {
             column.setQueryType(GenConstants.QUERY_LIKE);
         }
         // 鐘舵�佸瓧娈佃缃崟閫夋
-        if (StringUtils.endWithIgnoreCase(columnName, "status"))
+        if (StringUtils.endsWithIgnoreCase(columnName, "status"))
         {
             column.setHtmlType(GenConstants.HTML_RADIO);
         }
         // 绫诲瀷&鎬у埆瀛楁璁剧疆涓嬫媺妗�
-        else if (StringUtils.endWithIgnoreCase(columnName, "type")
-                || StringUtils.endWithIgnoreCase(columnName, "sex"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "type")
+                || StringUtils.endsWithIgnoreCase(columnName, "sex"))
         {
             column.setHtmlType(GenConstants.HTML_SELECT);
         }
         // 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
-        else if (StringUtils.endWithIgnoreCase(columnName, "image"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
         {
             column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
         }
         // 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
-        else if (StringUtils.endWithIgnoreCase(columnName, "file"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
         {
             column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
         }
         // 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
-        else if (StringUtils.endWithIgnoreCase(columnName, "content"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
         {
             column.setHtmlType(GenConstants.HTML_EDITOR);
         }
@@ -152,7 +152,7 @@
     {
         int lastIndex = packageName.lastIndexOf(".");
         int nameLength = packageName.length();
-        String moduleName = StringUtils.sub(packageName, lastIndex + 1, nameLength);
+        String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
         return moduleName;
     }
 
@@ -164,9 +164,10 @@
      */
     public static String getBusinessName(String tableName)
     {
-        int lastIndex = tableName.lastIndexOf("_");
+        int firstIndex = tableName.indexOf("_");
         int nameLength = tableName.length();
-        String businessName = StringUtils.sub(tableName, lastIndex + 1, nameLength);
+        String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength);
+		businessName = StringUtils.toCamelCase(businessName);
         return businessName;
     }
 
@@ -182,10 +183,10 @@
         String tablePrefix = GenConfig.getTablePrefix();
         if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
         {
-            String[] searchList = StringUtils.splitToArray(tablePrefix, ",");
+            String[] searchList = StringUtils.split(tablePrefix, ",");
             tableName = replaceFirst(tableName, searchList);
         }
-        return StringUtils.upperFirst(StringUtils.toCamelCase(tableName));
+        return StringUtils.convertToCamelCase(tableName);
     }
 
     /**
@@ -230,7 +231,7 @@
     {
         if (StringUtils.indexOf(columnType, '(') > 0)
         {
-            return StringUtils.subBefore(columnType, "(",false);
+            return StringUtils.substringBefore(columnType, "(");
         }
         else
         {
@@ -248,7 +249,7 @@
     {
         if (StringUtils.indexOf(columnType, '(') > 0)
         {
-            String length = StringUtils.subBetween(columnType, "(", ")");
+            String length = StringUtils.substringBetween(columnType, "(", ")");
             return Integer.valueOf(length);
         }
         else

--
Gitblit v1.9.3