From 77ef2f201cebbeaeb10747e03484ecbc84e8e8c3 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 29 十二月 2020 10:29:54 +0800
Subject: [PATCH] 代码生成数据库文本类型生成表单文本域
---
src/main/java/com/ruoyi/common/constant/GenConstants.java | 6 ++++--
src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java | 7 ++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 65c2d7c..dbab267 100644
--- a/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -29,8 +29,10 @@
public static final String PARENT_MENU_NAME = "parentMenuName";
/** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */
- public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
- "mediumtext", "longtext" };
+ public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+
+ /** 鏁版嵁搴撴枃鏈被鍨� */
+ public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
/** 鏁版嵁搴撴椂闂寸被鍨� */
public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
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 3012e64..fee9aa5 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,14 @@
column.setCreateBy(table.getCreateBy());
// 璁剧疆java瀛楁鍚�
column.setJavaField(StringUtils.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))
--
Gitblit v1.9.3