From 6a32f010d4f233f576bbb56f9b56b69a54dce82b Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Wed, 10 Sep 2025 10:13:38 +0800 Subject: [PATCH] 'commit' --- Util/AreaUtil.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Util/AreaUtil.py b/Util/AreaUtil.py index 6ccd316..c88dabd 100644 --- a/Util/AreaUtil.py +++ b/Util/AreaUtil.py @@ -78,15 +78,19 @@ def load_yunnan_area_data(): def query_area_info(query_str): """ - 查询行政区划信息(优化版) + 查询行政区划信息 :param query_str: 简称或全称 :return: 包含full_name和area_code的字典,未找到返回None """ + # 修复:显式加载数据并初始化映射字典 + abbrev_map, fullname_map = load_jiancheng_data() + yunnan_area_map = load_yunnan_area_data() + # 1. 先查简称映射表 if query_str in abbrev_map: return abbrev_map[query_str] - # 2. 直接查询完整行政区划数据(新增) + # 2. 再查完整行政区划数据 if query_str in yunnan_area_map: return yunnan_area_map[query_str] @@ -94,7 +98,7 @@ def query_area_info(query_str): if query_str in fullname_map: return fullname_map[query_str] - # 4. 尝试模糊匹配(新增) + # 4. 尝试模糊匹配 for name, info in yunnan_area_map.items(): if query_str in name or name in query_str: return info