From a51f7d52ed93f62f5f5eeb445163ab48a523dbe2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 六月 2021 09:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 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 43fc71d..283ba19 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,12 +1,13 @@
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;
/**
* 浠ｇ爜鐢熸垚鍣� 宸ュ叿绫�
@@ -39,14 +40,15 @@
column.setTableId(table.getTableId());
column.setCreateBy(table.getCreateBy());
// 璁剧疆java瀛楁鍚�
- column.setJavaField(StringUtils.toCamelCase(columnName));
+ column.setJavaField(StrUtil.toCamelCase(columnName));
+ // 璁剧疆榛樿绫诲瀷
+ column.setJavaType(GenConstants.TYPE_STRING);
- if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType))
+ if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
{
- column.setJavaType(GenConstants.TYPE_STRING);
// 瀛楃涓查暱搴﹁秴杩�500璁剧疆涓烘枃鏈煙
Integer columnLength = getColumnLength(column.getColumnType());
- String htmlType = columnLength >= 500 ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
+ String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
column.setHtmlType(htmlType);
}
else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))
@@ -59,7 +61,7 @@
column.setHtmlType(GenConstants.HTML_INPUT);
// 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal
- String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
+ String[] str = StrUtil.split(StrUtil.subBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
{
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
@@ -96,23 +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 (StrUtil.endWithIgnoreCase(columnName, "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);
}
@@ -140,7 +152,7 @@
{
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;
}
@@ -154,7 +166,7 @@
{
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;
}
@@ -168,12 +180,12 @@
{
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.split(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
- return StringUtils.convertToCamelCase(tableName);
+ return StrUtil.upperFirst(StrUtil.toCamelCase(tableName));
}
/**
@@ -216,9 +228,9 @@
*/
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,9 +246,9 @@
*/
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