JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix】对方法和局部变量重新命名

Browse Source
This commit is contained in:
mzc5649
2021-04-01 14:41:28 +08:00
parent 6bd577efb4
commit 3d2e6bdd35
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java
+2 -2
View File
@@ -160,7 +160,7 @@ public class DbReadTableUtil {
pageFilterFieldsStrings = com.jero.codegenerate.properties.CodeConfigProperties.pageFilterFields.toLowerCase().split(","); 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); list.add(columnVo);
} }
@@ -174,7 +174,7 @@ public class DbReadTableUtil {
var9.setFieldDbName(resultSet.getString(1).toUpperCase()); var9.setFieldDbName(resultSet.getString(1).toUpperCase());
log.debug("columnt.getFieldName() -------------" + var9.getFieldName()); 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.setFieldType(e(resultSet.getString(2).toLowerCase()));
var9.setFieldDbType(e(resultSet.getString(2).toLowerCase())); var9.setFieldDbType(e(resultSet.getString(2).toLowerCase()));
log.debug("-----po.setFieldType------------" + var9.getFieldType()); log.debug("-----po.setFieldType------------" + var9.getFieldType());
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java
+2 -2
View File
@@ -37,7 +37,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate {
var1.put("entityPackage", this.b.getEntityPackage()); var1.put("entityPackage", this.b.getEntityPackage());
var1.put("entityName", this.b.getEntityName()); var1.put("entityName", this.b.getEntityName());
var1.put("tableName", this.b.getTableName()); 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) { 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); 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()) { while(var2.hasNext()) {
ColumnVo var3 = (ColumnVo)var2.next(); 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()); var1.put("primaryKeyPolicy", var3.getFieldType());
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
+2 -2
View File
@@ -47,7 +47,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
var1.put("entityName", this.mainTableVo.getEntityName()); var1.put("entityName", this.mainTableVo.getEntityName());
var1.put("tableName", this.mainTableVo.getTableName()); var1.put("tableName", this.mainTableVo.getTableName());
var1.put("ftl_description", this.mainTableVo.getFtlDescription()); 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) { 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); 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()) { while(var2.hasNext()) {
ColumnVo var3 = (ColumnVo)var2.next(); 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()); var1.put("primaryKeyPolicy", var3.getFieldType());
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/properties/CodeConfigProperties.java
+3 -3
View File
@@ -27,7 +27,7 @@ public class CodeConfigProperties {
public static String i; public static String i;
public static String templateUrl; public static String templateUrl;
public static boolean k; public static boolean k;
public static String l; public static String dbTableId;
public static String m; public static String m;
public static String n; public static String n;
public static String pageFilterFields; public static String pageFilterFields;
@@ -101,7 +101,7 @@ public class CodeConfigProperties {
return u.getString("webroot_package"); return u.getString("webroot_package");
} }
public static final String i() { public static final String getDBTableId() {
return u.getString("db_table_id"); return u.getString("db_table_id");
} }
@@ -166,7 +166,7 @@ public class CodeConfigProperties {
packageName = o(); packageName = o();
templateUrl = getTemplateUrl(); templateUrl = getTemplateUrl();
f = m(); f = m();
l = i(); dbTableId = getDBTableId();
k = f(); k = f();
pageFilterFields = getPageFilterFields(); pageFilterFields = getPageFilterFields();
n = k(); n = k();