From afc4f9552fad069e045eaa4f5ecd7635c7d9ecdd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 12:34:14 +0800
Subject: [PATCH] update 更改首页过时的技术
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 151 ++++++++++++++++++++-----------------------------
1 files changed, 62 insertions(+), 89 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..b6c2248 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,10 +1,12 @@
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;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.commons.lang3.RegExUtils;
import java.util.Arrays;
@@ -14,13 +16,13 @@
*
* @author ruoyi
*/
-public class GenUtils
-{
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+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()));
@@ -33,8 +35,7 @@
/**
* 鍒濆鍖栧垪灞炴�у瓧娈�
*/
- public static void initColumnField(GenTableColumn column, GenTable table)
- {
+ public static void initColumnField(GenTableColumn column, GenTable table) {
String dataType = getDbType(column.getColumnType());
String columnName = column.getColumnName();
column.setTableId(table.getTableId());
@@ -43,89 +44,78 @@
column.setJavaField(StringUtils.toCamelCase(columnName));
// 璁剧疆榛樿绫诲瀷
column.setJavaType(GenConstants.TYPE_STRING);
+ column.setQueryType(GenConstants.QUERY_EQ);
- if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
- {
+ if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
// 瀛楃涓查暱搴﹁秴杩�500璁剧疆涓烘枃鏈煙
Integer columnLength = getColumnLength(column.getColumnType());
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))
- {
+ } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) {
column.setJavaType(GenConstants.TYPE_DATE);
column.setHtmlType(GenConstants.HTML_DATETIME);
- }
- else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
- {
+ } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
column.setHtmlType(GenConstants.HTML_INPUT);
// 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal
- String[] str = StringUtils.splitToArray(StringUtils.subBetween(column.getColumnType(), "(", ")"), ",");
- if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
- {
+ String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
+ if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
// 濡傛灉鏄暣褰�
- else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
- {
+ else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
column.setJavaType(GenConstants.TYPE_INTEGER);
}
// 闀挎暣褰�
- else
- {
+ else {
column.setJavaType(GenConstants.TYPE_LONG);
}
}
- // 鎻掑叆瀛楁锛堥粯璁ゆ墍鏈夊瓧娈甸兘闇�瑕佹彃鍏ワ級
- column.setIsInsert(GenConstants.REQUIRE);
-
- // 缂栬緫瀛楁
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
- {
+ // BO瀵硅薄 榛樿鎻掑叆鍕鹃��
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_ADD, columnName) && !column.isPk()) {
+ column.setIsInsert(GenConstants.REQUIRE);
+ }
+ // BO瀵硅薄 榛樿缂栬緫鍕鹃��
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
column.setIsEdit(GenConstants.REQUIRE);
}
- // 鍒楄〃瀛楁
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
- {
+ // BO瀵硅薄 榛樿鏄惁蹇呭～鍕鹃��
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
+ column.setIsRequired(GenConstants.REQUIRE);
+ }
+ // VO瀵硅薄 榛樿杩斿洖鍕鹃��
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) {
column.setIsList(GenConstants.REQUIRE);
}
- // 鏌ヨ瀛楁
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
- {
+ // BO瀵硅薄 榛樿鏌ヨ鍕鹃��
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
column.setIsQuery(GenConstants.REQUIRE);
}
// 鏌ヨ瀛楁绫诲瀷
- 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);
}
}
@@ -133,12 +123,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);
}
@@ -148,12 +137,10 @@
* @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.sub(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtils.substring(packageName, lastIndex + 1, nameLength);
}
/**
@@ -162,11 +149,11 @@
* @param tableName 琛ㄥ悕
* @return 涓氬姟鍚�
*/
- public static String getBusinessName(String tableName)
- {
- int lastIndex = tableName.lastIndexOf("_");
+ public static String getBusinessName(String tableName) {
+ 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;
}
@@ -176,32 +163,27 @@
* @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))
- {
- String[] searchList = StringUtils.splitToArray(tablePrefix, ",");
+ if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
+ String[] searchList = StringUtils.split(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
- return StringUtils.upperFirst(StringUtils.toCamelCase(tableName));
+ return StringUtils.convertToCamelCase(tableName);
}
/**
* 鎵归噺鏇挎崲鍓嶇紑
*
* @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;
}
@@ -215,8 +197,7 @@
* @param text 闇�瑕佽鏇挎崲鐨勫悕瀛�
* @return 鏇挎崲鍚庣殑鍚嶅瓧
*/
- public static String replaceText(String text)
- {
+ public static String replaceText(String text) {
return RegExUtils.replaceAll(text, "(?:琛▅鑻ヤ緷)", "");
}
@@ -226,14 +207,10 @@
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
- public static String getDbType(String columnType)
- {
- if (StringUtils.indexOf(columnType, '(') > 0)
- {
- return StringUtils.subBefore(columnType, "(",false);
- }
- else
- {
+ public static String getDbType(String columnType) {
+ if (StringUtils.indexOf(columnType, '(') > 0) {
+ return StringUtils.substringBefore(columnType, "(");
+ } else {
return columnType;
}
}
@@ -244,15 +221,11 @@
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
- public static Integer getColumnLength(String columnType)
- {
- if (StringUtils.indexOf(columnType, '(') > 0)
- {
- String length = StringUtils.subBetween(columnType, "(", ")");
+ 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