From 2cfd0045a109b01ac890f0f2e968cbb44415d0ac Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 19 九月 2025 11:45:43 +0800
Subject: [PATCH] yys 博达商贸-巡检管理
---
src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
index 29a840d..b5065aa 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
@@ -40,13 +40,15 @@
column.setCreateBy(table.getCreateBy());
// 璁剧疆java瀛楁鍚�
column.setJavaField(StringUtils.toCamelCase(columnName));
+ // 璁剧疆榛樿绫诲瀷
+ column.setJavaType(GenConstants.TYPE_STRING);
+ column.setQueryType(GenConstants.QUERY_EQ);
- 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))
@@ -111,6 +113,21 @@
{
column.setHtmlType(GenConstants.HTML_SELECT);
}
+ // 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
+ else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
+ {
+ column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+ }
+ // 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
+ else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+ {
+ column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
+ }
+ // 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
+ else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
+ {
+ column.setHtmlType(GenConstants.HTML_EDITOR);
+ }
}
/**
@@ -135,8 +152,7 @@
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtils.substring(packageName, lastIndex + 1, nameLength);
}
/**
@@ -149,8 +165,7 @@
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
- String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
- return businessName;
+ return StringUtils.substring(tableName, lastIndex + 1, nameLength);
}
/**
@@ -195,7 +210,7 @@
/**
* 鍏抽敭瀛楁浛鎹�
*
- * @param name 闇�瑕佽鏇挎崲鐨勫悕瀛�
+ * @param text 闇�瑕佽鏇挎崲鐨勫悕瀛�
* @return 鏇挎崲鍚庣殑鍚嶅瓧
*/
public static String replaceText(String text)
@@ -239,4 +254,4 @@
return 0;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3