diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java index 4fc2da99..61dace9b 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java @@ -91,33 +91,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate } } - for (SubTableVo subTableVo : this.subTables) { - // 从表(局部变量) - List originalColumns; - if (subTableVo.getColums() == null || subTableVo.getColums().isEmpty()) { - originalColumns = DbReadTableUtil.listColumns(subTableVo.getTableName()); - subTableVo.setColums(originalColumns); - } - - if (subTableVo.getOriginalColumns() == null || subTableVo.getOriginalColumns().isEmpty()) { - originalColumns = DbReadTableUtil.listOriginalColumns(subTableVo.getTableName()); - subTableVo.setOriginalColumns(originalColumns); - } - // 从表外键 - String[] foreignKeys = subTableVo.getForeignKeys(); - // 存储外键的集合 - ArrayList list = new ArrayList<>(); - String[] foreignKeys1 = foreignKeys; - int length = foreignKeys.length; - - for (int i = 0; i < length; ++i) { - String foreignKey = foreignKeys1[i]; - list.add(DbReadTableUtil.convertForeignKeyToCamelCase(foreignKey)); - } - // put外键数组 - subTableVo.setForeignKeys(list.toArray(new String[0])); - subTableVo.setOriginalForeignKeys(foreignKeys); - } + setSubTableVo(); // put从表集合 hashMap.put("subTables", this.subTables); } catch (Exception e) { @@ -130,6 +104,36 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate return hashMap; } + private void setSubTableVo() throws Exception { + for (SubTableVo subTableVo : this.subTables) { + // 从表(局部变量) + List originalColumns; + if (subTableVo.getColums() == null || subTableVo.getColums().isEmpty()) { + originalColumns = DbReadTableUtil.listColumns(subTableVo.getTableName()); + subTableVo.setColums(originalColumns); + } + + if (subTableVo.getOriginalColumns() == null || subTableVo.getOriginalColumns().isEmpty()) { + originalColumns = DbReadTableUtil.listOriginalColumns(subTableVo.getTableName()); + subTableVo.setOriginalColumns(originalColumns); + } + // 从表外键 + String[] foreignKeys = subTableVo.getForeignKeys(); + // 存储外键的集合 + ArrayList list = new ArrayList<>(); + String[] foreignKeys1 = foreignKeys; + int length = foreignKeys.length; + + for (int i = 0; i < length; ++i) { + String foreignKey = foreignKeys1[i]; + list.add(DbReadTableUtil.convertForeignKeyToCamelCase(foreignKey)); + } + // put外键数组 + subTableVo.setForeignKeys(list.toArray(new String[0])); + subTableVo.setOriginalForeignKeys(foreignKeys); + } + } + @Override public List generateCodeFile(String stylePath) throws Exception { String projectPath = com.jero.codegenerate.properties.CodeConfigProperties.projectPath;