From 7546ef649ca48075febbccdc6860a51b4ff5fc33 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 25 十一月 2021 19:14:52 +0800
Subject: [PATCH] update springboot 2.5.6 => 2.5.7
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 92 ++++++++++++++++------------------------------
1 files changed, 32 insertions(+), 60 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 44f5439..c434ca8 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,7 +1,7 @@
package com.ruoyi.generator.util;
-import com.ruoyi.common.utils.StringUtils;
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;
@@ -14,13 +14,12 @@
*
* @author ruoyi
*/
-public class GenUtils
-{
+public class GenUtils {
+
/**
* 鍒濆鍖栬〃淇℃伅
*/
- public static void initTable(GenTable genTable, String operName)
- {
+ public static void initTable(GenTable genTable, String operName) {
genTable.setClassName(convertClassName(genTable.getTableName()));
genTable.setPackageName(GenConfig.getPackageName());
genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
@@ -74,55 +73,45 @@
column.setIsInsert(GenConstants.REQUIRE);
}
// BO瀵硅薄 榛樿缂栬緫鍕鹃��
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName))
- {
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
column.setIsEdit(GenConstants.REQUIRE);
}
// BO瀵硅薄 榛樿鏄惁蹇呭～鍕鹃��
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName))
- {
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
column.setIsRequired(GenConstants.REQUIRE);
}
// VO瀵硅薄 榛樿杩斿洖鍕鹃��
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName))
- {
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) {
column.setIsList(GenConstants.REQUIRE);
}
// BO瀵硅薄 榛樿鏌ヨ鍕鹃��
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
- {
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
column.setIsQuery(GenConstants.REQUIRE);
}
// 鏌ヨ瀛楁绫诲瀷
- if (StringUtils.endsWithIgnoreCase(columnName, "name"))
- {
+ if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
column.setQueryType(GenConstants.QUERY_LIKE);
}
// 鐘舵�佸瓧娈佃缃崟閫夋
- if (StringUtils.endsWithIgnoreCase(columnName, "status"))
- {
+ if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
column.setHtmlType(GenConstants.HTML_RADIO);
}
// 绫诲瀷&鎬у埆瀛楁璁剧疆涓嬫媺妗�
else if (StringUtils.endsWithIgnoreCase(columnName, "type")
- || StringUtils.endsWithIgnoreCase(columnName, "sex"))
- {
+ || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
column.setHtmlType(GenConstants.HTML_SELECT);
}
// 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
- else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
- {
+ else if (StringUtils.endsWithIgnoreCase(columnName, "image")) {
column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
}
// 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
- else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
- {
+ else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
}
// 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
- else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
- {
+ else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
column.setHtmlType(GenConstants.HTML_EDITOR);
}
}
@@ -130,12 +119,11 @@
/**
* 鏍￠獙鏁扮粍鏄惁鍖呭惈鎸囧畾鍊�
*
- * @param arr 鏁扮粍
+ * @param arr 鏁扮粍
* @param targetValue 鍊�
* @return 鏄惁鍖呭惈
*/
- public static boolean arraysContains(String[] arr, String targetValue)
- {
+ public static boolean arraysContains(String[] arr, String targetValue) {
return Arrays.asList(arr).contains(targetValue);
}
@@ -145,8 +133,7 @@
* @param packageName 鍖呭悕
* @return 妯″潡鍚�
*/
- public static String getModuleName(String packageName)
- {
+ public static String getModuleName(String packageName) {
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
@@ -159,12 +146,11 @@
* @param tableName 琛ㄥ悕
* @return 涓氬姟鍚�
*/
- public static String getBusinessName(String tableName)
- {
+ public static String getBusinessName(String tableName) {
int firstIndex = tableName.indexOf("_");
int nameLength = tableName.length();
String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength);
- businessName = StringUtils.toCamelCase(businessName);
+ businessName = StringUtils.toCamelCase(businessName);
return businessName;
}
@@ -174,12 +160,10 @@
* @param tableName 琛ㄥ悕绉�
* @return 绫诲悕
*/
- public static String convertClassName(String tableName)
- {
+ public static String convertClassName(String tableName) {
boolean autoRemovePre = GenConfig.getAutoRemovePre();
String tablePrefix = GenConfig.getTablePrefix();
- if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
- {
+ if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
String[] searchList = StringUtils.split(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
@@ -190,16 +174,13 @@
* 鎵归噺鏇挎崲鍓嶇紑
*
* @param replacementm 鏇挎崲鍊�
- * @param searchList 鏇挎崲鍒楄〃
+ * @param searchList 鏇挎崲鍒楄〃
* @return
*/
- public static String replaceFirst(String replacementm, String[] searchList)
- {
+ public static String replaceFirst(String replacementm, String[] searchList) {
String text = replacementm;
- for (String searchString : searchList)
- {
- if (replacementm.startsWith(searchString))
- {
+ for (String searchString : searchList) {
+ if (replacementm.startsWith(searchString)) {
text = replacementm.replaceFirst(searchString, "");
break;
}
@@ -213,8 +194,7 @@
* @param text 闇�瑕佽鏇挎崲鐨勫悕瀛�
* @return 鏇挎崲鍚庣殑鍚嶅瓧
*/
- public static String replaceText(String text)
- {
+ public static String replaceText(String text) {
return RegExUtils.replaceAll(text, "(?:琛▅鑻ヤ緷)", "");
}
@@ -224,14 +204,10 @@
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
- public static String getDbType(String columnType)
- {
- if (StringUtils.indexOf(columnType, '(') > 0)
- {
+ public static String getDbType(String columnType) {
+ if (StringUtils.indexOf(columnType, '(') > 0) {
return StringUtils.substringBefore(columnType, "(");
- }
- else
- {
+ } else {
return columnType;
}
}
@@ -242,15 +218,11 @@
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
- public static Integer getColumnLength(String columnType)
- {
- if (StringUtils.indexOf(columnType, '(') > 0)
- {
+ public static Integer getColumnLength(String columnType) {
+ if (StringUtils.indexOf(columnType, '(') > 0) {
String length = StringUtils.substringBetween(columnType, "(", ")");
return Integer.valueOf(length);
- }
- else
- {
+ } else {
return 0;
}
}
--
Gitblit v1.9.3