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 d44ddb53..666ab4a2 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 @@ -152,7 +152,7 @@ public class DbReadTableUtil { columnVo.setScale(resultSet.getString(5)); columnVo.setCharmaxLength(resultSet.getString(6)); columnVo.setNullable(TableConvert.a(resultSet.getString(7))); - a(columnVo); + setupColumnVo(columnVo); columnVo.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo.getFieldName() : resultSet.getString(3)); log.debug("columnt.getFieldName() -------------" + columnVo.getFieldName()); String[] pageFilterFieldsStrings = new String[0]; @@ -160,31 +160,31 @@ public class DbReadTableUtil { pageFilterFieldsStrings = com.jero.codegenerate.properties.CodeConfigProperties.pageFilterFields.toLowerCase().split(","); } - if (!com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.equals(columnVo.getFieldName()) && !CodeStringUtils.a(columnVo.getFieldDbName().toLowerCase(), pageFilterFieldsStrings)) { + if (!com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.equals(columnVo.getFieldName()) && !CodeStringUtils.isPageFilterFieldsContainDbName(columnVo.getFieldDbName().toLowerCase(), pageFilterFieldsStrings)) { list.add(columnVo); } while(resultSet.previous()) { - ColumnVo var9 = new ColumnVo(); + ColumnVo columnVo1 = new ColumnVo(); if (com.jero.codegenerate.properties.CodeConfigProperties.k) { - var9.setFieldName(e(resultSet.getString(1).toLowerCase())); + columnVo1.setFieldName(e(resultSet.getString(1).toLowerCase())); } else { - var9.setFieldName(resultSet.getString(1).toLowerCase()); + columnVo1.setFieldName(resultSet.getString(1).toLowerCase()); } - var9.setFieldDbName(resultSet.getString(1).toUpperCase()); - log.debug("columnt.getFieldName() -------------" + var9.getFieldName()); - if (!com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.equals(var9.getFieldName()) && !CodeStringUtils.a(var9.getFieldDbName().toLowerCase(), pageFilterFieldsStrings)) { - var9.setFieldType(e(resultSet.getString(2).toLowerCase())); - var9.setFieldDbType(e(resultSet.getString(2).toLowerCase())); - log.debug("-----po.setFieldType------------" + var9.getFieldType()); - var9.setPrecision(resultSet.getString(4)); - var9.setScale(resultSet.getString(5)); - var9.setCharmaxLength(resultSet.getString(6)); - var9.setNullable(TableConvert.a(resultSet.getString(7))); - a(var9); - var9.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? var9.getFieldName() : resultSet.getString(3)); - list.add(var9); + columnVo1.setFieldDbName(resultSet.getString(1).toUpperCase()); + log.debug("columnt.getFieldName() -------------" + columnVo1.getFieldName()); + if (!com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.equals(columnVo1.getFieldName()) && !CodeStringUtils.isPageFilterFieldsContainDbName(columnVo1.getFieldDbName().toLowerCase(), pageFilterFieldsStrings)) { + columnVo1.setFieldType(e(resultSet.getString(2).toLowerCase())); + columnVo1.setFieldDbType(e(resultSet.getString(2).toLowerCase())); + log.debug("-----po.setFieldType------------" + columnVo1.getFieldType()); + columnVo1.setPrecision(resultSet.getString(4)); + columnVo1.setScale(resultSet.getString(5)); + columnVo1.setCharmaxLength(resultSet.getString(6)); + columnVo1.setNullable(TableConvert.a(resultSet.getString(7))); + setupColumnVo(columnVo1); + columnVo1.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo1.getFieldName() : resultSet.getString(3)); + list.add(columnVo1); } } @@ -271,7 +271,7 @@ public class DbReadTableUtil { var7.setNullable(TableConvert.a(var1.getString(7))); var7.setFieldType(a(var1.getString(2).toLowerCase(), var7.getPrecision(), var7.getScale())); var7.setFieldDbType(e(var1.getString(2).toLowerCase())); - a(var7); + setupColumnVo(var7); var7.setFiledComment(StringUtils.isBlank(var1.getString(3)) ? var7.getFieldName() : var1.getString(3)); log.debug("columnt.getFieldName() -------------" + var7.getFieldName()); var3.add(var7); @@ -296,7 +296,7 @@ public class DbReadTableUtil { var8.setNullable(TableConvert.a(var1.getString(7))); var8.setFieldType(a(var1.getString(2).toLowerCase(), var8.getPrecision(), var8.getScale())); var8.setFieldDbType(e(var1.getString(2).toLowerCase())); - a(var8); + setupColumnVo(var8); var8.setFiledComment(StringUtils.isBlank(var1.getString(3)) ? var8.getFieldName() : var1.getString(3)); var3.add(var8); } @@ -406,32 +406,32 @@ public class DbReadTableUtil { return var0; } - private static void a(ColumnVo var0) { - String var1 = var0.getFieldType(); - String var2 = var0.getScale(); - var0.setClassType("inputxt"); - if ("N".equals(var0.getNullable())) { - var0.setOptionType("*"); + private static void setupColumnVo(ColumnVo columnVo) { + String fieldType = columnVo.getFieldType(); + String scale = columnVo.getScale(); + columnVo.setClassType("inputxt"); + if ("N".equals(columnVo.getNullable())) { + columnVo.setOptionType("*"); } - if (!"datetime".equals(var1) && !var1.contains("time")) { - if ("date".equals(var1)) { - var0.setClassType("easyui-datebox"); - } else if (var1.contains("int")) { - var0.setOptionType("n"); - } else if ("number".equals(var1)) { - if (StringUtils.isNotBlank(var2) && Integer.parseInt(var2) > 0) { - var0.setOptionType("d"); + if (!"datetime".equals(fieldType) && !fieldType.contains("time")) { + if ("date".equals(fieldType)) { + columnVo.setClassType("easyui-datebox"); + } else if (fieldType.contains("int")) { + columnVo.setOptionType("n"); + } else if ("number".equals(fieldType)) { + if (StringUtils.isNotBlank(scale) && Integer.parseInt(scale) > 0) { + columnVo.setOptionType("d"); } - } else if (!"float".equals(var1) && !"double".equals(var1) && !"decimal".equals(var1)) { - if ("numeric".equals(var1)) { - var0.setOptionType("d"); + } else if (!"float".equals(fieldType) && !"double".equals(fieldType) && !"decimal".equals(fieldType)) { + if ("numeric".equals(fieldType)) { + columnVo.setOptionType("d"); } } else { - var0.setOptionType("d"); + columnVo.setOptionType("d"); } } else { - var0.setClassType("easyui-datetimebox"); + columnVo.setClassType("easyui-datetimebox"); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java index 9c448c8f..a363ce13 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java @@ -37,11 +37,11 @@ public class CodeStringUtils { return var0 == null ? 0 : var0; } - public static boolean a(String var0, String[] var1) { - if (var1 != null && var1.length != 0) { - for(int var2 = 0; var2 < var1.length; ++var2) { - String var3 = var1[var2]; - if (var3.equals(var0)) { + public static boolean isPageFilterFieldsContainDbName(String dbName, String[] pageFilterFieldsStrings) { + if (pageFilterFieldsStrings != null && pageFilterFieldsStrings.length != 0) { + for(int i = 0; i < pageFilterFieldsStrings.length; ++i) { + String pageFilterFieldsString = pageFilterFieldsStrings[i]; + if (pageFilterFieldsString.equals(dbName)) { return true; } }