|
@@ -172,7 +172,7 @@ def meta_node_edit():
|
|
|
"name": node_data.get("name", ""),
|
|
|
"en_name": node_data.get("en_name", ""),
|
|
|
"time": node_data.get("updateTime", ""),
|
|
|
- "status": node_data.get("status", "true") == "true",
|
|
|
+ "status": bool(node_data.get("status", True)),
|
|
|
"data_type": node_data.get("data_type", ""),
|
|
|
"tag": {
|
|
|
"name": tag["t"].get("name", "") if tag and tag["t"] else None,
|
|
@@ -203,7 +203,8 @@ def meta_node_add():
|
|
|
node_affiliation = request.json.get('affiliation')
|
|
|
node_tag = request.json.get('tag')
|
|
|
node_desc = request.json.get('describe')
|
|
|
- node_status = request.json.get('status', 1)
|
|
|
+ node_status = bool(request.json.get('status', True))
|
|
|
+ node_en_name = request.json.get('en_name')
|
|
|
|
|
|
if not node_name:
|
|
|
return jsonify(failed("节点名称不能为空"))
|
|
@@ -211,8 +212,6 @@ def meta_node_add():
|
|
|
if not node_type:
|
|
|
return jsonify(failed("节点类型不能为空"))
|
|
|
|
|
|
- node_en_name = translate_and_parse(node_name)
|
|
|
-
|
|
|
# 创建节点
|
|
|
with neo4j_driver.get_session() as session:
|
|
|
cypher = """
|
|
@@ -247,7 +246,7 @@ def meta_node_add():
|
|
|
describe=node_desc,
|
|
|
create_time=create_time,
|
|
|
update_time=update_time,
|
|
|
- status=str(node_status),
|
|
|
+ status=node_status,
|
|
|
en_name=node_en_name
|
|
|
)
|
|
|
|
|
@@ -745,34 +744,19 @@ def meta_node_update():
|
|
|
'affiliation': request.json.get('affiliation'),
|
|
|
'data_type': request.json.get('data_type'),
|
|
|
'describe': request.json.get('describe'),
|
|
|
- 'status': request.json.get('status')
|
|
|
+ 'status': request.json.get('status'),
|
|
|
+ 'en_name': request.json.get('en_name')
|
|
|
}
|
|
|
|
|
|
# 只更新提供了新值的字段
|
|
|
for field, new_value in fields_to_update.items():
|
|
|
if new_value is not None:
|
|
|
- # 特殊处理 type 字段映射到 data_type
|
|
|
+ # 特殊处理 data_type 字段映射
|
|
|
if field == 'data_type':
|
|
|
update_cypher += f", n.data_type = ${field}\n"
|
|
|
else:
|
|
|
update_cypher += f", n.{field} = ${field}\n"
|
|
|
update_params[field] = new_value
|
|
|
- else:
|
|
|
- # 如果字段没有提供新值,使用当前值
|
|
|
- if field == 'data_type':
|
|
|
- update_params[field] = current_properties.get('data_type')
|
|
|
- update_cypher += f", n.data_type = ${field}\n"
|
|
|
- else:
|
|
|
- update_params[field] = current_properties.get(field)
|
|
|
- update_cypher += f", n.{field} = ${field}\n"
|
|
|
-
|
|
|
- # 处理英文名称
|
|
|
- if request.json.get('name'):
|
|
|
- update_cypher += ", n.en_name = $en_name\n"
|
|
|
- update_params['en_name'] = translate_and_parse(request.json.get('name'))
|
|
|
- else:
|
|
|
- update_cypher += ", n.en_name = $en_name\n"
|
|
|
- update_params['en_name'] = current_properties.get('en_name')
|
|
|
|
|
|
update_cypher += "RETURN n"
|
|
|
|