Merge remote-tracking branch 'origin/master'

2 weeks ago · fcb9ae9a45
4 changed files with 50 additions and 20 deletions
--- a/vue-fastapi-backend/module_admin/service/datasec_config_service.py
+++ b/vue-fastapi-backend/module_admin/service/datasec_config_service.py
@ -62,7 +62,7 @@ class DatasecConfigService:
    @classmethod
    async def sec_process_defind_change_add(cls,request: Request, processConfigList: list[MetaprocessconfigModel],page_object:DatasecConfigModel,current_user: CurrentUserModel):

-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        url = f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/task-definition/gen-task-codes?genNum=5'
        headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password}

@ -149,7 +149,7 @@ class DatasecConfigService:
    @classmethod
    async def sec_process_defind_change_update(cls,request: Request,page_object:DatasecConfigModel,metatask_old:DatasecConfigModel,current_user: CurrentUserModel):

-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        dsids=page_object.ds_ids.split(",")
        result_list = [{'dstype': t, 'dsid': i} for t, i in zip(dsids, dsids)]
        message=''
@ -242,7 +242,7 @@ class DatasecConfigService:
        if page_object.metatask_ids and page_object.ds_ids:
            metatask_id_list = page_object.metatask_ids.split(',')
            try:
-                projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+                projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
                # 查询接口
                url=f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/process-definition/batch-delete'
                form_data={'codes':page_object.ds_ids}
@ -280,7 +280,7 @@ class DatasecConfigService:
        metatask_info.update_by = current_user.user.user_name
        metatask_info.update_time = datetime.now()
        type_str: str
-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        dsids=metatask_info.ds_ids.split(",")
        result_list = [{'dstype': t, 'dsid': i} for t, i in zip(dsids, dsids)]
        message=''
@ -338,7 +338,7 @@ class DatasecConfigService:
    async def ds_metatask_services(
        cls, request: Request, query_db: AsyncSession,  process: ParmScheduleVo,current_user: CurrentUserModel
    ):
-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        # 先查询是否建立定时任务
        getdsurl=f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/schedules?pageSize=10&pageNo=1&processDefinitionCode='+str(process.processDefinitionCode)
        headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password, 'Content-Type': 'application/x-www-form-urlencoded'}
@ -393,7 +393,7 @@ class DatasecConfigService:
    async def ds_metatask_detail(
        cls, request: Request, query_db: AsyncSession,  process: ParmScheduleVo,current_user: CurrentUserModel
    ):
-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        # 先查询是否建立定时任务
        getdsurl=f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/schedules?pageSize=10&pageNo=1&processDefinitionCode='+str(process.processDefinitionCode)
        headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password, 'Content-Type': 'application/x-www-form-urlencoded'}
@ -418,7 +418,7 @@ class DatasecConfigService:
    async def ds_metatask_delete(
        cls, request: Request, query_db: AsyncSession,  process: ParmScheduleVo,current_user: CurrentUserModel
    ):
-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        # 先查询是否建立定时任务
        getdsurl=f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/schedules?pageSize=10&pageNo=1&processDefinitionCode='+str(process.processDefinitionCode)
        headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password, 'Content-Type': 'application/x-www-form-urlencoded'}
--- a/vue-fastapi-backend/module_admin/service/metadata_config_service.py
+++ b/vue-fastapi-backend/module_admin/service/metadata_config_service.py
@ -456,7 +456,7 @@ class MetadataConfigService:
    @classmethod
    async def biz_process_defind_change_add(cls,request: Request, processConfigList: list[MetaprocessconfigModel],page_object:TaskBizConfigAddModel,current_user: CurrentUserModel):

-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        url = f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/task-definition/gen-task-codes?genNum=5'
        headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password}

@ -550,7 +550,7 @@ class MetadataConfigService:
    @classmethod
    async def sec_process_defind_change_update(cls,request: Request,page_object:TaskBizConfigAddModel,metatask_old:TaskBizConfigAddModel,current_user: CurrentUserModel):

-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        dsids=page_object.ds_ids.split(",")
        result_list = [{'dstype': t, 'dsid': i} for t, i in zip(dsids, dsids)]
        message=''
@ -617,7 +617,7 @@ class MetadataConfigService:
            metatask_id_list = page_object.metatask_ids.split(',')
            try:
                projectCode = await request.app.state.redis.get(
-                    f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode'
+                    f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode'
                )
    
                # 构造请求参数
@ -654,7 +654,7 @@ class MetadataConfigService:
        metatask_info.update_by = current_user.user.user_name
        metatask_info.update_time = datetime.now()
        type_str: str
-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        dsids=metatask_info.ds_ids.split(",")
        result_list = [{'dstype': t, 'dsid': i} for t, i in zip(dsids, dsids)]
        message=''
@ -697,7 +697,7 @@ class MetadataConfigService:
    async def ds_metatask_services(
        cls, request: Request, query_db: AsyncSession,  process: ParmScheduleVo,current_user: CurrentUserModel
    ):
-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        # 先查询是否建立定时任务
        getdsurl=f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/schedules?pageSize=10&pageNo=1&processDefinitionCode='+str(process.processDefinitionCode)
        headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password, 'Content-Type': 'application/x-www-form-urlencoded'}
@ -753,7 +753,7 @@ class MetadataConfigService:
    async def ds_metatask_delete(
        cls, request: Request, query_db: AsyncSession,  process: ParmScheduleVo,current_user: CurrentUserModel
    ):
-        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.projectcode')
+        projectCode = await request.app.state.redis.get(f'{RedisInitKeyConfig.SYS_CONFIG.key}:sys.ds.taskBatchCode')
        # 先查询是否建立定时任务
        getdsurl=f'{AppConfig.ds_server_url}/dolphinscheduler/projects/'+projectCode+'/schedules?pageSize=10&pageNo=1&processDefinitionCode='+str(process.processDefinitionCode)
        headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password, 'Content-Type': 'application/x-www-form-urlencoded'}
--- a/vue-fastapi-frontend/src/views/dataAsset/directory/index.vue
+++ b/vue-fastapi-frontend/src/views/dataAsset/directory/index.vue
@ -544,7 +544,7 @@ const handleNodeClick = async (node) => {
    }))
    getMetaSecurityData({
      dataAstSrc: node.dataAstSrc,
-      dataAstEngName: node.dataAstEngName,
+      dataAstEngName: fides.data.mdlName+"."+ node.dataAstEngName,
    })
      .then(({ data }) => {
        metaSecurityData.value = data.data
--- a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue
+++ b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue
@ -205,12 +205,23 @@
            :show-overflow-tooltip="true"
          />

-          <el-table-column label="操作" fixed="right" align="center" width="200">
-            <template #default="{ row }">
-              <el-button type="primary" link icon="Edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="danger" link icon="Delete" @click="handleDelete(row)">删除</el-button>
-            </template>
-          </el-table-column>
+      <el-table-column label="操作" fixed="right" align="center" width="200">
+  <template #default="{ row }">
+    <el-button
+      type="primary"
+      link
+      icon="Edit"
+      @click="openEditDialog(row)"
+    >编辑</el-button>
+    <el-button
+      type="danger"
+      link
+      icon="Delete"
+      @click="handleRowDelete(row)"
+    >删除</el-button>
+  </template>
+</el-table-column>
+
        </el-table>

    <!-- 分页 -->
@ -591,6 +602,25 @@ function openEditDialog(row) {
  loadRightTable(row.onum)
  open.value = true
 }
+function handleRowDelete(row) {
+  if (row.status === 'ONLINE') {
+    ElMessage.warning('请选择下线状态的记录进行删除')
+    return
+  }
+  ElMessageBox.confirm(`确定删除任务【${row.bizName}】吗？`, '提示', {
+    type: 'warning',
+  })
+    .then(async () => {
+      try {
+        await delTaskBizConfig(row.onum, row.dsIds)
+        ElMessage.success('删除成功')
+        getList()
+      } catch {
+        ElMessage.error('删除失败，请重试')
+      }
+    })
+    .catch(() => {})
+}

 function submitForm() {
  bizFormRef.value.validate(async valid => {