代码提交

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

@@ -452,7 +452,15 @@ class MetadataConfigDao:
     async def add_batch_task_rela_dao(cls, db: AsyncSession, rela_list: List[TaskBizConfigRela]):
         db.add_all(rela_list)
         await db.flush()
+    @classmethod
+    async def check_biz_name_exists(cls, db: AsyncSession, biz_name: str, exclude_onum: str = None):
+        stmt = select(SecuBizConfig).where(SecuBizConfig.biz_name == biz_name)
+
+        if exclude_onum:
+            stmt = stmt.where(SecuBizConfig.onum != exclude_onum)
 
+        result = await db.execute(stmt)
+        return result.first()
     @classmethod
     async def get_task_rela_by_biz_id(cls, db: AsyncSession, biz_onum: int):
         result = await db.execute(

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

@@ -2150,7 +2150,7 @@ class DataStdService:
     
         except Exception as e:
             await query_db.rollback()
-            raise ServiceException(message=f"导入失败：{str(e)}")
+            raise ServiceException(message=f"导入失败：{str(e.message)}")
     
     @classmethod
     async def batch_import_code_std_services(

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

@@ -240,6 +240,11 @@ class MetadataConfigService:
             configMode.update_by=page_object.update_by
             configMode.update_time=page_object.update_time
             configMode.create_time=page_object.create_time
+              # 校验 biz_name 是否重复
+            exists = await MetadataConfigDao.check_biz_name_exists(db, page_object.biz_name)
+            if exists:
+                raise ServiceException(message=f"业务域名称 {page_object.biz_name} 已存在，请更换名称")
+    
             obj=await  MetadataConfigDao.add_biz_config(db, configMode) 
             records: List[SecuBizConfigRela] = []
             for tab_onum in page_object.tab_onum_list:
@@ -268,7 +273,9 @@ class MetadataConfigService:
         configMode.update_by=page_object.update_by
         configMode.update_time=page_object.update_time
         configMode.create_time=page_object.create_time
-
+        exists = await MetadataConfigDao.check_biz_name_exists(db, page_object.biz_name, exclude_onum=page_object.onum)
+        if exists:
+              raise ServiceException(message=f"业务名称 {page_object.biz_name} 已存在，请更换名称")
         
         edit_data = configMode.model_dump(exclude_unset=True)
 

vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue

@@ -197,7 +197,7 @@
   </el-form>
 
   <el-table v-loading="loading" :data="astTags">
-    <el-table-column label="标签编号" width="80" align="center" prop="onum"></el-table-column>
+    <el-table-column label="标签序号" width="80" align="center" prop="onum"></el-table-column>
     <el-table-column label="标签名称" width="120" align="center" prop="clasName"></el-table-column>
     <el-table-column label="标签值" width="170" align="center" prop="clasValue">
       <template #default="scope">
@@ -310,11 +310,14 @@ function getDeptTree() {
     addLabel(data); // 先给所有节点加 label
     treeData.value = data;
     if (data[0] && data[0].children) {
-      treeDataChildren.value = data[0].children;
+       data[0].children.forEach(item => {
+      item.name = getSrcSysName(item.name);
+    });
+ treeDataChildren.value= data[0].children
     }
   });
 };
-
+ 
   const astTags = ref([])
 
 /** 节点单击事件 */
@@ -424,6 +427,8 @@ const handleUpdate = (row) => {
   open.value = true;
   proxy.resetForm("assetRef");
   form.value = row || ids.value[0];
+   form.value.dataAstSrc = getSrcSysName(form.value.dataAstSrc)
+
       astTags.value = JSON.parse(form.value.dataAstClas)||[]
 
 }

vue-fastapi-frontend/src/views/metadataConfig/log/index.vue

@@ -25,6 +25,8 @@
       stripe
     >
       <el-table-column prop="taskCode" label="任务编号" width="180" />
+            <el-table-column prop="processDefinitionName" label="工作流名称" />
+
       <el-table-column prop="taskType" label="任务类型" width="180" />
       <el-table-column prop="taskName" label="任务名称" width="220" />
       <el-table-column prop="processReleaseState" label="状态" width="100">
@@ -34,7 +36,6 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="processDefinitionName" label="工作流名称" />
 <el-table-column prop="taskVersion" label="版本" width="120">
   <template #default="{ row }">
     V{{ row.taskVersion }}