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 16:05:16 +08:00
parent 5602cf07a7
commit 92e000be61
2 changed files with 100 additions and 100 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/generate/impl/CodeGenerateOneToMany.java
+26 -26
View File
@@ -23,8 +23,8 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
public static String a = "A"; public static String a = "A";
public static String b = "B"; public static String b = "B";
private MainTableVo mainTableVo; private MainTableVo mainTableVo;
private List<ColumnVo> h; private List<ColumnVo> mainColumns;
private List<ColumnVo> i; private List<ColumnVo> originalMainColumns;
private List<SubTableVo> j; private List<SubTableVo> j;
private static DbReadTableUtil k = new DbReadTableUtil(); 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) { public CodeGenerateOneToMany(MainTableVo mainTableVo, List<ColumnVo> mainColums, List<ColumnVo> originalMainColumns, List<SubTableVo> subTables) {
this.mainTableVo = mainTableVo; this.mainTableVo = mainTableVo;
this.h = mainColums; this.mainColumns = mainColums;
this.i = originalMainColumns; this.originalMainColumns = originalMainColumns;
this.j = subTables; this.j = subTables;
} }
@@ -63,41 +63,41 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
var1.put("tableVo", this.mainTableVo); var1.put("tableVo", this.mainTableVo);
try { try {
if (this.h == null || this.h.size() == 0) { if (this.mainColumns == null || this.mainColumns.size() == 0) {
this.h = DbReadTableUtil.listColumns(this.mainTableVo.getTableName()); this.mainColumns = DbReadTableUtil.listColumns(this.mainTableVo.getTableName());
} }
if (this.i == null || this.i.size() == 0) { if (this.originalMainColumns == null || this.originalMainColumns.size() == 0) {
this.i = DbReadTableUtil.listOriginalColumns(this.mainTableVo.getTableName()); this.originalMainColumns = DbReadTableUtil.listOriginalColumns(this.mainTableVo.getTableName());
} }
var1.put("columns", this.h); var1.put("columns", this.mainColumns);
var1.put("originalColumns", this.i); var1.put("originalColumns", this.originalMainColumns);
Iterator var2 = this.i.iterator(); Iterator iterator = this.originalMainColumns.iterator();
while(var2.hasNext()) { while(iterator.hasNext()) {
ColumnVo var3 = (ColumnVo)var2.next(); ColumnVo var3 = (ColumnVo)iterator.next();
if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) { if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) {
var1.put("primaryKeyPolicy", var3.getFieldType()); var1.put("primaryKeyPolicy", var3.getFieldType());
} }
} }
var2 = this.j.iterator(); iterator = this.j.iterator();
while(var2.hasNext()) { while(iterator.hasNext()) {
SubTableVo var12 = (SubTableVo)var2.next(); SubTableVo subTableVo = (SubTableVo)iterator.next();
List var4; List originalColumns;
if (var12.getColums() == null || var12.getColums().size() == 0) { if (subTableVo.getColums() == null || subTableVo.getColums().size() == 0) {
var4 = DbReadTableUtil.listColumns(var12.getTableName()); originalColumns = DbReadTableUtil.listColumns(subTableVo.getTableName());
var12.setColums(var4); subTableVo.setColums(originalColumns);
} }
if (var12.getOriginalColumns() == null || var12.getOriginalColumns().size() == 0) { if (subTableVo.getOriginalColumns() == null || subTableVo.getOriginalColumns().size() == 0) {
var4 = DbReadTableUtil.listOriginalColumns(var12.getTableName()); originalColumns = DbReadTableUtil.listOriginalColumns(subTableVo.getTableName());
var12.setOriginalColumns(var4); subTableVo.setOriginalColumns(originalColumns);
} }
String[] var13 = var12.getForeignKeys(); String[] var13 = subTableVo.getForeignKeys();
ArrayList var5 = new ArrayList(); ArrayList var5 = new ArrayList();
String[] var6 = var13; String[] var6 = var13;
int var7 = var13.length; int var7 = var13.length;
@@ -107,8 +107,8 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
var5.add(DbReadTableUtil.d(var9)); var5.add(DbReadTableUtil.d(var9));
} }
var12.setForeignKeys((String[])var5.toArray(new String[0])); subTableVo.setForeignKeys((String[])var5.toArray(new String[0]));
var12.setOriginalForeignKeys(var13); subTableVo.setOriginalForeignKeys(var13);
} }
var1.put("subTables", this.j); var1.put("subTables", this.j);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java
+74 -74
View File
@@ -498,126 +498,126 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
var2.setIsDesForm("N"); var2.setIsDesForm("N");
var2.setScroll(1); var2.setScroll(1);
var2.setThemeTemplate("normal"); var2.setThemeTemplate("normal");
String var3 = UUIDGenerator.generate(); String cgformHeadId = UUIDGenerator.generate();
var2.setId(var3); var2.setId(cgformHeadId);
ArrayList var4 = new ArrayList(); ArrayList var4 = new ArrayList();
try { try {
List var5 = DbReadTableUtil.listOriginalColumns(tbname); List originalColumnsList = DbReadTableUtil.listOriginalColumns(tbname);
for(int var6 = 0; var6 < var5.size(); ++var6) { for(int i = 0; i < originalColumnsList.size(); ++i) {
ColumnVo var7 = (ColumnVo)var5.get(var6); ColumnVo columnVo = (ColumnVo)originalColumnsList.get(i);
log.info(" columnt : " + var7.toString()); log.info(" columnt : " + columnVo.toString());
String var8 = var7.getFieldDbName(); String fieldDbName = columnVo.getFieldDbName();
OnlCgformField var9 = new OnlCgformField(); OnlCgformField onlCgformField = new OnlCgformField();
var9.setCgformHeadId(var3); onlCgformField.setCgformHeadId(cgformHeadId);
var9.setDbFieldNameOld(var7.getFieldDbName().toLowerCase()); onlCgformField.setDbFieldNameOld(columnVo.getFieldDbName().toLowerCase());
var9.setDbFieldName(var7.getFieldDbName().toLowerCase()); onlCgformField.setDbFieldName(columnVo.getFieldDbName().toLowerCase());
if (oConvertUtils.isNotEmpty(var7.getFiledComment())) { if (oConvertUtils.isNotEmpty(columnVo.getFiledComment())) {
var9.setDbFieldTxt(var7.getFiledComment()); onlCgformField.setDbFieldTxt(columnVo.getFiledComment());
} else { } else {
var9.setDbFieldTxt(var7.getFieldName()); onlCgformField.setDbFieldTxt(columnVo.getFieldName());
} }
var9.setDbIsKey(0); onlCgformField.setDbIsKey(0);
var9.setIsShowForm(1); onlCgformField.setIsShowForm(1);
var9.setIsQuery(0); onlCgformField.setIsQuery(0);
var9.setFieldMustInput("0"); onlCgformField.setFieldMustInput("0");
var9.setIsShowList(1); onlCgformField.setIsShowList(1);
var9.setOrderNum(var6 + 1); onlCgformField.setOrderNum(i + 1);
var9.setQueryMode("single"); onlCgformField.setQueryMode("single");
var9.setDbLength(oConvertUtils.getInt(var7.getPrecision())); onlCgformField.setDbLength(oConvertUtils.getInt(columnVo.getPrecision()));
var9.setFieldLength(120); onlCgformField.setFieldLength(120);
var9.setDbPointLength(oConvertUtils.getInt(var7.getScale())); onlCgformField.setDbPointLength(oConvertUtils.getInt(columnVo.getScale()));
var9.setFieldShowType("text"); onlCgformField.setFieldShowType("text");
var9.setDbIsNull("Y".equals(var7.getNullable()) ? 1 : 0); onlCgformField.setDbIsNull("Y".equals(columnVo.getNullable()) ? 1 : 0);
var9.setIsReadOnly(0); onlCgformField.setIsReadOnly(0);
if ("id".equalsIgnoreCase(var8)) { if ("id".equalsIgnoreCase(fieldDbName)) {
String[] var10 = new String[]{"java.lang.Integer", "java.lang.Long"}; String[] var10 = new String[]{"java.lang.Integer", "java.lang.Long"};
String var11 = var7.getFieldType(); String var11 = columnVo.getFieldType();
if (Arrays.asList(var10).contains(var11)) { if (Arrays.asList(var10).contains(var11)) {
var2.setIdType("NATIVE"); var2.setIdType("NATIVE");
} else { } else {
var2.setIdType("UUID"); var2.setIdType("UUID");
} }
var9.setDbIsKey(1); onlCgformField.setDbIsKey(1);
var9.setIsShowForm(0); onlCgformField.setIsShowForm(0);
var9.setIsShowList(0); onlCgformField.setIsShowList(0);
var9.setIsReadOnly(1); 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)) { if ("create_by".equalsIgnoreCase(fieldDbName) || "create_time".equalsIgnoreCase(fieldDbName) || "update_by".equalsIgnoreCase(fieldDbName) || "update_time".equalsIgnoreCase(fieldDbName) || "sys_org_code".equalsIgnoreCase(fieldDbName)) {
var9.setIsShowForm(0); onlCgformField.setIsShowForm(0);
var9.setIsShowList(0); onlCgformField.setIsShowList(0);
} }
if ("java.lang.Integer".equalsIgnoreCase(var7.getFieldType())) { if ("java.lang.Integer".equalsIgnoreCase(columnVo.getFieldType())) {
var9.setDbType("int"); onlCgformField.setDbType("int");
} else if ("java.lang.Long".equalsIgnoreCase(var7.getFieldType())) { } else if ("java.lang.Long".equalsIgnoreCase(columnVo.getFieldType())) {
var9.setDbType("int"); onlCgformField.setDbType("int");
} else if ("java.util.Date".equalsIgnoreCase(var7.getFieldType())) { } else if ("java.util.Date".equalsIgnoreCase(columnVo.getFieldType())) {
var9.setDbType("Date"); onlCgformField.setDbType("Date");
var9.setFieldShowType("date"); onlCgformField.setFieldShowType("date");
} else if (!"java.lang.Double".equalsIgnoreCase(var7.getFieldType()) && !"java.lang.Float".equalsIgnoreCase(var7.getFieldType())) { } else if (!"java.lang.Double".equalsIgnoreCase(columnVo.getFieldType()) && !"java.lang.Float".equalsIgnoreCase(columnVo.getFieldType())) {
if (!"java.math.BigDecimal".equalsIgnoreCase(var7.getFieldType()) && !"BigDecimal".equalsIgnoreCase(var7.getFieldType())) { if (!"java.math.BigDecimal".equalsIgnoreCase(columnVo.getFieldType()) && !"BigDecimal".equalsIgnoreCase(columnVo.getFieldType())) {
if (!"byte[]".equalsIgnoreCase(var7.getFieldType()) && !var7.getFieldType().contains("blob")) { if (!"byte[]".equalsIgnoreCase(columnVo.getFieldType()) && !columnVo.getFieldType().contains("blob")) {
if (!"java.lang.Object".equals(var7.getFieldType()) || !"text".equalsIgnoreCase(var7.getFieldDbType()) && !"ntext".equalsIgnoreCase(var7.getFieldDbType())) { if (!"java.lang.Object".equals(columnVo.getFieldType()) || !"text".equalsIgnoreCase(columnVo.getFieldDbType()) && !"ntext".equalsIgnoreCase(columnVo.getFieldDbType())) {
if ("java.lang.Object".equals(var7.getFieldType()) && "image".equalsIgnoreCase(var7.getFieldDbType())) { if ("java.lang.Object".equals(columnVo.getFieldType()) && "image".equalsIgnoreCase(columnVo.getFieldDbType())) {
var9.setDbType("Blob"); onlCgformField.setDbType("Blob");
} else { } else {
var9.setDbType("string"); onlCgformField.setDbType("string");
} }
} else { } else {
var9.setDbType("Text"); onlCgformField.setDbType("Text");
var9.setFieldShowType("textarea"); onlCgformField.setFieldShowType("textarea");
} }
} else { } else {
var9.setDbType("Blob"); onlCgformField.setDbType("Blob");
var7.setCharmaxLength((String)null); columnVo.setCharmaxLength((String)null);
} }
} else { } else {
var9.setDbType("BigDecimal"); onlCgformField.setDbType("BigDecimal");
} }
} else { } else {
var9.setDbType("double"); onlCgformField.setDbType("double");
} }
if (oConvertUtils.isEmpty(var7.getPrecision()) && oConvertUtils.isNotEmpty(var7.getCharmaxLength())) { if (oConvertUtils.isEmpty(columnVo.getPrecision()) && oConvertUtils.isNotEmpty(columnVo.getCharmaxLength())) {
if (Long.valueOf(var7.getCharmaxLength()) >= 3000L) { if (Long.valueOf(columnVo.getCharmaxLength()) >= 3000L) {
var9.setDbType("Text"); onlCgformField.setDbType("Text");
var9.setFieldShowType("textarea"); onlCgformField.setFieldShowType("textarea");
try { try {
var9.setDbLength(Integer.valueOf(var7.getCharmaxLength())); onlCgformField.setDbLength(Integer.valueOf(columnVo.getCharmaxLength()));
} catch (Exception var12) { } catch (Exception var12) {
log.error(var12.getMessage(), var12); log.error(var12.getMessage(), var12);
} }
} else { } else {
var9.setDbLength(Integer.valueOf(var7.getCharmaxLength())); onlCgformField.setDbLength(Integer.valueOf(columnVo.getCharmaxLength()));
} }
} else { } else {
if (oConvertUtils.isNotEmpty(var7.getPrecision())) { if (oConvertUtils.isNotEmpty(columnVo.getPrecision())) {
var9.setDbLength(Integer.valueOf(var7.getPrecision())); onlCgformField.setDbLength(Integer.valueOf(columnVo.getPrecision()));
} else if (var9.getDbType().equals("int")) { } else if (onlCgformField.getDbType().equals("int")) {
var9.setDbLength(10); onlCgformField.setDbLength(10);
} }
if (oConvertUtils.isNotEmpty(var7.getScale())) { if (oConvertUtils.isNotEmpty(columnVo.getScale())) {
var9.setDbPointLength(Integer.valueOf(var7.getScale())); onlCgformField.setDbPointLength(Integer.valueOf(columnVo.getScale()));
} }
} }
if (oConvertUtils.getInt(var7.getPrecision()) == -1 && oConvertUtils.getInt(var7.getScale()) == 0) { if (oConvertUtils.getInt(columnVo.getPrecision()) == -1 && oConvertUtils.getInt(columnVo.getScale()) == 0) {
var9.setDbType("Text"); onlCgformField.setDbType("Text");
} }
if ("Blob".equals(var9.getDbType()) || "Text".equals(var9.getDbType()) || "Date".equals(var9.getDbType())) { if ("Blob".equals(onlCgformField.getDbType()) || "Text".equals(onlCgformField.getDbType()) || "Date".equals(onlCgformField.getDbType())) {
var9.setDbLength(0); onlCgformField.setDbLength(0);
var9.setDbPointLength(0); onlCgformField.setDbPointLength(0);
} }
var4.add(var9); var4.add(onlCgformField);
} }
} catch (Exception var13) { } catch (Exception var13) {
log.error(var13.getMessage(), var13); log.error(var13.getMessage(), var13);