【fix】对方法和局部变量重新命名
This commit is contained in:
+16
-16
@@ -30,7 +30,7 @@ public class DbReadTableUtil {
|
|||||||
|
|
||||||
public static void main(String[] args) throws SQLException {
|
public static void main(String[] args) throws SQLException {
|
||||||
try {
|
try {
|
||||||
List list = a("demo");
|
List list = listColumnVo("demo");
|
||||||
Iterator iterator = list.iterator();
|
Iterator iterator = list.iterator();
|
||||||
|
|
||||||
while(iterator.hasNext()) {
|
while(iterator.hasNext()) {
|
||||||
@@ -103,7 +103,7 @@ public class DbReadTableUtil {
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ColumnVo> a(String tableName) throws Exception {
|
public static List<ColumnVo> listColumnVo(String tableName) throws Exception {
|
||||||
String sqlStr = null;
|
String sqlStr = null;
|
||||||
ArrayList list = new ArrayList();
|
ArrayList list = new ArrayList();
|
||||||
|
|
||||||
@@ -151,7 +151,7 @@ public class DbReadTableUtil {
|
|||||||
columnVo.setPrecision(resultSet.getString(4));
|
columnVo.setPrecision(resultSet.getString(4));
|
||||||
columnVo.setScale(resultSet.getString(5));
|
columnVo.setScale(resultSet.getString(5));
|
||||||
columnVo.setCharmaxLength(resultSet.getString(6));
|
columnVo.setCharmaxLength(resultSet.getString(6));
|
||||||
columnVo.setNullable(TableConvert.a(resultSet.getString(7)));
|
columnVo.setNullable(TableConvert.getNullable(resultSet.getString(7)));
|
||||||
setupColumnVo(columnVo);
|
setupColumnVo(columnVo);
|
||||||
columnVo.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo.getFieldName() : resultSet.getString(3));
|
columnVo.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo.getFieldName() : resultSet.getString(3));
|
||||||
log.debug("columnt.getFieldName() -------------" + columnVo.getFieldName());
|
log.debug("columnt.getFieldName() -------------" + columnVo.getFieldName());
|
||||||
@@ -181,7 +181,7 @@ public class DbReadTableUtil {
|
|||||||
columnVo1.setPrecision(resultSet.getString(4));
|
columnVo1.setPrecision(resultSet.getString(4));
|
||||||
columnVo1.setScale(resultSet.getString(5));
|
columnVo1.setScale(resultSet.getString(5));
|
||||||
columnVo1.setCharmaxLength(resultSet.getString(6));
|
columnVo1.setCharmaxLength(resultSet.getString(6));
|
||||||
columnVo1.setNullable(TableConvert.a(resultSet.getString(7)));
|
columnVo1.setNullable(TableConvert.getNullable(resultSet.getString(7)));
|
||||||
setupColumnVo(columnVo1);
|
setupColumnVo(columnVo1);
|
||||||
columnVo1.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo1.getFieldName() : resultSet.getString(3));
|
columnVo1.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo1.getFieldName() : resultSet.getString(3));
|
||||||
list.add(columnVo1);
|
list.add(columnVo1);
|
||||||
@@ -189,10 +189,10 @@ public class DbReadTableUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.debug("读取表成功");
|
log.debug("读取表成功");
|
||||||
} catch (ClassNotFoundException var18) {
|
} catch (ClassNotFoundException e) {
|
||||||
throw var18;
|
throw e;
|
||||||
} catch (SQLException var19) {
|
} catch (SQLException e) {
|
||||||
throw var19;
|
throw e;
|
||||||
} finally {
|
} finally {
|
||||||
try {
|
try {
|
||||||
if (statement != null) {
|
if (statement != null) {
|
||||||
@@ -206,20 +206,20 @@ public class DbReadTableUtil {
|
|||||||
connection = null;
|
connection = null;
|
||||||
System.gc();
|
System.gc();
|
||||||
}
|
}
|
||||||
} catch (SQLException var17) {
|
} catch (SQLException e) {
|
||||||
throw var17;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ArrayList var21 = new ArrayList();
|
ArrayList result = new ArrayList();
|
||||||
|
|
||||||
for(row = list.size() - 1; row >= 0; --row) {
|
for(row = list.size() - 1; row >= 0; --row) {
|
||||||
ColumnVo var6 = (ColumnVo)list.get(row);
|
ColumnVo columnVo = (ColumnVo)list.get(row);
|
||||||
var21.add(var6);
|
result.add(columnVo);
|
||||||
}
|
}
|
||||||
|
|
||||||
return var21;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ColumnVo> b(String var0) throws Exception {
|
public static List<ColumnVo> b(String var0) throws Exception {
|
||||||
@@ -268,7 +268,7 @@ public class DbReadTableUtil {
|
|||||||
var7.setPrecision(TableConvert.b(var1.getString(4)));
|
var7.setPrecision(TableConvert.b(var1.getString(4)));
|
||||||
var7.setScale(TableConvert.b(var1.getString(5)));
|
var7.setScale(TableConvert.b(var1.getString(5)));
|
||||||
var7.setCharmaxLength(TableConvert.b(var1.getString(6)));
|
var7.setCharmaxLength(TableConvert.b(var1.getString(6)));
|
||||||
var7.setNullable(TableConvert.a(var1.getString(7)));
|
var7.setNullable(TableConvert.getNullable(var1.getString(7)));
|
||||||
var7.setFieldType(a(var1.getString(2).toLowerCase(), var7.getPrecision(), var7.getScale()));
|
var7.setFieldType(a(var1.getString(2).toLowerCase(), var7.getPrecision(), var7.getScale()));
|
||||||
var7.setFieldDbType(e(var1.getString(2).toLowerCase()));
|
var7.setFieldDbType(e(var1.getString(2).toLowerCase()));
|
||||||
setupColumnVo(var7);
|
setupColumnVo(var7);
|
||||||
@@ -293,7 +293,7 @@ public class DbReadTableUtil {
|
|||||||
var8.setPrecision(TableConvert.b(var1.getString(4)));
|
var8.setPrecision(TableConvert.b(var1.getString(4)));
|
||||||
var8.setScale(TableConvert.b(var1.getString(5)));
|
var8.setScale(TableConvert.b(var1.getString(5)));
|
||||||
var8.setCharmaxLength(TableConvert.b(var1.getString(6)));
|
var8.setCharmaxLength(TableConvert.b(var1.getString(6)));
|
||||||
var8.setNullable(TableConvert.a(var1.getString(7)));
|
var8.setNullable(TableConvert.getNullable(var1.getString(7)));
|
||||||
var8.setFieldType(a(var1.getString(2).toLowerCase(), var8.getPrecision(), var8.getScale()));
|
var8.setFieldType(a(var1.getString(2).toLowerCase(), var8.getPrecision(), var8.getScale()));
|
||||||
var8.setFieldDbType(e(var1.getString(2).toLowerCase()));
|
var8.setFieldDbType(e(var1.getString(2).toLowerCase()));
|
||||||
setupColumnVo(var8);
|
setupColumnVo(var8);
|
||||||
|
|||||||
+1
-1
@@ -54,7 +54,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (this.e == null || this.e.size() == 0) {
|
if (this.e == null || this.e.size() == 0) {
|
||||||
this.e = DbReadTableUtil.a(this.b.getTableName());
|
this.e = DbReadTableUtil.listColumnVo(this.b.getTableName());
|
||||||
}
|
}
|
||||||
|
|
||||||
var1.put("columns", this.e);
|
var1.put("columns", this.e);
|
||||||
|
|||||||
+2
-2
@@ -64,7 +64,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (this.h == null || this.h.size() == 0) {
|
if (this.h == null || this.h.size() == 0) {
|
||||||
this.h = DbReadTableUtil.a(this.mainTableVo.getTableName());
|
this.h = DbReadTableUtil.listColumnVo(this.mainTableVo.getTableName());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.i == null || this.i.size() == 0) {
|
if (this.i == null || this.i.size() == 0) {
|
||||||
@@ -88,7 +88,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
|
|||||||
SubTableVo var12 = (SubTableVo)var2.next();
|
SubTableVo var12 = (SubTableVo)var2.next();
|
||||||
List var4;
|
List var4;
|
||||||
if (var12.getColums() == null || var12.getColums().size() == 0) {
|
if (var12.getColums() == null || var12.getColums().size() == 0) {
|
||||||
var4 = DbReadTableUtil.a(var12.getTableName());
|
var4 = DbReadTableUtil.listColumnVo(var12.getTableName());
|
||||||
var12.setColums(var4);
|
var12.setColums(var4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ public class TableConvert {
|
|||||||
public TableConvert() {
|
public TableConvert() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String a(String var0) {
|
public static String getNullable(String var0) {
|
||||||
if (!"YES".equals(var0) && !"yes".equals(var0) && !"y".equals(var0) && !"Y".equals(var0) && !"f".equals(var0)) {
|
if (!"YES".equals(var0) && !"yes".equals(var0) && !"y".equals(var0) && !"Y".equals(var0) && !"f".equals(var0)) {
|
||||||
return !"NO".equals(var0) && !"N".equals(var0) && !"no".equals(var0) && !"n".equals(var0) && !"t".equals(var0) ? null : "N";
|
return !"NO".equals(var0) && !"N".equals(var0) && !"no".equals(var0) && !"n".equals(var0) && !"t".equals(var0) ? null : "N";
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user