Merge branch 'develop' into dev_20241202_xukangle

@@ -19,9 +19,9 @@ VITE_SERVE_BASE = /
 # 流程设计访问地址
 # 流程设计访问地址
 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
 # 数据标准、元数据、数据目录 接口地址
 # 数据标准、元数据、数据目录 接口地址
-VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
+VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service
 #数据质量接口地址
 #数据质量接口地址
-VITE_APP_QUALITY_BASEURL = ms-daop-zcgl-data-quality-service
+VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
 
 
 #数据盘点接口地址
 #数据盘点接口地址
 VITE_APP_CHECK_BASEURL = ms-daop-zcgl-data-inventory
 VITE_APP_CHECK_BASEURL = ms-daop-zcgl-data-inventory

@@ -18,9 +18,9 @@ VITE_SERVE_BASE = /
 # 流程设计访问地址
 # 流程设计访问地址
 VITE_BPMN_URL = https://workflow.zgsjzc.com
 VITE_BPMN_URL = https://workflow.zgsjzc.com
 # 数据标准、元数据、数据目录 接口地址
 # 数据标准、元数据、数据目录 接口地址
-VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
+VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service
 #数据质量接口地址
 #数据质量接口地址
-VITE_APP_QUALITY_BASEURL = ms-daop-zcgl-data-quality-service
+VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
 
 
 #门户接口
 #门户接口
 VITE_API_PORTALURL = https://www.zgsjzc.com/portal
 VITE_API_PORTALURL = https://www.zgsjzc.com/portal

@@ -175,28 +175,23 @@ export const deleteImportData = (params) => request({
 })
 })
 // 数据导入-分页查询
 // 数据导入-分页查询
 export const getImportData = (params) => request({
 export const getImportData = (params) => request({
-  url: `${import.meta.env.VITE_APP_ADD_FILE}/import-data/list`,
+  url: `${import.meta.env.VITE_APP_ADD_FILE}/import-data/page-list`,
   method: 'post',
   method: 'post',
   data: params,
   data: params,
 })
 })
 
 
+// 导出采集任务分类模板。
+export const exportCollectTask = (params) => request({
+  url: `${import.meta.env.VITE_APP_ADD_FILE}/import-config/export-more-sheet-template`,
+  method: 'post',
+  data: params,
+  responseType: 'blob'
+}) 
+
 // 导出数据字典模板
 // 导出数据字典模板
 export const exportDictionary = (params) => request({
 export const exportDictionary = (params) => request({
   url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/export/data-dictionary/schema`,
   url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/export/data-dictionary/schema`,
   method: 'post',
   method: 'post',
   data: params,
   data: params,
   responseType: 'blob'
   responseType: 'blob'
-})
-
-/** 获取树形结构的标准集列表 */
-export const getStandardSetTree = () =>  request({
-  url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/data-standard-set/list-tree`,
-  method: 'get'
-})
-
-// 数据字典树形数据
-export const getDictionaryTree = (params) => request({
-  url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/data-dictionary-general/tree-list`,
-  method: 'post',
-  params
 })
 })
\ No newline at end of file

@@ -304,6 +304,34 @@ const transformRulesInfo = (info: any) => {
         })]
         })]
       }));
       }));
     })
     })
+  } else if (info.ruleCode == 'value_of_range') {
+    let subjectTables = toSubjectTables.value;
+    for (const ds in info.ruleFields) {
+      let fields = info.ruleFields[ds];
+      let tableInfo = subjectTables.find(t => t.enName === ds);
+      modelRules.push(Object.assign({}, {
+        modelGroupGuid: modelGroupGuid.value,
+        name: tableInfo.chName,
+        subjectName: tableInfo.enName,
+        subjectGuid: tableInfo.guid,
+        dataSourceGuid: tableInfo.dataSourceGuid,
+        databaseName: tableInfo.dataServerName,
+        modelRuleConfList: [Object.assign({}, info, {
+          ruleField: fields.map(f => {
+            return {
+              guid: f.guid,
+              enName: f.enName,
+              chName: f.chName,
+              dataType: f.dataType,
+              startValue: f.startValue,
+              endValue: f.endValue,
+              dataRange: f.dataRange
+            }
+          }),
+          ruleFields: ''
+        })]
+      }));
+    }
   }
   }
   return modelRules;
   return modelRules;
 }
 }

@@ -120,6 +120,26 @@ const transformRulesInfo = (info: any) => {
       differenceRange: info.rows[0].differenceRange,
       differenceRange: info.rows[0].differenceRange,
       rows: ''
       rows: ''
     });
     });
+  } else if (info.ruleCode == 'value_of_range') {
+    let subjectName = detailInfo.value.subjectName;
+    let fields = info.ruleFields[subjectName];
+    return Object.assign({}, info, {
+      guid: ruleGuid,
+      qualityModelGuid: detailInfo.value.qualityModelGuid,
+      ruleCode: detailInfo.value.ruleCode,
+      ruleField: fields.map(f => {
+            return {
+              guid: f.guid,
+              enName: f.enName,
+              chName: f.chName,
+              dataType: f.dataType,
+              startValue: f.startValue,
+              endValue: f.endValue,
+              dataRange: f.dataRange
+            }
+      }),
+      ruleFields: ''
+    });
   }
   }
 }
 }
 
 

@@ -116,6 +116,25 @@ const transformRulesInfo = (info) => {
       differenceRange: info.rows[0].differenceRange,
       differenceRange: info.rows[0].differenceRange,
       rows: ''
       rows: ''
     });
     });
+  }  else if (info.ruleCode === 'value_of_range') {
+    let subjectName = modelDetailInfo.value.subjectName;
+    let fields = info.ruleFields[subjectName];
+    return Object.assign({}, info, {
+      qualityModelGuid: modelGuid,
+      ruleCode: info.ruleCode,
+      ruleField: fields.map(f => {
+            return {
+              guid: f.guid,
+              enName: f.enName,
+              chName: f.chName,
+              dataType: f.dataType,
+              startValue: f.startValue,
+              endValue: f.endValue,
+              dataRange: f.dataRange
+            }
+      }),
+      ruleFields: ''
+    });
   }
   }
 }
 }
 
 

@@ -17,8 +17,7 @@ import {
   deleteImportData,
   deleteImportData,
   getImportData,
   getImportData,
   exportDictionary,
   exportDictionary,
-  getStandardSetTree,
-  getDictionaryTree,
+  exportCollectTask,
   getImageContent
   getImageContent
 } from '@/api/modules/queryService';
 } from '@/api/modules/queryService';
 import { commonPageConfig } from '@/utils/enum';
 import { commonPageConfig } from '@/utils/enum';
@@ -347,6 +346,14 @@ const exportData = (ids: any = null) => {
     exportDictionary(params).then((res: any) => {
     exportDictionary(params).then((res: any) => {
       download(res, '数据字典模板.xlsx', 'excel')
       download(res, '数据字典模板.xlsx', 'excel')
     });
     });
+  } else if (tabsActiveName.value == 'importFile' && isfileImport == '4') {
+    exportCollectTask({
+      importTypes: [
+        "0042"
+      ]
+    }).then((res: any) => {
+      download(res, '元数据模板.xlsx', 'excel')
+    });
   }
   }
 }
 }
 
 
@@ -360,13 +367,28 @@ const importData = (info) => {
     // dialogInfo.value.footer.btns.map((item: any) => delete item.disabled)
     // dialogInfo.value.footer.btns.map((item: any) => delete item.disabled)
     return
     return
   }
   }
-  uploadFiles.value.forEach((item: any, index: number) => {
-    params.append("file", item.raw);
-  });
   let paramUrl = '';
   let paramUrl = '';
   if (isfileImport == '2') {
   if (isfileImport == '2') {
+    uploadFiles.value.forEach((item: any, index: number) => {
+      params.append("file", item.raw);
+    });
     paramUrl = `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/excel-by-subject-guid?staffGuid=${userData.staffGuid}&subjectGuid=${route.query.bizGuid}`
     paramUrl = `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/excel-by-subject-guid?staffGuid=${userData.staffGuid}&subjectGuid=${route.query.bizGuid}`
+  } else if (isfileImport == '4') {
+    if (!info.collectTaskName) {
+      ElMessage({
+        type: 'error',
+        message: '请填写采集任务名称'
+      })
+     return;
+    }
+    uploadFiles.value.forEach((item: any, index: number) => {
+      params.append("uploadFile", item.raw);
+    });
+    paramUrl = `${import.meta.env.VITE_APP_PLAN_BASEURL}/meta-collect-task/meta-collect-import?staffGuid=${userData.staffGuid}&collectTaskName=${info.collectTaskName}`
   } else {
   } else {
+    uploadFiles.value.forEach((item: any, index: number) => {
+      params.append("file", item.raw);
+    });
     paramUrl = `${import.meta.env.VITE_APP_ADD_FILE}/import-data/import-common?importType=${importType.value}&staffGuid=${userData.staffGuid}&tenantGuid=${userData.tenantGuid}&dataType=2`
     paramUrl = `${import.meta.env.VITE_APP_ADD_FILE}/import-data/import-common?importType=${importType.value}&staffGuid=${userData.staffGuid}&tenantGuid=${userData.tenantGuid}&dataType=2`
     if (info && Object.keys(info).length) {
     if (info && Object.keys(info).length) {
       paramUrl += `&extendFields=${JSON.stringify(info)}`
       paramUrl += `&extendFields=${JSON.stringify(info)}`
@@ -424,7 +446,9 @@ const setUploadInfo = () => {
   } else {
   } else {
     if (isfileImport == '2') {
     if (isfileImport == '2') {
       importType.value = '0034';
       importType.value = '0034';
-    } else {
+    } else if (isfileImport == '4') {
+      importType.value = '0042';
+    }  else {
       importType.value = '0033';
       importType.value = '0033';
     }
     }
   }
   }