From a098565c37e6c822076f277ba9674b9f307862a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 12 十一月 2024 10:48:28 +0800
Subject: [PATCH] fix 修复 误删代码
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java
index c9357c0..0981997 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java
@@ -38,7 +38,6 @@
String dataType = getDbType(column.getColumnType());
String columnName = column.getColumnName();
column.setTableId(table.getTableId());
- column.setCreateBy(table.getCreateBy());
// 璁剧疆java瀛楁鍚�
column.setJavaField(StringUtils.toCamelCase(columnName));
// 璁剧疆榛樿绫诲瀷
@@ -55,20 +54,9 @@
column.setHtmlType(GenConstants.HTML_DATETIME);
} else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
column.setHtmlType(GenConstants.HTML_INPUT);
-
- // 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal
- String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), StringUtils.SEPARATOR);
- 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) {
- column.setJavaType(GenConstants.TYPE_INTEGER);
- }
- // 闀挎暣褰�
- else {
- column.setJavaType(GenConstants.TYPE_LONG);
- }
+ // 鏁版嵁搴撶殑鏁板瓧瀛楁涓巎ava涓嶅尮閰� 涓斿緢澶氭暟鎹簱鐨勬暟瀛楀瓧娈靛緢妯＄硦 渚嬪oracle鍙湁number娌℃湁缁嗗垎
+ // 鎵�浠ラ粯璁ゆ暟瀛楃被鍨嬪叏涓篖ong鍙湪鐣岄潰涓婅嚜琛岀紪杈戞兂瑕佺殑绫诲瀷 鏈変粈涔堢壒娈婇渶姹備篃鍙互鍦ㄨ繖閲岀壒娈婂鐞�
+ column.setJavaType(GenConstants.TYPE_LONG);
}
// BO瀵硅薄 榛樿鎻掑叆鍕鹃��
@@ -78,10 +66,6 @@
// BO瀵硅薄 榛樿缂栬緫鍕鹃��
if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
column.setIsEdit(GenConstants.REQUIRE);
- }
- // BO瀵硅薄 榛樿鏄惁蹇呭～鍕鹃��
- if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
- column.setIsRequired(GenConstants.REQUIRE);
}
// VO瀵硅薄 榛樿杩斿洖鍕鹃��
if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) {
--
Gitblit v1.9.3