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

This commit is contained in:
mzc5649
2021-04-01 15:32:40 +08:00
parent f329447287
commit 040a16bcb7
@@ -140,14 +140,14 @@ public class DbReadTableUtil {
ColumnVo columnVo = new ColumnVo();
if (com.jero.codegenerate.properties.CodeConfigProperties.dbFiledConvert) {
columnVo.setFieldName(e(resultSet.getString(1).toLowerCase()));
columnVo.setFieldName(convertFieldNameToCamelCase(resultSet.getString(1).toLowerCase()));
} else {
columnVo.setFieldName(resultSet.getString(1).toLowerCase());
}
columnVo.setFieldDbName(resultSet.getString(1).toUpperCase());
columnVo.setFieldType(e(resultSet.getString(2).toLowerCase()));
columnVo.setFieldDbType(e(resultSet.getString(2).toLowerCase()));
columnVo.setFieldType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase()));
columnVo.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase()));
columnVo.setPrecision(resultSet.getString(4));
columnVo.setScale(resultSet.getString(5));
columnVo.setCharmaxLength(resultSet.getString(6));
@@ -167,7 +167,7 @@ public class DbReadTableUtil {
while(resultSet.previous()) {
ColumnVo columnVo1 = new ColumnVo();
if (com.jero.codegenerate.properties.CodeConfigProperties.dbFiledConvert) {
columnVo1.setFieldName(e(resultSet.getString(1).toLowerCase()));
columnVo1.setFieldName(convertFieldNameToCamelCase(resultSet.getString(1).toLowerCase()));
} else {
columnVo1.setFieldName(resultSet.getString(1).toLowerCase());
}
@@ -175,8 +175,8 @@ public class DbReadTableUtil {
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()));
columnVo1.setFieldType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase()));
columnVo1.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase()));
log.debug("-----po.setFieldType------------" + columnVo1.getFieldType());
columnVo1.setPrecision(resultSet.getString(4));
columnVo1.setScale(resultSet.getString(5));
@@ -259,7 +259,7 @@ public class DbReadTableUtil {
ColumnVo columnVo = new ColumnVo();
if (com.jero.codegenerate.properties.CodeConfigProperties.dbFiledConvert) {
columnVo.setFieldName(e(resultSet.getString(1).toLowerCase()));
columnVo.setFieldName(convertFieldNameToCamelCase(resultSet.getString(1).toLowerCase()));
} else {
columnVo.setFieldName(resultSet.getString(1).toLowerCase());
}
@@ -270,7 +270,7 @@ public class DbReadTableUtil {
columnVo.setCharmaxLength(TableConvert.b(resultSet.getString(6)));
columnVo.setNullable(TableConvert.getNullable(resultSet.getString(7)));
columnVo.setFieldType(a(resultSet.getString(2).toLowerCase(), columnVo.getPrecision(), columnVo.getScale()));
columnVo.setFieldDbType(e(resultSet.getString(2).toLowerCase()));
columnVo.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase()));
setupColumnVo(columnVo);
columnVo.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo.getFieldName() : resultSet.getString(3));
log.debug("columnt.getFieldName() -------------" + columnVo.getFieldName());
@@ -284,7 +284,7 @@ public class DbReadTableUtil {
ColumnVo var8 = new ColumnVo();
if (com.jero.codegenerate.properties.CodeConfigProperties.dbFiledConvert) {
var8.setFieldName(e(resultSet.getString(1).toLowerCase()));
var8.setFieldName(convertFieldNameToCamelCase(resultSet.getString(1).toLowerCase()));
} else {
var8.setFieldName(resultSet.getString(1).toLowerCase());
}
@@ -295,7 +295,7 @@ public class DbReadTableUtil {
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(e(resultSet.getString(2).toLowerCase()));
var8.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase()));
setupColumnVo(var8);
var8.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? var8.getFieldName() : resultSet.getString(3));
list.add(var8);
@@ -369,22 +369,22 @@ public class DbReadTableUtil {
}
}
private static String e(String var0) {
String[] var1 = var0.split("_");
var0 = "";
int var2 = 0;
private static String convertFieldNameToCamelCase(String fieldName) {
String[] fieldNameArray = fieldName.split("_");
fieldName = "";
int i = 0;
for(int var3 = var1.length; var2 < var3; ++var2) {
if (var2 > 0) {
String var4 = var1[var2].toLowerCase();
var4 = var4.substring(0, 1).toUpperCase() + var4.substring(1, var4.length());
var0 = var0 + var4;
for(int length = fieldNameArray.length; i < length; ++i) {
if (i > 0) {
String fieldNameWord = fieldNameArray[i].toLowerCase();
fieldNameWord = fieldNameWord.substring(0, 1).toUpperCase() + fieldNameWord.substring(1, fieldNameWord.length());
fieldName = fieldName + fieldNameWord;
} else {
var0 = var0 + var1[var2].toLowerCase();
fieldName = fieldName + fieldNameArray[i].toLowerCase();
}
}
return var0;
return fieldName;
}
public static String d(String var0) {