From cfdeada3fdb415ea451fb3fb76b96a2e7977752c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 11:21:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 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 ded1587..928a051 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
@@ -1,16 +1,17 @@
package com.ruoyi.generator.util;
-import java.util.Arrays;
-import org.apache.commons.lang3.RegExUtils;
+import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.constant.GenConstants;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.generator.config.GenConfig;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
+import org.apache.commons.lang3.RegExUtils;
+
+import java.util.Arrays;
/**
* 浠ｇ爜鐢熸垚鍣� 宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class GenUtils
@@ -39,7 +40,7 @@
column.setTableId(table.getTableId());
column.setCreateBy(table.getCreateBy());
// 璁剧疆java瀛楁鍚�
- column.setJavaField(StringUtils.toCamelCase(columnName));
+ column.setJavaField(StrUtil.toCamelCase(columnName));
// 璁剧疆榛樿绫诲瀷
column.setJavaType(GenConstants.TYPE_STRING);
@@ -60,7 +61,7 @@
column.setHtmlType(GenConstants.HTML_INPUT);
// 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal
- String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
+ String[] str = StrUtil.splitToArray(StrUtil.subBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
{
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
@@ -97,28 +98,33 @@
}
// 鏌ヨ瀛楁绫诲瀷
- if (StringUtils.endsWithIgnoreCase(columnName, "name"))
+ if (StrUtil.endWithIgnoreCase(columnName, "name"))
{
column.setQueryType(GenConstants.QUERY_LIKE);
}
// 鐘舵�佸瓧娈佃缃崟閫夋
- if (StringUtils.endsWithIgnoreCase(columnName, "status"))
+ if (StrUtil.endWithIgnoreCase(columnName, "status"))
{
column.setHtmlType(GenConstants.HTML_RADIO);
}
// 绫诲瀷&鎬у埆瀛楁璁剧疆涓嬫媺妗�
- else if (StringUtils.endsWithIgnoreCase(columnName, "type")
- || StringUtils.endsWithIgnoreCase(columnName, "sex"))
+ else if (StrUtil.endWithIgnoreCase(columnName, "type")
+ || StrUtil.endWithIgnoreCase(columnName, "sex"))
{
column.setHtmlType(GenConstants.HTML_SELECT);
}
- // 鏂囦欢瀛楁璁剧疆涓婁紶鎺т欢
- else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
+ // 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
+ else if (StrUtil.endWithIgnoreCase(columnName, "image"))
{
- column.setHtmlType(GenConstants.HTML_UPLOAD_IMAGE);
+ column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+ }
+ // 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
+ else if (StrUtil.endWithIgnoreCase(columnName, "file"))
+ {
+ column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
}
// 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
- else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
+ else if (StrUtil.endWithIgnoreCase(columnName, "content"))
{
column.setHtmlType(GenConstants.HTML_EDITOR);
}
@@ -126,7 +132,7 @@
/**
* 鏍￠獙鏁扮粍鏄惁鍖呭惈鎸囧畾鍊�
- *
+ *
* @param arr 鏁扮粍
* @param targetValue 鍊�
* @return 鏄惁鍖呭惈
@@ -138,7 +144,7 @@
/**
* 鑾峰彇妯″潡鍚�
- *
+ *
* @param packageName 鍖呭悕
* @return 妯″潡鍚�
*/
@@ -146,13 +152,13 @@
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
+ String moduleName = StrUtil.sub(packageName, lastIndex + 1, nameLength);
return moduleName;
}
/**
* 鑾峰彇涓氬姟鍚�
- *
+ *
* @param tableName 琛ㄥ悕
* @return 涓氬姟鍚�
*/
@@ -160,13 +166,13 @@
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
- String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
+ String businessName = StrUtil.sub(tableName, lastIndex + 1, nameLength);
return businessName;
}
/**
* 琛ㄥ悕杞崲鎴怞ava绫诲悕
- *
+ *
* @param tableName 琛ㄥ悕绉�
* @return 绫诲悕
*/
@@ -174,17 +180,17 @@
{
boolean autoRemovePre = GenConfig.getAutoRemovePre();
String tablePrefix = GenConfig.getTablePrefix();
- if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
+ if (autoRemovePre && StrUtil.isNotEmpty(tablePrefix))
{
- String[] searchList = StringUtils.split(tablePrefix, ",");
+ String[] searchList = StrUtil.splitToArray(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
- return StringUtils.convertToCamelCase(tableName);
+ return StrUtil.upperFirst(StrUtil.toCamelCase(tableName));
}
/**
* 鎵归噺鏇挎崲鍓嶇紑
- *
+ *
* @param replacementm 鏇挎崲鍊�
* @param searchList 鏇挎崲鍒楄〃
* @return
@@ -205,7 +211,7 @@
/**
* 鍏抽敭瀛楁浛鎹�
- *
+ *
* @param text 闇�瑕佽鏇挎崲鐨勫悕瀛�
* @return 鏇挎崲鍚庣殑鍚嶅瓧
*/
@@ -216,15 +222,15 @@
/**
* 鑾峰彇鏁版嵁搴撶被鍨嬪瓧娈�
- *
+ *
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
public static String getDbType(String columnType)
{
- if (StringUtils.indexOf(columnType, "(") > 0)
+ if (StrUtil.indexOf(columnType, '(') > 0)
{
- return StringUtils.substringBefore(columnType, "(");
+ return StrUtil.subBefore(columnType, "(",false);
}
else
{
@@ -234,15 +240,15 @@
/**
* 鑾峰彇瀛楁闀垮害
- *
+ *
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
public static Integer getColumnLength(String columnType)
{
- if (StringUtils.indexOf(columnType, "(") > 0)
+ if (StrUtil.indexOf(columnType, '(') > 0)
{
- String length = StringUtils.substringBetween(columnType, "(", ")");
+ String length = StrUtil.subBetween(columnType, "(", ")");
return Integer.valueOf(length);
}
else
--
Gitblit v1.9.3