Merge remote-tracking branch 'origin/master'

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

@@ -214,7 +214,7 @@ class MetataskService:
            for config in processConfigList:
             # mysql表字段   
             if config.ac_target=='0':
-              modified_json_str = config.taskDefinitionJson.replace("16199683466336", str_list[0]).replace("16199683466337", str_list[1]).replace("16199683466338", str_list[2]).replace("'mysql_conn'",  f"'{page_object.dbRName}'")
+              modified_json_str = config.taskDefinitionJson.replace("16199683466336", str_list[0]).replace("16199683466337", str_list[1]).replace("16199683466338", str_list[2]).replace("11 as ssys_id",  f"{page_object.dbRCode} as ssys_id")
               if page_object.dbSName:
                     modified_json_str=modified_json_str.replace("'dash_test_w'", f"'{page_object.dbSName}'")
               else:
@@ -504,7 +504,8 @@ class MetataskService:
            for config in processConfigList:
             # oracl表字段   
             if config.ac_target=='0':
-              modified_json_str = config.taskDefinitionJson.replace("16699723296864", str_list[0]).replace("16699723296865", str_list[1]).replace("16699723296866", str_list[2]).replace("'ORCL_USER'",  f"'{page_object.dbSName}'").replace("'orcl_conn'",  f"'{page_object.dbRName}'")
+            #   modified_json_str = config.taskDefinitionJson.replace("16699723296864", str_list[0]).replace("16699723296865", str_list[1]).replace("16699723296866", str_list[2]).replace("'ORCL_USER'",  f"'{page_object.dbSName}'").replace("'orcl_conn'",  f"'{page_object.dbRName}'")
+              modified_json_str = config.taskDefinitionJson.replace("16699723296864", str_list[0]).replace("16699723296865", str_list[1]).replace("16699723296866", str_list[2]).replace("'ORCL_USER'",  f"'{page_object.dbSName}'").replace("11 as ssys_id",  f"{page_object.dbRCode} as ssys_id")
               if page_object.dbSName:
                     modified_json_str=modified_json_str.replace("'ORCL_USER'", f"'{page_object.dbSName}'")
               else:
@@ -634,7 +635,8 @@ class MetataskService:
                     message += ", "
                 message += page_object.metatask_name + "-表字段采集新增失败"
             if config.ac_target=='1':
-               modified_json_str = config.taskDefinitionJson.replace("16699623866592", str_list[0]).replace("16699623866593", str_list[1]).replace("16699623866594", str_list[2]).replace("16699623866595", str_list[3]).replace("'db2_conn'",  f"'{page_object.dbRName}'")
+            #    modified_json_str = config.taskDefinitionJson.replace("16699623866592", str_list[0]).replace("16699623866593", str_list[1]).replace("16699623866594", str_list[2]).replace("16699623866595", str_list[3]).replace("'db2_conn'",  f"'{page_object.dbRName}'")
+               modified_json_str = config.taskDefinitionJson.replace("16699623866592", str_list[0]).replace("16699623866593", str_list[1]).replace("16699623866594", str_list[2]).replace("16699623866595", str_list[3]).replace("11 as ssys_id",  f"{page_object.dbRCode} as ssys_id")
                if page_object.dbSName:
                     modified_json_str=modified_json_str.replace("'MYSCHEMA'", f"'{page_object.dbSName}'")
                else:
@@ -794,7 +796,8 @@ class MetataskService:
            for config in processConfigList:
             # POSTGRESQL表字段   
             if config.ac_target=='0':
-              modified_json_str = config.taskDefinitionJson.replace("16688213802592", str_list[0]).replace("16688213802593", str_list[1]).replace("16688213802594", str_list[2]).replace("'pg_conn'",  f"'{page_object.dbRName}'")
+            #   modified_json_str = config.taskDefinitionJson.replace("16688213802592", str_list[0]).replace("16688213802593", str_list[1]).replace("16688213802594", str_list[2]).replace("'pg_conn'",  f"'{page_object.dbRName}'")
+              modified_json_str = config.taskDefinitionJson.replace("16688213802592", str_list[0]).replace("16688213802593", str_list[1]).replace("16688213802594", str_list[2]).replace("11 as ssys_id",  f"{page_object.dbRCode} as ssys_id")
               if page_object.dbSName:
                     modified_json_str=modified_json_str.replace("'public'", f"'{page_object.dbSName}'")
               else: