diff --git a/kg_lab_6.13/main.py b/kg_lab_6.13/main.py index 998d7bb..7ddb21b 100644 --- a/kg_lab_6.13/main.py +++ b/kg_lab_6.13/main.py @@ -38,7 +38,7 @@ while True: print(f"🧠 提取关键词:{keywords}") # 预映射为图数据库结构 - input_neo4j = pre_mapping2(keywords, data) + input_neo4j = pre_mapping(keywords, data) print(f"📊 图谱相关知识输出:\n{input_neo4j}\n") diff --git a/kg_lab_6.13/main2.py b/kg_lab_6.13/main2.py index 9ea00d3..e008024 100644 --- a/kg_lab_6.13/main2.py +++ b/kg_lab_6.13/main2.py @@ -48,7 +48,7 @@ while True: print(f"🧠 提取关键词:{keywords}") # 预映射为图数据库结构 - input_neo4j = pre_mapping2(keywords, data) + input_neo4j = pre_mapping(keywords, data) print(f"📊 图谱相关知识输出:\n{input_neo4j}\n") diff --git a/kg_lab_6.13/utils.py b/kg_lab_6.13/utils.py index f621b42..4cc50c0 100644 --- a/kg_lab_6.13/utils.py +++ b/kg_lab_6.13/utils.py @@ -74,7 +74,10 @@ def pre_mapping(keywords, data): else: if len(ceshi["指标描述"]["指标映射"]) == 1: temp0, temp1 = find_target_item(ceshi["指标描述"]["指标映射"][0], data) - return f"{temp1},换算规则:【{temp0}】" + if "【" in temp0: + return f"{temp1},换算规则:【{temp0}】" + else: + return f"查找一下【{temp1}】,换算规则:【{temp0}】" elif len(ceshi["指标描述"]["指标映射"]) > 1: @@ -95,11 +98,11 @@ def pre_mapping(keywords, data): if temp0 is None and temp1 is None: pass - elif temp0 != None and temp1 is None: + elif temp1 != None and temp0 is None: if judge_exists(item, data): - temp1 = item + temp0 = item # temp0 = find_target_items(ceshi["指标描述"]["映射规则"], item, data) - result.append(f"模糊查找一下【{temp0}】,换算规则:【{temp1}】") + result.append(f"模糊查找一下【{temp0}】,换算规则:【{temp1}】,233") else: continue @@ -172,7 +175,7 @@ def pre_mapping2(keywords, data): desc = ceshi.get("指标描述") if isinstance(desc, str): - return f"{desc}" + return f"测试:{desc}" elif isinstance(desc, dict): mapping_rule = desc.get("映射规则") @@ -207,7 +210,7 @@ def pre_mapping2(keywords, data): if judge_exists(item_name, data): if temp1 is None: - temp1 = item_name + temp0 = item_name result.append(f"模糊查找一下【{temp0}】,换算规则:【{temp1}】") return result or "未匹配到有效的映射项"