From c95a1afe445a0cecdd68c83dcc4127c852cd99de Mon Sep 17 00:00:00 2001 From: mzc5649 <13027087095@163.com> Date: Thu, 1 Apr 2021 15:38:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E5=AF=B9=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=92=8C=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/DbReadTableUtil.java | 52 +++++++++---------- .../generate/util/TableConvert.java | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java index 4fabe637..212fe008 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java @@ -265,9 +265,9 @@ public class DbReadTableUtil { } columnVo.setFieldDbName(resultSet.getString(1).toUpperCase()); - columnVo.setPrecision(TableConvert.b(resultSet.getString(4))); - columnVo.setScale(TableConvert.b(resultSet.getString(5))); - columnVo.setCharmaxLength(TableConvert.b(resultSet.getString(6))); + columnVo.setPrecision(TableConvert.isFieldValueBlank(resultSet.getString(4))); + columnVo.setScale(TableConvert.isFieldValueBlank(resultSet.getString(5))); + columnVo.setCharmaxLength(TableConvert.isFieldValueBlank(resultSet.getString(6))); columnVo.setNullable(TableConvert.getNullable(resultSet.getString(7))); columnVo.setFieldType(a(resultSet.getString(2).toLowerCase(), columnVo.getPrecision(), columnVo.getScale())); columnVo.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase())); @@ -282,28 +282,28 @@ public class DbReadTableUtil { break; } - ColumnVo var8 = new ColumnVo(); + ColumnVo columnVo1 = new ColumnVo(); if (com.jero.codegenerate.properties.CodeConfigProperties.dbFiledConvert) { - var8.setFieldName(convertFieldNameToCamelCase(resultSet.getString(1).toLowerCase())); + columnVo1.setFieldName(convertFieldNameToCamelCase(resultSet.getString(1).toLowerCase())); } else { - var8.setFieldName(resultSet.getString(1).toLowerCase()); + columnVo1.setFieldName(resultSet.getString(1).toLowerCase()); } - var8.setFieldDbName(resultSet.getString(1).toUpperCase()); - var8.setPrecision(TableConvert.b(resultSet.getString(4))); - var8.setScale(TableConvert.b(resultSet.getString(5))); - var8.setCharmaxLength(TableConvert.b(resultSet.getString(6))); - var8.setNullable(TableConvert.getNullable(resultSet.getString(7))); - var8.setFieldType(a(resultSet.getString(2).toLowerCase(), var8.getPrecision(), var8.getScale())); - var8.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase())); - setupColumnVo(var8); - var8.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? var8.getFieldName() : resultSet.getString(3)); - list.add(var8); + columnVo1.setFieldDbName(resultSet.getString(1).toUpperCase()); + columnVo1.setPrecision(TableConvert.isFieldValueBlank(resultSet.getString(4))); + columnVo1.setScale(TableConvert.isFieldValueBlank(resultSet.getString(5))); + columnVo1.setCharmaxLength(TableConvert.isFieldValueBlank(resultSet.getString(6))); + columnVo1.setNullable(TableConvert.getNullable(resultSet.getString(7))); + columnVo1.setFieldType(a(resultSet.getString(2).toLowerCase(), columnVo1.getPrecision(), columnVo1.getScale())); + columnVo1.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase())); + setupColumnVo(columnVo1); + columnVo1.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo1.getFieldName() : resultSet.getString(3)); + list.add(columnVo1); } - } catch (ClassNotFoundException var17) { - throw var17; - } catch (SQLException var18) { - throw var18; + } catch (ClassNotFoundException e) { + throw e; + } catch (SQLException e) { + throw e; } finally { try { if (statement != null) { @@ -317,20 +317,20 @@ public class DbReadTableUtil { connection = null; System.gc(); } - } catch (SQLException var16) { - throw var16; + } catch (SQLException e) { + throw e; } } - ArrayList var20 = new ArrayList(); + ArrayList result = new ArrayList(); for(row = list.size() - 1; row >= 0; --row) { - ColumnVo var6 = (ColumnVo)list.get(row); - var20.add(var6); + ColumnVo columnVo = (ColumnVo)list.get(row); + result.add(columnVo); } - return var20; + return result; } public static boolean c(String var0) { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java index e438391e..a9e0f128 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java @@ -14,7 +14,7 @@ public class TableConvert { } } - public static String b(String var0) { + public static String isFieldValueBlank(String var0) { return StringUtils.isBlank(var0) ? "" : var0; }