diff --git a/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/controller/AssetStructureController.java b/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/controller/AssetStructureController.java index 7778374..97eb754 100644 --- a/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/controller/AssetStructureController.java +++ b/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/controller/AssetStructureController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.etl.domain.ColumnInfo; import com.ruoyi.etl.domain.DataSource; +import com.ruoyi.etl.domain.TableInfo; import com.ruoyi.etl.domain.req.ColumnInfoReq; import com.ruoyi.etl.domain.req.DataSourceQueryReq; import com.ruoyi.etl.domain.resp.AssetStructureResp; @@ -60,10 +61,20 @@ public class AssetStructureController{ } /** - * 通过数据库名查询资产结构数据 + * 通过数据库名查询资产数据 */ @ApiOperation("通过数据库名查询表信息") @RequiresPermissions("etl:structure:query") + @GetMapping("/getAssetData/{databaseName}") + public Result> getAssetData(@PathVariable String databaseName) { + return Result.success(assetStructureService.getAssetData(databaseName)); + } + + /** + * 通过数据库名查询资产结构数据 + */ + @ApiOperation("通过数据库名查询表结构信息") + @RequiresPermissions("etl:structure:query") @GetMapping("/getAssetStructureData/{databaseName}") public Result> getAssetStructureData(@PathVariable String databaseName) { return Result.success(assetStructureService.getAssetStructureData(databaseName)); diff --git a/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/service/impl/AssetStructureServiceImpl.java b/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/service/impl/AssetStructureServiceImpl.java index 6e72751..3d788c3 100644 --- a/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/service/impl/AssetStructureServiceImpl.java +++ b/ruoyi-modules/ruoyi-etl/ruoyi-etl-server/src/main/java/com/ruoyi/etl/service/impl/AssetStructureServiceImpl.java @@ -82,4 +82,11 @@ public class AssetStructureServiceImpl implements AssetStructureService { .eq(ColumnInfo::getTableId, tableInfoId))); } + @Override + public List getAssetData(String databaseName) { + //TODO 优化查询逻辑 + return tableInfoService.list(new LambdaQueryWrapper() + .eq(TableInfo::getDatabaseName, databaseName)); + } + }