From 4f78f9ec4c6f8d99e662954c29c4329de162f4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=BF=E5=98=89=E7=A5=BA?= <gengjiaqi9698@qq.com>
Date: Sat, 16 Apr 2022 15:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=88=97=E5=B1=9E=E6=80=A7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=97=B6=E5=88=A4=E6=96=AD=E5=85=B7=E4=BD=93=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=201.=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B=E5=B8=B8=E9=87=8F=202.=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=88=9D=E5=A7=8B=E5=8C=96=E5=88=97?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5=E4=B8=AD=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E7=9A=84=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/constant/GenConstants.java     | 4 ++--
 .../src/main/java/com/ruoyi/generator/util/GenUtils.java | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index e7382b3f1..8afad55ee 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -41,8 +41,8 @@ public class GenConstants
     public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
 
     /** 数据库数字类型 */
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bit", "bigint", "float", "double", "decimal" };
+    public static final String[] COLUMNTYPE_NUMBER = { "bigint", "tinyint", "smallint", "mediumint", "int", "integer", "bit",
+            "number", "numeric", "float", "double", "decimal" };
 
     /** 页面不需要编辑字段 */
     public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
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 e28c0bb0e..558b88bf7 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,8 @@
 package com.ruoyi.generator.util;
 
 import java.util.Arrays;
+
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
 import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.utils.StringUtils;
@@ -60,14 +62,13 @@ public class GenUtils
         {
             column.setHtmlType(GenConstants.HTML_INPUT);
 
+            int index = ArrayUtils.indexOf(GenConstants.COLUMNTYPE_NUMBER, dataType);
             // 如果是浮点型 统一用BigDecimal
-            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
-            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
-            {
+            if (index > 6) {
                 column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
             }
             // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
+            else if (index > 0)
             {
                 column.setJavaType(GenConstants.TYPE_INTEGER);
             }