diff --git a/src/main/java/org/woodwhales/generator/core/model/GenerateTableInfos.java b/src/main/java/org/woodwhales/generator/core/model/GenerateTableInfos.java index baf4749..603a1ba 100644 --- a/src/main/java/org/woodwhales/generator/core/model/GenerateTableInfos.java +++ b/src/main/java/org/woodwhales/generator/core/model/GenerateTableInfos.java @@ -69,10 +69,11 @@ public GenerateTableInfos(Boolean generateCode, this.generateMarkdown = generateMarkdown; } - public GenerateTableInfos markdownFile(String markdownFile) { + public GenerateTableInfos markdownFile(String markdownFile, List tables) { if(generateMarkdown && StringUtils.isNotBlank(markdownFile)) { // 设置 markdown 生成目录 this.markdownFile = new File(markdownFile); + this.tables = tables; } return this; } diff --git a/src/main/java/org/woodwhales/generator/core/service/impl/GenerateInfoFactoryImpl.java b/src/main/java/org/woodwhales/generator/core/service/impl/GenerateInfoFactoryImpl.java index 100cf18..205708d 100644 --- a/src/main/java/org/woodwhales/generator/core/service/impl/GenerateInfoFactoryImpl.java +++ b/src/main/java/org/woodwhales/generator/core/service/impl/GenerateInfoFactoryImpl.java @@ -45,6 +45,8 @@ public GenerateTableInfos buildGenerateTableInfos(DataBaseRequestBody requestBod Boolean generateCode = javaCodeConfig.getGenerateCode(); Boolean generateMarkdown = markdownConfig.getGenerateMarkdown(); GenerateTableInfos generateTableInfos = new GenerateTableInfos(generateCode, generateMarkdown, dataBaseInfo); + // 获取数据库表结构信息 + List tables = generateService.listTables(dataBaseInfo, true); // 生成代码 if(generateCode) { // 检查目标文件目录是否为合法文件夹 @@ -54,8 +56,6 @@ public GenerateTableInfos buildGenerateTableInfos(DataBaseRequestBody requestBod } File baseDir = checkBaseDirPath(generateDir); dataBaseInfo.getJavaCodeConfig().setInterfaceList(DataTool.toList(javaCodeConfig.getInterfaceList(), Function.identity(), true)); - // 获取数据库表结构信息 - List tables = generateService.listTables(dataBaseInfo, true); generateTableInfos.javaFile(baseDir.getAbsolutePath(), tables); } // 生成markdown @@ -73,7 +73,7 @@ public GenerateTableInfos buildGenerateTableInfos(DataBaseRequestBody requestBod throw new GenerateException("生成markdown的目录失败"); } } - generateTableInfos.markdownFile(markdownDir); + generateTableInfos.markdownFile(markdownDir, tables); } return generateTableInfos; } diff --git a/src/main/java/org/woodwhales/generator/core/service/impl/GenerateServiceImpl.java b/src/main/java/org/woodwhales/generator/core/service/impl/GenerateServiceImpl.java index 275176b..85fca75 100644 --- a/src/main/java/org/woodwhales/generator/core/service/impl/GenerateServiceImpl.java +++ b/src/main/java/org/woodwhales/generator/core/service/impl/GenerateServiceImpl.java @@ -89,7 +89,7 @@ public List listTables(DataBaseInfo dataBaseInfo, boolean isProcess) List cacheTableInfoList = dataBaseInfoCache.getTableInfoList(dataBaseInfoKey); - // 生成代码 + // 生成代码或者生成markdown if(isProcess) { final List dbNameList = dataBaseInfo.getDbTableConfig().getDbNameList(); final Boolean selectAll = dataBaseInfo.getDbTableConfig().getSelectAll();