From 3d2e6bdd35f694204817749cd2ff25a80d13859d Mon Sep 17 00:00:00 2001 From: mzc5649 <13027087095@163.com> Date: Thu, 1 Apr 2021 14:41:28 +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 --- .../com/jero/codegenerate/database/DbReadTableUtil.java | 4 ++-- .../jero/codegenerate/generate/impl/CodeGenerateOne.java | 4 ++-- .../codegenerate/generate/impl/CodeGenerateOneToMany.java | 4 ++-- .../jero/codegenerate/properties/CodeConfigProperties.java | 6 +++--- 4 files changed, 9 insertions(+), 9 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 3026cd5b..d44ddb53 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 @@ -160,7 +160,7 @@ public class DbReadTableUtil { pageFilterFieldsStrings = com.jero.codegenerate.properties.CodeConfigProperties.pageFilterFields.toLowerCase().split(","); } - if (!com.jero.codegenerate.properties.CodeConfigProperties.l.equals(columnVo.getFieldName()) && !CodeStringUtils.a(columnVo.getFieldDbName().toLowerCase(), pageFilterFieldsStrings)) { + if (!com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.equals(columnVo.getFieldName()) && !CodeStringUtils.a(columnVo.getFieldDbName().toLowerCase(), pageFilterFieldsStrings)) { list.add(columnVo); } @@ -174,7 +174,7 @@ public class DbReadTableUtil { var9.setFieldDbName(resultSet.getString(1).toUpperCase()); log.debug("columnt.getFieldName() -------------" + var9.getFieldName()); - if (!com.jero.codegenerate.properties.CodeConfigProperties.l.equals(var9.getFieldName()) && !CodeStringUtils.a(var9.getFieldDbName().toLowerCase(), pageFilterFieldsStrings)) { + 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()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java index c1d1e863..095a7044 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java @@ -37,7 +37,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { var1.put("entityPackage", this.b.getEntityPackage()); var1.put("entityName", this.b.getEntityName()); var1.put("tableName", this.b.getTableName()); - var1.put("primaryKeyField", com.jero.codegenerate.properties.CodeConfigProperties.l); + var1.put("primaryKeyField", com.jero.codegenerate.properties.CodeConfigProperties.dbTableId); if (this.b.getFieldRequiredNum() == null) { this.b.setFieldRequiredNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.m) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.m) : -1); } @@ -67,7 +67,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { while(var2.hasNext()) { ColumnVo var3 = (ColumnVo)var2.next(); - if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.l.toLowerCase())) { + if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) { var1.put("primaryKeyPolicy", var3.getFieldType()); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java index 3fb05cbe..cdc1ab79 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java @@ -47,7 +47,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate var1.put("entityName", this.mainTableVo.getEntityName()); var1.put("tableName", this.mainTableVo.getTableName()); var1.put("ftl_description", this.mainTableVo.getFtlDescription()); - var1.put("primaryKeyField", com.jero.codegenerate.properties.CodeConfigProperties.l); + var1.put("primaryKeyField", com.jero.codegenerate.properties.CodeConfigProperties.dbTableId); if (this.mainTableVo.getFieldRequiredNum() == null) { this.mainTableVo.setFieldRequiredNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.m) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.m) : -1); } @@ -77,7 +77,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate while(var2.hasNext()) { ColumnVo var3 = (ColumnVo)var2.next(); - if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.l.toLowerCase())) { + if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) { var1.put("primaryKeyPolicy", var3.getFieldType()); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/properties/CodeConfigProperties.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/properties/CodeConfigProperties.java index a1921e8d..d033bbe2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/properties/CodeConfigProperties.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/properties/CodeConfigProperties.java @@ -27,7 +27,7 @@ public class CodeConfigProperties { public static String i; public static String templateUrl; public static boolean k; - public static String l; + public static String dbTableId; public static String m; public static String n; public static String pageFilterFields; @@ -101,7 +101,7 @@ public class CodeConfigProperties { return u.getString("webroot_package"); } - public static final String i() { + public static final String getDBTableId() { return u.getString("db_table_id"); } @@ -166,7 +166,7 @@ public class CodeConfigProperties { packageName = o(); templateUrl = getTemplateUrl(); f = m(); - l = i(); + dbTableId = getDBTableId(); k = f(); pageFilterFields = getPageFilterFields(); n = k();