diff --git a/vue-fastapi-backend/module_admin/controller/meta_controller.py b/vue-fastapi-backend/module_admin/controller/meta_controller.py index 45517aa..2869c21 100644 --- a/vue-fastapi-backend/module_admin/controller/meta_controller.py +++ b/vue-fastapi-backend/module_admin/controller/meta_controller.py @@ -21,6 +21,13 @@ async def get_meta_list(request: Request, meta_query: MetaPageObject = Depends(M return ResponseUtil.success(data=meta_query_result) +@metaController.get("/meta/mdlname/list/{ssysId}") +async def get_mdlname_list(request: Request, ssysId: int, + query_db: AsyncSession = Depends(get_db)): + result = await MetaService.get_mdlname_list(query_db, ssysId) + return ResponseUtil.success(data=result) + + @metaController.get("/meta/column/list") async def get_meta_list(request: Request, meta_query: MetaColObject = Depends(MetaColObject.as_query), query_db: AsyncSession = Depends(get_db)): diff --git a/vue-fastapi-backend/module_admin/dao/meta_dao.py b/vue-fastapi-backend/module_admin/dao/meta_dao.py index 3c12a84..b68cf73 100644 --- a/vue-fastapi-backend/module_admin/dao/meta_dao.py +++ b/vue-fastapi-backend/module_admin/dao/meta_dao.py @@ -553,6 +553,13 @@ class MetaDao: )).first() return CamelCaseUtil.transform_result(result) + @classmethod + async def get_mdlname_list(cls, db: AsyncSession, ssysId: int): + sql = text("select DISTINCT mdl_name from t_metadata_extract_info where ssys_id= :ssysId") + result = (await db.execute(sql, {"ssysId": ssysId})).scalars().all() + return result + + @classmethod async def get_meta_table_cn_name(cls, db: AsyncSession, ssys_id: int, mdlName: str, tabEngName: str): sql = text("select case when a.tab_cn_name is null then b.tab_crrct_name" diff --git a/vue-fastapi-backend/module_admin/service/meta_service.py b/vue-fastapi-backend/module_admin/service/meta_service.py index 76cf75f..d604d48 100644 --- a/vue-fastapi-backend/module_admin/service/meta_service.py +++ b/vue-fastapi-backend/module_admin/service/meta_service.py @@ -243,6 +243,10 @@ class MetaService: table['columnList'] = CamelCaseUtil.transform_result(columnList) return table + @classmethod + async def get_mdlname_list(cls, result_db: AsyncSession, ssysId: int): + return await MetaDao.get_mdlname_list(result_db, ssysId) + @classmethod async def getBusinessRelationShip(cls, result_db: AsyncSession, meta_query: MetaBusinessRelShipObject): currentNodeList = await cls.getRelationByTable(result_db, meta_query.ssys_id, meta_query.mdl_name, diff --git a/vue-fastapi-frontend/src/api/meta/metaInfo.js b/vue-fastapi-frontend/src/api/meta/metaInfo.js index 3457112..bcdc5e1 100644 --- a/vue-fastapi-frontend/src/api/meta/metaInfo.js +++ b/vue-fastapi-frontend/src/api/meta/metaInfo.js @@ -35,6 +35,14 @@ export function getMetaDataList(query) { }) } +// 查询参数列表 +export function listMdlNameBySysId(id) { + return request({ + url: '/default-api/dasset/meta/mdlname/list/'+id, + method: 'get' + }) +} + export function getColumnList(query){ return request({ url:'/default-api/dasset/meta/column/list', diff --git a/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue b/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue index 329117e..6ddf36a 100644 --- a/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue +++ b/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue @@ -37,13 +37,9 @@ /> - + + + - + {{''}} @@ -142,14 +138,18 @@ - + {{item.clasName}} + {{''}} - {{item.clasName + ":" + item.clasValue}} + + {{item.clasName + ":" + item.clasValue}} + {{''}} + @@ -906,7 +906,7 @@