将meta_data节点的type属性名改为data_type.

app/api/data_resource/routes.py

@@ -486,8 +486,8 @@ def id_data_save():
                 MERGE (m:meta_data {name: $name})
                 ON CREATE SET m.en_name = $en_name, 
                             m.createTime = $create_time,
-                            m.type = $type
-                ON MATCH SET m.type = $type
+                            m.data_type = $type
+                ON MATCH SET m.data_type = $type
                 RETURN m
                 """
                 

app/api/meta_data/routes.py

@@ -135,7 +135,7 @@ def meta_node_edit():
             # 更新节点属性
             cypher = """
             MATCH (n) WHERE id(n) = $node_id 
-            SET n.name = $name, n.type = $type, n.desc = $desc, 
+            SET n.name = $name, n.data_type = $type, n.desc = $desc, 
                 n.properties = $properties, n.updateTime = $update_time
             RETURN n
             """
@@ -172,7 +172,7 @@ def meta_node_add():
         # 创建节点
         with neo4j_driver.get_session() as session:
             cypher = """
-            CREATE (n:meta_data {name: $name, type: $type, desc: $desc, 
+            CREATE (n:meta_data {name: $name, data_type: $type, desc: $desc, 
                                properties: $properties, createTime: $create_time, 
                                updateTime: $update_time})
             RETURN n

app/core/data_resource/resource.py

@@ -156,9 +156,9 @@ def handle_node(receiver, head_data, data_resource, data_source=None):
                     MERGE (m:meta_data {name: $name})
                     ON CREATE SET m.en_name = $en_name, 
                                 m.create_time = $create_time,
-                                m.type = $type,
+                                m.data_type = $type,
                                 m.status = 'true'
-                    ON MATCH SET m.type = $type,
+                    ON MATCH SET m.data_type = $type,
                                 m.status = 'true'
                     RETURN m
                     """
@@ -169,7 +169,7 @@ def handle_node(receiver, head_data, data_resource, data_source=None):
                         name=item['name'],
                         en_name=item['en_name'],
                         create_time=create_time,
-                        type=item['data_type']  # 使用data_type作为type属性
+                        type=item['data_type']  # 使用data_type作为data_type属性
                     )
                     meta_record = meta_result.single()
                     

app/core/production_line/production_line.py

@@ -220,7 +220,7 @@ def get_resource_storage_info(resource_id):
             metadata_query = """
             MATCH (n:data_resource)-[:contain]->(m:meta_data)
             WHERE id(n) = $resource_id
-            RETURN m.name as name, m.en_name as en_name, m.type as type
+            RETURN m.name as name, m.en_name as en_name, m.data_type as type
             """
             result = session.run(metadata_query, resource_id=int(resource_id))
             metadata_list = [dict(record) for record in result]
@@ -280,9 +280,9 @@ def check_and_create_table(table_name, metadata_list):
             
             # 构建建表SQL
             columns = [
-                f"{meta['en_name']} {meta['type']}"
+                f"{meta['en_name']} {meta['data_type']}"
                 for meta in metadata_list
-                if 'en_name' in meta and meta['en_name'] and 'type' in meta and meta['type']
+                if 'en_name' in meta and meta['en_name'] and 'data_type' in meta and meta['data_type']
             ]
             
             if not columns:
@@ -351,7 +351,7 @@ def check_and_create_table(table_name, metadata_list):
                 # 检查每个元数据是否需要作为新列添加
                 for meta in metadata_list:
                     if 'en_name' in meta and meta['en_name'] and meta['en_name'].lower() not in (col.lower() for col in existing_columns):
-                        column_type = meta.get('type', 'VARCHAR(255)')
+                        column_type = meta.get('data_type', 'VARCHAR(255)')
                         alter_sql = f"ALTER TABLE ods.{table_name} ADD COLUMN {meta['en_name']} {column_type};"
                         logger.info(f"添加新列: {alter_sql}")
                         try:
@@ -759,7 +759,7 @@ def extract_metadata_from_excel(file_path, table_name):
                 metadata_list.append({
                     'name': name,
                     'en_name': en_name,
-                    'type': data_type
+                    'data_type': data_type
                 })
             except Exception as e:
                 logger.error(f"处理列 {name} 时出错: {str(e)}")
@@ -768,7 +768,7 @@ def extract_metadata_from_excel(file_path, table_name):
                 metadata_list.append({
                     'name': name,
                     'en_name': en_name,
-                    'type': 'VARCHAR(255)'
+                    'data_type': 'VARCHAR(255)'
                 })
         
         logger.info(f"从Excel推断出的元数据: {metadata_list}")