数据资产bug修复

vue-fastapi-backend/module_admin/controller/data_ast_content_controller.py

@@ -101,7 +101,7 @@ async def getMetaSercuityData(
     # 获取当前用户信息
     user_name = current_user.user.user_name
     password = current_user.user.password
-    logger.info(f"获取当前用户信息：user_id={user_name}, password={password}")
+    # logger.info(f"获取当前用户信息：user_id={user_name}, password={password}")
 
     # 设置字段
     apiModel = MetaSecurityApiModel()
@@ -112,17 +112,17 @@ async def getMetaSercuityData(
     apiModel.pageNum = 1
     apiModel.pageSize = 10
     apiModel.sqlStr = "select * from " + dataAstSecuRequest.data_ast_eng_name
-    # logger.info(f"设置 apiModel 参数：dbRId={apiModel.dbRId}, username={apiModel.username}, password={apiModel.password}, sqlStr={apiModel.sqlStr}")
+    #logger.info(f"设置 apiModel 参数：dbRId={apiModel.dbRId}, username={apiModel.username}, password={apiModel.password}, sqlStr={apiModel.sqlStr}")
 
     # 打印 apiModel 对象
     # logger.debug(f"apiModel 对象内容：{apiModel}")
 
     # 调用服务层方法
     config_detail_result = await MetaSecurityService.getMetaSercuitybysql(request, query_db, apiModel)
-    logger.info(f"调用 MetaSecurityService.getMetaSercuitybysql 方法，返回结果：{config_detail_result}")
+    # logger.info(f"调用 MetaSecurityService.getMetaSercuitybysql 方法，返回结果：{config_detail_result}")
 
-    # 记录成功日志
-    logger.info(f"获取 config_id 为 {apiModel} 的信息成功")
+    # # 记录成功日志
+    # logger.info(f"获取 config_id 为 {apiModel} 的信息成功")
 
     return ResponseUtil.success(data=config_detail_result)
 

vue-fastapi-backend/module_admin/dao/dataast_dao.py

@@ -124,142 +124,6 @@ class DataAstDao:
             # 出现异常时回滚事务
             await db.rollback()
             raise e
-    # async def add_dataast_data(cls, db: AsyncSession, model: DataAstInfoModel):
-    #     try:
-    #         # 动态SQL：更新目标表中已存在的记录
-    #         update_sql = text("""
-    #             UPDATE t_data_ast_info target
-    #             JOIN (
-    #                 SELECT 
-    #                     appr.data_ast_eng_name,
-    #                     appr.data_ast_cn_name,
-    #                     appr.data_ast_type,
-    #                     appr.data_ast_stat,
-    #                     appr.data_ast_desc,
-    #                     appr.data_ast_screen,
-    #                     appr.data_ast_scren_clas,
-    #                     appr.data_ast_cont,
-    #                     appr.data_ast_faq,
-    #                     appr.data_ast_estb_time,
-    #                     NOW() AS data_ast_upd_time,
-    #                     appr.data_ast_src,
-    #                     appr.ast_no,
-    #                     appr.data_ast_clas
-    #                 FROM t_data_ast_info_appr appr
-    #                 INNER JOIN (
-    #                     SELECT 
-    #                         ast_no,
-    #                         MAX(version_no) AS max_version
-    #                     FROM t_data_ast_info_appr
-    #                     WHERE approStatus = 'succeed'
-    #                     GROUP BY ast_no
-    #                 ) latest ON appr.ast_no = latest.ast_no AND appr.version_no = latest.max_version
-    #                 WHERE 
-    #                     appr.data_ast_stat = '1'
-    #                     AND appr.changeType = 'add'
-    #                     AND appr.approStatus = 'succeed'
-    #             ) source ON target.ast_no = source.ast_no
-    #             SET 
-    #                 target.data_ast_eng_name = source.data_ast_eng_name,
-    #                 target.data_ast_cn_name = source.data_ast_cn_name,
-    #                 target.data_ast_type = source.data_ast_type,
-    #                 target.data_ast_stat = source.data_ast_stat,
-    #                 target.data_ast_desc = source.data_ast_desc,
-    #                 target.data_ast_screen = source.data_ast_screen,
-    #                 target.data_ast_scren_clas = source.data_ast_scren_clas,
-    #                 target.data_ast_cont = source.data_ast_cont,
-    #                 target.data_ast_faq = source.data_ast_faq,
-    #                 target.data_ast_estb_time = source.data_ast_estb_time,
-    #                 target.data_ast_upd_time = source.data_ast_upd_time,
-    #                 target.data_ast_src = source.data_ast_src,
-    #                 target.data_ast_clas = source.data_ast_clas;
-    #         """)
-
-    #         # 动态SQL：插入目标表中不存在的新记录
-    #         insert_sql = text("""
-    #             INSERT INTO t_data_ast_info (
-    #                 data_ast_eng_name,
-    #                 data_ast_cn_name,
-    #                 data_ast_type,
-    #                 data_ast_stat,
-    #                 data_ast_desc,
-    #                 data_ast_screen,
-    #                 data_ast_scren_clas,
-    #                 data_ast_cont,
-    #                 data_ast_faq,
-    #                 data_ast_estb_time,
-    #                 data_ast_upd_time,
-    #                 data_ast_src,
-    #                 ast_no,
-    #                 data_ast_clas
-    #             )
-    #             SELECT 
-    #                 source.data_ast_eng_name,
-    #                 source.data_ast_cn_name,
-    #                 source.data_ast_type,
-    #                 source.data_ast_stat,
-    #                 source.data_ast_desc,
-    #                 source.data_ast_screen,
-    #                 source.data_ast_scren_clas,
-    #                 source.data_ast_cont,
-    #                 source.data_ast_faq,
-    #                 source.data_ast_estb_time,
-    #                 source.data_ast_upd_time,
-    #                 source.data_ast_src,
-    #                 source.ast_no,
-    #                 source.data_ast_clas
-    #             FROM (
-    #                 SELECT 
-    #                     appr.data_ast_eng_name,
-    #                     appr.data_ast_cn_name,
-    #                     appr.data_ast_type,
-    #                     appr.data_ast_stat,
-    #                     appr.data_ast_desc,
-    #                     appr.data_ast_screen,
-    #                     appr.data_ast_scren_clas,
-    #                     appr.data_ast_cont,
-    #                     appr.data_ast_faq,
-    #                     appr.data_ast_estb_time,
-    #                     NOW() AS data_ast_upd_time,
-    #                     appr.data_ast_src,
-    #                     appr.ast_no,
-    #                     appr.data_ast_clas
-    #                 FROM t_data_ast_info_appr appr
-    #                 INNER JOIN (
-    #                     SELECT 
-    #                         ast_no,
-    #                         MAX(version_no) AS max_version
-    #                     FROM t_data_ast_info_appr
-    #                     WHERE approStatus = 'succeed'
-    #                     GROUP BY ast_no
-    #                 ) latest ON appr.ast_no = latest.ast_no AND appr.version_no = latest.max_version
-    #                 WHERE 
-    #                     appr.data_ast_stat = '1'
-    #                     AND appr.changeType = 'add'
-    #                     AND appr.approStatus = 'succeed'
-    #             ) source
-    #             LEFT JOIN t_data_ast_info target ON source.ast_no = target.ast_no
-    #             WHERE target.ast_no IS NULL;
-    #         """)
-
-    #         # 执行更新SQL
-    #         await db.execute(update_sql)
-
-    #         # 执行插入SQL
-    #         await db.execute(insert_sql)
-
-    #         # 提交事务
-    #         await db.commit()
-            
-    #         return "元数据成功发布到数据资产！"
-        
-    #     except Exception as e:
-    #         # 回滚事务
-    #         await db.rollback()
-    #         raise e
-
-
-
 
     @classmethod
     async def update_data_ast_appr(cls, db: AsyncSession, update_data: DataAstInfoModel):

vue-fastapi-backend/module_admin/entity/do/data_ast_content_do.py

@@ -35,25 +35,6 @@ class DataAstContentRela(Base):
     rela_status = Column(String(18), nullable=True, comment='关系状态')
 
 
-
-
-# class DataAstInfo(Base):
-#     __tablename__ = "t_data_ast_info"
-    
-#     data_ast_no = Column(Integer, primary_key=True, autoincrement=True, comment='数据资产编号')
-#     data_ast_eng_name = Column(String(255), nullable=False, comment='数据资产英文名称')
-#     data_ast_cn_name = Column(String(255), nullable=True, comment='数据资产中文名称')
-#     data_ast_type = Column(String(50), nullable=True, comment='数据资产类型')
-#     data_ast_stat = Column(String(50), nullable=True, comment='数据资产状态')
-#     data_ast_desc = Column(Text, nullable=True, comment='数据资产描述/说明')
-#     data_ast_clas = Column(String(255), nullable=True, comment='数据资产标签')
-#     data_ast_cont = Column(Text, nullable=True, comment='数据资产内容')
-#     data_ast_faq = Column(Text, nullable=True, comment='数据资产常见问题')
-#     data_ast_estb_time = Column(DateTime, default=datetime.now, comment='数据资产建立时间')
-#     data_ast_upd_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据资产更新时间')
-#     data_ast_src = Column(String(255), nullable=True, comment='数据资产来源')
-#     ast_no = Column(Integer, nullable=True, comment='资产编号')
-
 class DataAssetInfo(Base):
     """
     数据资产信息表
@@ -73,7 +54,8 @@ class DataAssetInfo(Base):
     data_ast_faq = Column(Text, nullable=True, comment='资产常见问题')
     data_ast_estb_time = Column(DateTime, nullable=True, server_default=func.now(), comment='资产建立时间')
     data_ast_upd_time = Column(DateTime, nullable=True, server_default=func.now(), onupdate=func.now(), comment='资产更新时间')
-    data_ast_src = Column(String(255), nullable=True, comment='资产来源')
+    # data_ast_src = Column(String(255), nullable=True, comment='资产来源')
+    data_ast_src = Column(Integer, nullable=True, comment='数据资产来源')
     ast_no = Column(Integer, nullable=True, comment='资产编号')
 
 

vue-fastapi-backend/module_admin/entity/do/dataast_do.py

@@ -18,7 +18,8 @@ class DataAssetInfoAppr(Base):
     data_ast_faq = Column(Text, nullable=True, comment='数据资产常见问题')
     data_ast_estb_time = Column(DateTime, nullable=True, server_default=func.now(), comment='数据资产建立时间')
     data_ast_upd_time = Column(DateTime, nullable=True, server_default=func.now(), onupdate=func.now(), comment='数据资产更新时间')
-    data_ast_src = Column(String(255), nullable=True, comment='数据资产来源')
+    #data_ast_src = Column(String(255), nullable=True, comment='数据资产来源')
+    data_ast_src = Column(Integer, nullable=True, comment='数据资产来源')
     ast_no = Column(Integer, nullable=True, comment='数据资产编号')
     data_ast_clas = Column(String(3000), nullable=True, comment='数据资产标签')
     version_no = Column(String(50), nullable=True, comment='版本号')
@@ -31,37 +32,4 @@ class DataAssetInfoAppr(Base):
     create_time = Column(DateTime, nullable=True, server_default=func.now(), comment='创建时间')
     upd_prsn = Column(String(255), nullable=True, comment='更新人')
     upd_time = Column(DateTime, nullable=True, server_default=func.now(), onupdate=func.now(), comment='更新时间')
-    
-
-# class MetadataSuppInfo(Base):
-#     __tablename__ = 't_metadata_supp_info'
-
-#     onum = Column(String(36), primary_key=True, comment='唯一编号')
-#     crrct_ver_num = Column(String(50), comment='补录版本号')
-#     ssys_cd = Column(String(50), comment='系统代码')
-#     mdl_name = Column(String(50), comment='模型名称')
-#     tab_eng_name = Column(String(250), comment='表英文名称')
-#     tab_crrct_name = Column(String(250), comment='表补录名称')
-#     tab_desc = Column(String(500), comment='表描述')
-#     pic = Column(String(64), comment='表图片')
-#     gov_flag = Column(String(1), comment='治理标志（0否 1是）')
-#     rec_stat = Column(String(1), comment='记录状态（0有效 1无效）')
-#     tab_clas = Column(Text, comment='表分类')
-#     rec_subm_prsn = Column(String(255), comment='记录提交人')
-#     upd_time = Column(DateTime, default=func.now(), onupdate=func.now(), comment='更新时间')
-
-# class MetadataExtractInfo(Base):
-#     __tablename__ = 't_metadata_extract_info'
-
-#     onum = Column(Integer, primary_key=True, comment='唯一编号')
-#     extract_ver_num = Column(String(50), comment='采集版本号')
-#     ver_desc = Column(String(250), comment='版本描述')
-#     ssys_cd = Column(String(50), comment='系统代码')
-#     data_whs_name = Column(String(50), comment='数据仓库名称')
-#     mdl_name = Column(String(50), comment='模式名称')
-#     tab_no = Column(Integer, comment='表编号')
-#     tab_type = Column(String(50), comment='表类型')
-#     tab_eng_name = Column(String(250), comment='表英文名称')
-#     tab_cn_name = Column(String(250), comment='表中文名称')
-#     tab_rec_num = Column(Integer, comment='记录数')
-#     upd_time = Column(DateTime, default=func.now(), onupdate=func.now(), comment='更新时间')
+    

vue-fastapi-backend/module_admin/entity/vo/data_asset_vo.py

@@ -4,35 +4,24 @@ from pydantic.alias_generators import to_camel
 from typing import List, Optional
 from module_admin.annotation.pydantic_annotation import as_query
 
-
 class DataAssetItemModel(BaseModel):
     """
     数据资产信息项模型
     """
-
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-
-
     ast_no: int = Field(default=None, alias="astNo", description='数据资产编号（必填）')
     data_ast_eng_name: str = Field(default=None, alias="dataAstEngName", description='数据资产英文名称（必填）')
     data_ast_cn_name: str = Field(default=None, alias="dataAstCnName", description='数据资产中文名称')
     data_ast_type: str = Field(default=None, alias="dataAstType", description='数据资产类型（表/报表/数据应用）（必填）')
     data_ast_stat: str = Field(default=None, alias="dataAstStat", description='数据资产状态（有效/废弃）（必填）')
     data_ast_desc: str = Field(default=None, alias="dataAstDesc", description='数据资产描述')
-
     data_ast_screen: Optional[str] = Field(default=None, alias="dataAstScreen", description='资产应用场景（API/智能问答等）')
     data_ast_scren_clas: Optional[str] = Field(default=None, alias="dataAstScrenClas", description='应用场景分类')
     data_ast_clas: str = Field(default=None, alias="dataAstClas", description='数据资产标签')
     data_ast_cont: Optional[str] = Field(default=None, alias="dataAstCont", description='数据资产内容')
     data_ast_faq: Optional[str] = Field(default=None, alias="dataAstFaq", description='数据资产常见问题')
-
-
-    # data_ast_screen: str = Field(default=None, alias="dataAstScreen", description='资产应用场景（API/智能问答等）')
-    # data_ast_scren_clas: str = Field(default=None, alias="dataAstScrenClas", description='应用场景分类')
-    # data_ast_clas: str = Field(default=None, alias="dataAstClas", description='数据资产标签')
-    # data_ast_cont: str = Field(default=None, alias="dataAstCont", description='数据资产内容')
-    # data_ast_faq: str = Field(default=None, alias="dataAstFaq", description='数据资产常见问题')
-    data_ast_src: str = Field(default=None, alias="dataAstSrc", description='数据资产来源（必填）')
+    #data_ast_src: str = Field(default=None, alias="dataAstSrc", description='数据资产来源（必填）')
+    data_ast_src: Optional[int] = Field(default=None, alias="dataAstSrc", description='数据资产来源（必填）')
     version_no: str = Field(default="1", alias="versionNo", description='版本号（默认最新）')
     ctrl_flag: str = Field(default=None, alias="ctrlFlag", description='操作类型 1:插入 2:删除 3:更新')
 
@@ -41,9 +30,7 @@ class DataAssetBatchModel(BaseModel):
     """
     数据资产批量操作模型
     """
-
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-
     data_assets: List[DataAssetItemModel] = Field(default=[], alias="dataAssets", description='数据资产列表')
 
 
@@ -51,9 +38,7 @@ class DataAssetResultModel(BaseModel):
     """
     数据资产操作结果模型
     """
-
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-
     success_count: int = Field(default=0, alias="successCount", description='成功数量')
     failed_count: int = Field(default=0, alias="failedCount", description='失败数量')
     success_items: List[str] = Field(default=[], alias="successItems", description='成功项')
@@ -64,7 +49,6 @@ class DataAssetQueryModel(BaseModel):
     """
     数据资产查询模型
     """
-
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
 
     ast_no: Optional[str] = Field(default=None, alias="astNo", description='资产编号')
@@ -72,7 +56,8 @@ class DataAssetQueryModel(BaseModel):
     data_ast_cn_name: Optional[str] = Field(default=None, alias="dataAstCnName", description='资产中文名称')
     data_ast_type: Optional[str] = Field(default=None, alias="dataAstType", description='资产类型')
     data_ast_stat: Optional[str] = Field(default=None, alias="dataAstStat", description='资产状态')
-    data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='资产来源')
+    # data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='资产来源')
+    data_ast_src: Optional[int] = Field(default=None, alias="dataAstSrc", description='资产来源')
     begin_time: Optional[str] = Field(default=None, alias="beginTime", description='开始时间')
     end_time: Optional[str] = Field(default=None, alias="endTime", description='结束时间')
 
@@ -82,7 +67,6 @@ class DataAssetPageQueryModel(DataAssetQueryModel):
     """
     数据资产分页查询模型
     """
-
     page_num: int = Field(default=1, alias="pageNum", description='当前页码')
     page_size: int = Field(default=10, alias="pageSize", description='每页记录数') 
 
@@ -91,14 +75,13 @@ class DataAssetPageQueryModel(DataAssetQueryModel):
 class DataAssetSearchModel(BaseModel):
     """
     数据资产综合查询模型
-    """
-    
+    """ 
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-    
     name: Optional[str] = Field(default=None, alias="name", description='资产名称（英文名或中文名）')
     data_ast_type: Optional[str] = Field(default=None, alias="dataAstType", description='资产类型')
     data_ast_screen: Optional[str] = Field(default=None, alias="dataAstScreen", description='资产应用场景')
     data_ast_clas: Optional[str] = Field(default=None, alias="dataAstClas", description='资产标签')
-    data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='资产来源')
+    # data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='资产来源')
+    data_ast_src: Optional[int] = Field(default=None, alias="dataAstSrc", description='资产来源')
     page_num: int = Field(default=1, alias="pageNum", description='当前页码')
     page_size: int = Field(default=10, alias="pageSize", description='每页记录数')

vue-fastapi-backend/module_admin/entity/vo/data_ast_content_vo.py

@@ -8,7 +8,6 @@ from module_admin.annotation.pydantic_annotation import as_query
 
 class DataCatalogRequest(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-
     content_onum: Optional[int] = Field(default=None, alias="contentOnum", description='目录序号')
     content_name: Optional[str] = Field(default=None, alias="contentName", description='目录名称')
     content_stat: Optional[str] = Field(default=None, alias="contentStat", description='目录状态')
@@ -18,7 +17,6 @@ class DataCatalogRequest(BaseModel):
     leaf_node_flag: Optional[int] = Field(default=None, alias="leafNodeFlag", description='叶子结点标志（自动计算）')
     upd_prsn: Optional[str] = Field(default=None, alias="updPrsn", description='更新人员（必填）')
     upd_time: Optional[datetime] = Field(default=None, alias="updTime", description='更新时间')
-
     # 校验逻辑保持不变
     @NotBlank(field_name='content_name', message='目录名称不能为空')
     @Size(field_name='content_name', min_length=0, max_length=255, message='目录名称长度不能超过255个字符')
@@ -32,7 +30,6 @@ class DataCatalogRequest(BaseModel):
 
 class DataCatalogResponse(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
-
     content_onum: Optional[int] = Field(default=None,alias="contentOnum", description='目录ID')
     content_name: Optional[str] = Field(default=None,alias="contentName", description='目录名称')
     content_stat: Optional[str] = Field(default=None,alias="contentStat", description='目录状态')
@@ -47,7 +44,6 @@ class DataCatalogQueryModel(DataCatalogRequest):
     """
     目录管理不分页查询模型
     """
-
     begin_time: Optional[str] = Field(default=None, description='开始时间')
     end_time: Optional[str] = Field(default=None, description='结束时间')
 
@@ -56,7 +52,6 @@ class DataCatalogPageQueryModel(DataCatalogQueryModel):
     """
     目录管理分页查询模型
     """
-
     page_num: int = Field(default=1, description='当前页码')
     page_size: int = Field(default=10, description='每页记录数')
 
@@ -65,16 +60,13 @@ class DeleteDataCatalogModel(BaseModel):
     """
     删除目录模型
     """
-
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
-
     content_onums: str = Field(alias="contentOnums", description='需要删除的目录ID')
 
 
 
 class DataCatalogChild(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
-
     rela_onum: Optional[int] = Field(default=None, alias="relaOnum", description='目录关系序号')
     content_onum: Optional[int] = Field(default=None, alias="contentOnum", description='目录序号')
     ast_onum: Optional[int] = Field(default=None, alias="astOnum", description='资产序号')
@@ -86,7 +78,6 @@ class DataCatalogChild(BaseModel):
 
 class DataCatalogResponseWithChildren(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
-
     content_onum: Optional[int] = Field(default=None, alias="contentOnum", description='目录ID')
     content_name: Optional[str] = Field(default=None, alias="contentName", description='目录名称')
     content_stat: Optional[str] = Field(default=None, alias="contentStat", description='目录状态')
@@ -103,7 +94,6 @@ class DataCatalogResponseWithChildren(BaseModel):
 
 class DataAssetCatalogTreeNode(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
-
     data_ast_eng_name: Optional[str] = Field(default=None, alias="dataAssetCatalogNo", description='数据资产序号')
     data_ast_cn_name: Optional[str] = Field(default=None, alias="dataAssetCatalogName", description='数据资产名称')
     ast_no: Optional[int] = Field(default=None, alias="dataAssetCatalogAstno", description='资产编号')
@@ -112,8 +102,8 @@ class DataAssetCatalogTreeNode(BaseModel):
 
 class DataAssetCatalogTreeResponse(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
-
-    data_ast_src: Optional[str] = Field(default=None, alias="dataAssetSysName", description='数据资产系统名称')
+    # data_ast_src: Optional[str] = Field(default=None, alias="dataAssetSysName", description='数据资产系统名称')
+    data_ast_src: Optional[int] = Field(default=None, alias="dataAstSrc", description='数据资产系统')
     children: List[DataAssetCatalogTreeNode] = Field(default_factory=list, description='子节点列表')
 
 
@@ -124,7 +114,6 @@ class DataCatalogMovedRequest(BaseModel):
         extra='ignore',         # 使用字符串形式替代Extra.ignore
         from_attributes=True
     )
-
     content_onum: Optional[int] = Field(default=None, alias="contentOnum", description='移动前的目录序号')
     supr_content_onum: Optional[int] = Field(default=None, alias="suprContentOnum", description='移动前的上级目录序号')
     supr_content_onum_after: Optional[int] = Field(default=None, alias="suprContentOnumAfter", description='移动后的上级目录序号')
@@ -136,7 +125,6 @@ class DataCatalogMergeRequest(BaseModel):
         extra='ignore',
         from_attributes=True
     )
-
     content_onum: Optional[int] = Field(default=None, alias="contentOnum", description='移动前的目录序号')
     supr_content_onum: Optional[int] = Field(default=None, alias="suprContentOnum", description='移动前的上级目录序号')
     content_onum_after: Optional[int] = Field(default=None, alias="contentOnumAfter", description='合并前的上级目录序号')
@@ -149,7 +137,6 @@ class DataCatalogMoverelRequest(BaseModel):
         extra='ignore',
         from_attributes=True
     )
-
     rela_onum: Optional[int] = Field(default=None, alias="relaOnum", description='关系序号')
     content_onum: Optional[int] = Field(default=None, alias="contentOnum", description='目录序号')
     content_onum_after: Optional[int] = Field(default=None, alias="contentOnumAfter", description='移动后的目录序号')
@@ -163,7 +150,6 @@ class DataCatalogMoverelRequest(BaseModel):
         extra='ignore',
         from_attributes=True
     )
-
     rela_onum: Optional[int] = Field(default=None, alias="relaOnum", description='关系序号')
     content_onum: Optional[int] = Field(default=None, alias="contentOnum", description='目录序号')
     content_onum_after: Optional[int] = Field(default=None, alias="contentOnumAfter", description='移动后的目录序号')
@@ -177,7 +163,6 @@ class DataAstBookmarkRelaRequest(BaseModel):
         extra='ignore',
         from_attributes=True
     )
-
     rela_onum: Optional[int] = Field(default=None, alias="relaOnum", description='唯一关系序号')
     user_id: Optional[str] = Field(default=None, alias="userId", description='用户ID')
     data_ast_no: Optional[str] = Field(default=None, alias="dataAstNo", description='数据资产编号')
@@ -192,7 +177,6 @@ class DataAstBookmarkRelaRequest(BaseModel):
 
 class DataAstIndxRequest(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-
     ast_no: Optional[str] = Field(default=None, alias="astNo", description='资产编号')
     indx_no: Optional[str] = Field(default=None, alias="indxNo", description='指标编号')
     indx_name: Optional[str] = Field(default=None, alias="indxName", description='指标名称')
@@ -200,7 +184,6 @@ class DataAstIndxRequest(BaseModel):
 
 class DataAstIndxResponse(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
-
     ast_no: Optional[str] = Field(default=None, alias="astNo", description='资产编号')
     indx_no: Optional[str] = Field(default=None, alias="indxNo", description='指标编号')
     indx_name: Optional[str] = Field(default=None, alias="indxName", description='指标名称')
@@ -208,12 +191,12 @@ class DataAstIndxResponse(BaseModel):
 
 class DataAstSecuRequest(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-
-    data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='数据源连接')
+    # data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='数据源连接')
+    data_ast_src: Optional[int] = Field(default=None, alias="dataAstSrc", description='数据源连接')
     data_ast_eng_name: Optional[str] = Field(default=None, alias="dataAstEngName", description='表英文名')
 
 class DataAstSecuResponse(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, from_attributes=True)
-
-    data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='数据源连接')
+    # data_ast_src: Optional[str] = Field(default=None, alias="dataAstSrc", description='数据源连接')
+    data_ast_src: Optional[int] = Field(default=None, alias="dataAstSrc", description='数据源连接')
     data_ast_eng_name: Optional[str] = Field(default=None, alias="dataAstEngName", description='表英文名')

vue-fastapi-backend/module_admin/entity/vo/dataast_vo.py

@@ -17,7 +17,6 @@ class DataAstInfoModel(BaseModel):
     数据资产信息模型 (对应 t_data_ast_info_appr 表)
     """
     model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
-
     onum: Optional[str] = Field(default=None, description='序号', alias='onum')
     data_ast_eng_name: Optional[str] = Field(default=None, description='数据资产英文名称', alias='dataAstEngName')
     data_ast_cn_name: Optional[str] = Field(default=None, description='数据资产中文名称', alias='dataAstCnName')
@@ -30,7 +29,8 @@ class DataAstInfoModel(BaseModel):
     data_ast_faq: Optional[str] = Field(default=None, description='数据资产常见问题', alias='dataAstFaq')
     data_ast_estb_time: Optional[datetime] = Field(default=None, description='数据资产建立时间', alias='dataAstEstbTime')
     data_ast_upd_time: Optional[datetime] = Field(default=None, description='数据资产更新时间', alias='dataAstUpdTime')
-    data_ast_src: Optional[str] = Field(default=None, description='数据资产来源', alias='dataAstSrc')
+    # data_ast_src: Optional[str] = Field(default=None, description='数据资产来源', alias='dataAstSrc')
+    data_ast_src: Optional[int] = Field(default=None, description='数据资产来源', alias='dataAstSrc')
     #ast_no: Optional[int] = Field(default=None, description='数据资产编号', alias='astNo')
     ast_no: int
     data_ast_clas: Optional[str] = Field(default=None, description='数据资产标签', alias='dataAstClas')

vue-fastapi-backend/module_admin/service/data_ast_content_service.py

@@ -73,7 +73,7 @@ class DataCatalogService:
                         'updPrsn1': item['updPrsn1'],
                         'dataAstNo': item['dataAstNo'],
                         'dataAstEngName': item['dataAstEngName'],
-                        'dataAstCnName': item['dataAstCnName'],
+                        'dataAstCnName': item['dataAstCnName'] if item['dataAstCnName'] else item['dataAstEngName'],
                         'dataAstType': item['dataAstType'],
                         'dataAstStat': item['dataAstStat'],
                         'dataAstDesc': item['dataAstDesc'],