【fix】对方法和局部变量重新命名
This commit is contained in:
mzc5649
+26
-26
@@ -23,8 +23,8 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
|
||||
public static String a = "A";
|
||||
public static String b = "B";
|
||||
private MainTableVo mainTableVo;
|
||||
private List<ColumnVo> h;
|
||||
private List<ColumnVo> i;
|
||||
private List<ColumnVo> mainColumns;
|
||||
private List<ColumnVo> originalMainColumns;
|
||||
private List<SubTableVo> j;
|
||||
private static DbReadTableUtil k = new DbReadTableUtil();
|
||||
|
||||
@@ -35,8 +35,8 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
|
||||
|
||||
public CodeGenerateOneToMany(MainTableVo mainTableVo, List<ColumnVo> mainColums, List<ColumnVo> originalMainColumns, List<SubTableVo> subTables) {
|
||||
this.mainTableVo = mainTableVo;
|
||||
this.h = mainColums;
|
||||
this.i = originalMainColumns;
|
||||
this.mainColumns = mainColums;
|
||||
this.originalMainColumns = originalMainColumns;
|
||||
this.j = subTables;
|
||||
}
|
||||
|
||||
@@ -63,41 +63,41 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
|
||||
var1.put("tableVo", this.mainTableVo);
|
||||
|
||||
try {
|
||||
if (this.h == null || this.h.size() == 0) {
|
||||
this.h = DbReadTableUtil.listColumns(this.mainTableVo.getTableName());
|
||||
if (this.mainColumns == null || this.mainColumns.size() == 0) {
|
||||
this.mainColumns = DbReadTableUtil.listColumns(this.mainTableVo.getTableName());
|
||||
}
|
||||
|
||||
if (this.i == null || this.i.size() == 0) {
|
||||
this.i = DbReadTableUtil.listOriginalColumns(this.mainTableVo.getTableName());
|
||||
if (this.originalMainColumns == null || this.originalMainColumns.size() == 0) {
|
||||
this.originalMainColumns = DbReadTableUtil.listOriginalColumns(this.mainTableVo.getTableName());
|
||||
}
|
||||
|
||||
var1.put("columns", this.h);
|
||||
var1.put("originalColumns", this.i);
|
||||
Iterator var2 = this.i.iterator();
|
||||
var1.put("columns", this.mainColumns);
|
||||
var1.put("originalColumns", this.originalMainColumns);
|
||||
Iterator iterator = this.originalMainColumns.iterator();
|
||||
|
||||
while(var2.hasNext()) {
|
||||
ColumnVo var3 = (ColumnVo)var2.next();
|
||||
while(iterator.hasNext()) {
|
||||
ColumnVo var3 = (ColumnVo)iterator.next();
|
||||
if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) {
|
||||
var1.put("primaryKeyPolicy", var3.getFieldType());
|
||||
}
|
||||
}
|
||||
|
||||
var2 = this.j.iterator();
|
||||
iterator = this.j.iterator();
|
||||
|
||||
while(var2.hasNext()) {
|
||||
SubTableVo var12 = (SubTableVo)var2.next();
|
||||
List var4;
|
||||
if (var12.getColums() == null || var12.getColums().size() == 0) {
|
||||
var4 = DbReadTableUtil.listColumns(var12.getTableName());
|
||||
var12.setColums(var4);
|
||||
while(iterator.hasNext()) {
|
||||
SubTableVo subTableVo = (SubTableVo)iterator.next();
|
||||
List originalColumns;
|
||||
if (subTableVo.getColums() == null || subTableVo.getColums().size() == 0) {
|
||||
originalColumns = DbReadTableUtil.listColumns(subTableVo.getTableName());
|
||||
subTableVo.setColums(originalColumns);
|
||||
}
|
||||
|
||||
if (var12.getOriginalColumns() == null || var12.getOriginalColumns().size() == 0) {
|
||||
var4 = DbReadTableUtil.listOriginalColumns(var12.getTableName());
|
||||
var12.setOriginalColumns(var4);
|
||||
if (subTableVo.getOriginalColumns() == null || subTableVo.getOriginalColumns().size() == 0) {
|
||||
originalColumns = DbReadTableUtil.listOriginalColumns(subTableVo.getTableName());
|
||||
subTableVo.setOriginalColumns(originalColumns);
|
||||
}
|
||||
|
||||
String[] var13 = var12.getForeignKeys();
|
||||
String[] var13 = subTableVo.getForeignKeys();
|
||||
ArrayList var5 = new ArrayList();
|
||||
String[] var6 = var13;
|
||||
int var7 = var13.length;
|
||||
@@ -107,8 +107,8 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
|
||||
var5.add(DbReadTableUtil.d(var9));
|
||||
}
|
||||
|
||||
var12.setForeignKeys((String[])var5.toArray(new String[0]));
|
||||
var12.setOriginalForeignKeys(var13);
|
||||
subTableVo.setForeignKeys((String[])var5.toArray(new String[0]));
|
||||
subTableVo.setOriginalForeignKeys(var13);
|
||||
}
|
||||
|
||||
var1.put("subTables", this.j);
|
||||
|
||||
+74
-74
@@ -498,126 +498,126 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
|
||||
var2.setIsDesForm("N");
|
||||
var2.setScroll(1);
|
||||
var2.setThemeTemplate("normal");
|
||||
String var3 = UUIDGenerator.generate();
|
||||
var2.setId(var3);
|
||||
String cgformHeadId = UUIDGenerator.generate();
|
||||
var2.setId(cgformHeadId);
|
||||
ArrayList var4 = new ArrayList();
|
||||
|
||||
try {
|
||||
List var5 = DbReadTableUtil.listOriginalColumns(tbname);
|
||||
List originalColumnsList = DbReadTableUtil.listOriginalColumns(tbname);
|
||||
|
||||
for(int var6 = 0; var6 < var5.size(); ++var6) {
|
||||
ColumnVo var7 = (ColumnVo)var5.get(var6);
|
||||
log.info(" columnt : " + var7.toString());
|
||||
String var8 = var7.getFieldDbName();
|
||||
OnlCgformField var9 = new OnlCgformField();
|
||||
var9.setCgformHeadId(var3);
|
||||
var9.setDbFieldNameOld(var7.getFieldDbName().toLowerCase());
|
||||
var9.setDbFieldName(var7.getFieldDbName().toLowerCase());
|
||||
if (oConvertUtils.isNotEmpty(var7.getFiledComment())) {
|
||||
var9.setDbFieldTxt(var7.getFiledComment());
|
||||
for(int i = 0; i < originalColumnsList.size(); ++i) {
|
||||
ColumnVo columnVo = (ColumnVo)originalColumnsList.get(i);
|
||||
log.info(" columnt : " + columnVo.toString());
|
||||
String fieldDbName = columnVo.getFieldDbName();
|
||||
OnlCgformField onlCgformField = new OnlCgformField();
|
||||
onlCgformField.setCgformHeadId(cgformHeadId);
|
||||
onlCgformField.setDbFieldNameOld(columnVo.getFieldDbName().toLowerCase());
|
||||
onlCgformField.setDbFieldName(columnVo.getFieldDbName().toLowerCase());
|
||||
if (oConvertUtils.isNotEmpty(columnVo.getFiledComment())) {
|
||||
onlCgformField.setDbFieldTxt(columnVo.getFiledComment());
|
||||
} else {
|
||||
var9.setDbFieldTxt(var7.getFieldName());
|
||||
onlCgformField.setDbFieldTxt(columnVo.getFieldName());
|
||||
}
|
||||
|
||||
var9.setDbIsKey(0);
|
||||
var9.setIsShowForm(1);
|
||||
var9.setIsQuery(0);
|
||||
var9.setFieldMustInput("0");
|
||||
var9.setIsShowList(1);
|
||||
var9.setOrderNum(var6 + 1);
|
||||
var9.setQueryMode("single");
|
||||
var9.setDbLength(oConvertUtils.getInt(var7.getPrecision()));
|
||||
var9.setFieldLength(120);
|
||||
var9.setDbPointLength(oConvertUtils.getInt(var7.getScale()));
|
||||
var9.setFieldShowType("text");
|
||||
var9.setDbIsNull("Y".equals(var7.getNullable()) ? 1 : 0);
|
||||
var9.setIsReadOnly(0);
|
||||
if ("id".equalsIgnoreCase(var8)) {
|
||||
onlCgformField.setDbIsKey(0);
|
||||
onlCgformField.setIsShowForm(1);
|
||||
onlCgformField.setIsQuery(0);
|
||||
onlCgformField.setFieldMustInput("0");
|
||||
onlCgformField.setIsShowList(1);
|
||||
onlCgformField.setOrderNum(i + 1);
|
||||
onlCgformField.setQueryMode("single");
|
||||
onlCgformField.setDbLength(oConvertUtils.getInt(columnVo.getPrecision()));
|
||||
onlCgformField.setFieldLength(120);
|
||||
onlCgformField.setDbPointLength(oConvertUtils.getInt(columnVo.getScale()));
|
||||
onlCgformField.setFieldShowType("text");
|
||||
onlCgformField.setDbIsNull("Y".equals(columnVo.getNullable()) ? 1 : 0);
|
||||
onlCgformField.setIsReadOnly(0);
|
||||
if ("id".equalsIgnoreCase(fieldDbName)) {
|
||||
String[] var10 = new String[]{"java.lang.Integer", "java.lang.Long"};
|
||||
String var11 = var7.getFieldType();
|
||||
String var11 = columnVo.getFieldType();
|
||||
if (Arrays.asList(var10).contains(var11)) {
|
||||
var2.setIdType("NATIVE");
|
||||
} else {
|
||||
var2.setIdType("UUID");
|
||||
}
|
||||
|
||||
var9.setDbIsKey(1);
|
||||
var9.setIsShowForm(0);
|
||||
var9.setIsShowList(0);
|
||||
var9.setIsReadOnly(1);
|
||||
onlCgformField.setDbIsKey(1);
|
||||
onlCgformField.setIsShowForm(0);
|
||||
onlCgformField.setIsShowList(0);
|
||||
onlCgformField.setIsReadOnly(1);
|
||||
}
|
||||
|
||||
if ("create_by".equalsIgnoreCase(var8) || "create_time".equalsIgnoreCase(var8) || "update_by".equalsIgnoreCase(var8) || "update_time".equalsIgnoreCase(var8) || "sys_org_code".equalsIgnoreCase(var8)) {
|
||||
var9.setIsShowForm(0);
|
||||
var9.setIsShowList(0);
|
||||
if ("create_by".equalsIgnoreCase(fieldDbName) || "create_time".equalsIgnoreCase(fieldDbName) || "update_by".equalsIgnoreCase(fieldDbName) || "update_time".equalsIgnoreCase(fieldDbName) || "sys_org_code".equalsIgnoreCase(fieldDbName)) {
|
||||
onlCgformField.setIsShowForm(0);
|
||||
onlCgformField.setIsShowList(0);
|
||||
}
|
||||
|
||||
if ("java.lang.Integer".equalsIgnoreCase(var7.getFieldType())) {
|
||||
var9.setDbType("int");
|
||||
} else if ("java.lang.Long".equalsIgnoreCase(var7.getFieldType())) {
|
||||
var9.setDbType("int");
|
||||
} else if ("java.util.Date".equalsIgnoreCase(var7.getFieldType())) {
|
||||
var9.setDbType("Date");
|
||||
var9.setFieldShowType("date");
|
||||
} else if (!"java.lang.Double".equalsIgnoreCase(var7.getFieldType()) && !"java.lang.Float".equalsIgnoreCase(var7.getFieldType())) {
|
||||
if (!"java.math.BigDecimal".equalsIgnoreCase(var7.getFieldType()) && !"BigDecimal".equalsIgnoreCase(var7.getFieldType())) {
|
||||
if (!"byte[]".equalsIgnoreCase(var7.getFieldType()) && !var7.getFieldType().contains("blob")) {
|
||||
if (!"java.lang.Object".equals(var7.getFieldType()) || !"text".equalsIgnoreCase(var7.getFieldDbType()) && !"ntext".equalsIgnoreCase(var7.getFieldDbType())) {
|
||||
if ("java.lang.Object".equals(var7.getFieldType()) && "image".equalsIgnoreCase(var7.getFieldDbType())) {
|
||||
var9.setDbType("Blob");
|
||||
if ("java.lang.Integer".equalsIgnoreCase(columnVo.getFieldType())) {
|
||||
onlCgformField.setDbType("int");
|
||||
} else if ("java.lang.Long".equalsIgnoreCase(columnVo.getFieldType())) {
|
||||
onlCgformField.setDbType("int");
|
||||
} else if ("java.util.Date".equalsIgnoreCase(columnVo.getFieldType())) {
|
||||
onlCgformField.setDbType("Date");
|
||||
onlCgformField.setFieldShowType("date");
|
||||
} else if (!"java.lang.Double".equalsIgnoreCase(columnVo.getFieldType()) && !"java.lang.Float".equalsIgnoreCase(columnVo.getFieldType())) {
|
||||
if (!"java.math.BigDecimal".equalsIgnoreCase(columnVo.getFieldType()) && !"BigDecimal".equalsIgnoreCase(columnVo.getFieldType())) {
|
||||
if (!"byte[]".equalsIgnoreCase(columnVo.getFieldType()) && !columnVo.getFieldType().contains("blob")) {
|
||||
if (!"java.lang.Object".equals(columnVo.getFieldType()) || !"text".equalsIgnoreCase(columnVo.getFieldDbType()) && !"ntext".equalsIgnoreCase(columnVo.getFieldDbType())) {
|
||||
if ("java.lang.Object".equals(columnVo.getFieldType()) && "image".equalsIgnoreCase(columnVo.getFieldDbType())) {
|
||||
onlCgformField.setDbType("Blob");
|
||||
} else {
|
||||
var9.setDbType("string");
|
||||
onlCgformField.setDbType("string");
|
||||
}
|
||||
} else {
|
||||
var9.setDbType("Text");
|
||||
var9.setFieldShowType("textarea");
|
||||
onlCgformField.setDbType("Text");
|
||||
onlCgformField.setFieldShowType("textarea");
|
||||
}
|
||||
} else {
|
||||
var9.setDbType("Blob");
|
||||
var7.setCharmaxLength((String)null);
|
||||
onlCgformField.setDbType("Blob");
|
||||
columnVo.setCharmaxLength((String)null);
|
||||
}
|
||||
} else {
|
||||
var9.setDbType("BigDecimal");
|
||||
onlCgformField.setDbType("BigDecimal");
|
||||
}
|
||||
} else {
|
||||
var9.setDbType("double");
|
||||
onlCgformField.setDbType("double");
|
||||
}
|
||||
|
||||
if (oConvertUtils.isEmpty(var7.getPrecision()) && oConvertUtils.isNotEmpty(var7.getCharmaxLength())) {
|
||||
if (Long.valueOf(var7.getCharmaxLength()) >= 3000L) {
|
||||
var9.setDbType("Text");
|
||||
var9.setFieldShowType("textarea");
|
||||
if (oConvertUtils.isEmpty(columnVo.getPrecision()) && oConvertUtils.isNotEmpty(columnVo.getCharmaxLength())) {
|
||||
if (Long.valueOf(columnVo.getCharmaxLength()) >= 3000L) {
|
||||
onlCgformField.setDbType("Text");
|
||||
onlCgformField.setFieldShowType("textarea");
|
||||
|
||||
try {
|
||||
var9.setDbLength(Integer.valueOf(var7.getCharmaxLength()));
|
||||
onlCgformField.setDbLength(Integer.valueOf(columnVo.getCharmaxLength()));
|
||||
} catch (Exception var12) {
|
||||
log.error(var12.getMessage(), var12);
|
||||
}
|
||||
} else {
|
||||
var9.setDbLength(Integer.valueOf(var7.getCharmaxLength()));
|
||||
onlCgformField.setDbLength(Integer.valueOf(columnVo.getCharmaxLength()));
|
||||
}
|
||||
} else {
|
||||
if (oConvertUtils.isNotEmpty(var7.getPrecision())) {
|
||||
var9.setDbLength(Integer.valueOf(var7.getPrecision()));
|
||||
} else if (var9.getDbType().equals("int")) {
|
||||
var9.setDbLength(10);
|
||||
if (oConvertUtils.isNotEmpty(columnVo.getPrecision())) {
|
||||
onlCgformField.setDbLength(Integer.valueOf(columnVo.getPrecision()));
|
||||
} else if (onlCgformField.getDbType().equals("int")) {
|
||||
onlCgformField.setDbLength(10);
|
||||
}
|
||||
|
||||
if (oConvertUtils.isNotEmpty(var7.getScale())) {
|
||||
var9.setDbPointLength(Integer.valueOf(var7.getScale()));
|
||||
if (oConvertUtils.isNotEmpty(columnVo.getScale())) {
|
||||
onlCgformField.setDbPointLength(Integer.valueOf(columnVo.getScale()));
|
||||
}
|
||||
}
|
||||
|
||||
if (oConvertUtils.getInt(var7.getPrecision()) == -1 && oConvertUtils.getInt(var7.getScale()) == 0) {
|
||||
var9.setDbType("Text");
|
||||
if (oConvertUtils.getInt(columnVo.getPrecision()) == -1 && oConvertUtils.getInt(columnVo.getScale()) == 0) {
|
||||
onlCgformField.setDbType("Text");
|
||||
}
|
||||
|
||||
if ("Blob".equals(var9.getDbType()) || "Text".equals(var9.getDbType()) || "Date".equals(var9.getDbType())) {
|
||||
var9.setDbLength(0);
|
||||
var9.setDbPointLength(0);
|
||||
if ("Blob".equals(onlCgformField.getDbType()) || "Text".equals(onlCgformField.getDbType()) || "Date".equals(onlCgformField.getDbType())) {
|
||||
onlCgformField.setDbLength(0);
|
||||
onlCgformField.setDbPointLength(0);
|
||||
}
|
||||
|
||||
var4.add(var9);
|
||||
var4.add(onlCgformField);
|
||||
}
|
||||
} catch (Exception var13) {
|
||||
log.error(var13.getMessage(), var13);
|
||||
|
||||
Reference in New Issue
Block a user