From c7071752a793f8fa49d71edb4ef06c21ab28f5ca Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 18:26:30 +0800
Subject: [PATCH] update 优化代码生成 导入表 列表返回 主键默认选中
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 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 718feaa..0a3eacb 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,6 +1,6 @@
package com.ruoyi.generator.util;
-import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.generator.config.GenConfig;
import com.ruoyi.generator.domain.GenTable;
@@ -11,7 +11,7 @@
/**
* 浠ｇ爜鐢熸垚鍣� 宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class GenUtils
@@ -33,61 +33,60 @@
/**
* 鍒濆鍖栧垪灞炴�у瓧娈�
*/
- 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());
column.setCreateBy(table.getCreateBy());
// 璁剧疆java瀛楁鍚�
- column.setJavaField(StrUtil.toCamelCase(columnName));
+ column.setJavaField(StringUtils.toCamelCase(columnName));
// 璁剧疆榛樿绫诲瀷
column.setJavaType(GenConstants.TYPE_STRING);
- 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 = StrUtil.split(StrUtil.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_ADD, columnName) && !column.isPk()) {
+ column.setIsInsert(GenConstants.REQUIRE);
+ }
// 缂栬緫瀛楁
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
+ // 缂栬緫闇�瑕佷富閿�
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName))
{
column.setIsEdit(GenConstants.REQUIRE);
}
+ // 缂栬緫闇�瑕佺殑璁剧疆蹇呴��
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName))
+ {
+ column.setIsRequired(GenConstants.REQUIRE);
+ }
// 鍒楄〃瀛楁
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
+ if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName))
{
column.setIsList(GenConstants.REQUIRE);
}
@@ -98,33 +97,33 @@
}
// 鏌ヨ瀛楁绫诲瀷
- if (StrUtil.endWithIgnoreCase(columnName, "name"))
+ if (StringUtils.endsWithIgnoreCase(columnName, "name"))
{
column.setQueryType(GenConstants.QUERY_LIKE);
}
// 鐘舵�佸瓧娈佃缃崟閫夋
- if (StrUtil.endWithIgnoreCase(columnName, "status"))
+ if (StringUtils.endsWithIgnoreCase(columnName, "status"))
{
column.setHtmlType(GenConstants.HTML_RADIO);
}
// 绫诲瀷&鎬у埆瀛楁璁剧疆涓嬫媺妗�
- else if (StrUtil.endWithIgnoreCase(columnName, "type")
- || StrUtil.endWithIgnoreCase(columnName, "sex"))
+ else if (StringUtils.endsWithIgnoreCase(columnName, "type")
+ || StringUtils.endsWithIgnoreCase(columnName, "sex"))
{
column.setHtmlType(GenConstants.HTML_SELECT);
}
// 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
- else if (StrUtil.endWithIgnoreCase(columnName, "image"))
+ else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
{
column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
}
// 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
- else if (StrUtil.endWithIgnoreCase(columnName, "file"))
+ else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
{
column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
}
// 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
- else if (StrUtil.endWithIgnoreCase(columnName, "content"))
+ else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
{
column.setHtmlType(GenConstants.HTML_EDITOR);
}
@@ -132,7 +131,7 @@
/**
* 鏍￠獙鏁扮粍鏄惁鍖呭惈鎸囧畾鍊�
- *
+ *
* @param arr 鏁扮粍
* @param targetValue 鍊�
* @return 鏄惁鍖呭惈
@@ -144,7 +143,7 @@
/**
* 鑾峰彇妯″潡鍚�
- *
+ *
* @param packageName 鍖呭悕
* @return 妯″潡鍚�
*/
@@ -152,27 +151,28 @@
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StrUtil.sub(packageName, lastIndex + 1, nameLength);
+ String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
return moduleName;
}
/**
* 鑾峰彇涓氬姟鍚�
- *
+ *
* @param tableName 琛ㄥ悕
* @return 涓氬姟鍚�
*/
public static String getBusinessName(String tableName)
{
- int lastIndex = tableName.lastIndexOf("_");
+ int firstIndex = tableName.indexOf("_");
int nameLength = tableName.length();
- String businessName = StrUtil.sub(tableName, lastIndex + 1, nameLength);
+ String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength);
+ businessName = StringUtils.toCamelCase(businessName);
return businessName;
}
/**
* 琛ㄥ悕杞崲鎴怞ava绫诲悕
- *
+ *
* @param tableName 琛ㄥ悕绉�
* @return 绫诲悕
*/
@@ -180,17 +180,17 @@
{
boolean autoRemovePre = GenConfig.getAutoRemovePre();
String tablePrefix = GenConfig.getTablePrefix();
- if (autoRemovePre && StrUtil.isNotEmpty(tablePrefix))
+ if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
{
- String[] searchList = StrUtil.split(tablePrefix, ",");
+ String[] searchList = StringUtils.split(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
- return StrUtil.toCamelCase(tableName);
+ return StringUtils.convertToCamelCase(tableName);
}
/**
* 鎵归噺鏇挎崲鍓嶇紑
- *
+ *
* @param replacementm 鏇挎崲鍊�
* @param searchList 鏇挎崲鍒楄〃
* @return
@@ -211,7 +211,7 @@
/**
* 鍏抽敭瀛楁浛鎹�
- *
+ *
* @param text 闇�瑕佽鏇挎崲鐨勫悕瀛�
* @return 鏇挎崲鍚庣殑鍚嶅瓧
*/
@@ -222,15 +222,15 @@
/**
* 鑾峰彇鏁版嵁搴撶被鍨嬪瓧娈�
- *
+ *
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
public static String getDbType(String columnType)
{
- if (StrUtil.indexOf(columnType, '(') > 0)
+ if (StringUtils.indexOf(columnType, '(') > 0)
{
- return StrUtil.subBefore(columnType, "(",false);
+ return StringUtils.substringBefore(columnType, "(");
}
else
{
@@ -240,15 +240,15 @@
/**
* 鑾峰彇瀛楁闀垮害
- *
+ *
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
public static Integer getColumnLength(String columnType)
{
- if (StrUtil.indexOf(columnType, '(') > 0)
+ if (StringUtils.indexOf(columnType, '(') > 0)
{
- String length = StrUtil.subBetween(columnType, "(", ")");
+ String length = StringUtils.substringBetween(columnType, "(", ")");
return Integer.valueOf(length);
}
else
--
Gitblit v1.9.3