From aced5dd6be59fe6654164bec5a3574cfce291f43 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 10 Sep 2025 10:12:26 +0800
Subject: [PATCH] 'commit'

---
 Util/AreaUtil.py                          |  26 +++++++++++-----------
 Util/__pycache__/AreaUtil.cpython-310.pyc | Bin 2264 -> 2317 bytes
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Util/AreaUtil.py b/Util/AreaUtil.py
index 7b20836..6ccd316 100644
--- a/Util/AreaUtil.py
+++ b/Util/AreaUtil.py
@@ -78,25 +78,25 @@ 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. 再查全称映射表
-    if query_str in fullname_map:
-        return fullname_map[query_str]
-
-    # 3. 最后查完整行政区划数据
+    
+    # 2. 直接查询完整行政区划数据（新增）
     if query_str in yunnan_area_map:
         return yunnan_area_map[query_str]
-
-    # 未找到
+    
+    # 3. 最后查全称映射表
+    if query_str in fullname_map:
+        return fullname_map[query_str]
+    
+    # 4. 尝试模糊匹配（新增）
+    for name, info in yunnan_area_map.items():
+        if query_str in name or name in query_str:
+            return info
+    
     return None
diff --git a/Util/__pycache__/AreaUtil.cpython-310.pyc b/Util/__pycache__/AreaUtil.cpython-310.pyc
index 11a32e679ddddc361bf808314336aac4f3fc144b..46e7e083830ddac5eeb6e79747d1965a96471c80 100644
GIT binary patch
delta 330
zcmca1*ek@B&&$ij00d?C4rHkEY~(x6%5jS|FFz%<_}1jRtk#U$lO@^KGHOje&K6v+
z15}sH2vQ9N%s?81oq@PG4oK86lrWSr6mgUQS&|IFAU-3IFHph==Q9EM5+zI!ehK3O
z=7kI{46y<+Otp-)K+zhY`eKb5pn9M>of;-421cMcg)%9O!K@6LOr`TDx3DYlzu(jG
zWY3JJJ=30dcD&!yIe7_tsWnTHG|&Z6{FSA7d5L-PiAAZ2@wtfwMKVCqTdbKSskz0P
z%u$?$rKv@g@x>)YMam!vmdw1g{K-BXs^(%qE(bdYBL_1C3or{XaxgOeXJIbV2TEzO
X76}8XB3=-o1R_AeQKUb435N*)r&dm!

delta 275
zcmeAbx*^Dy&&$ij00c634`kfn-pF^Hl_QEZFFz%<IBN1;R%=Gh$&zeq88s#!XA92K
z0;)@91gVAs79h<8#Lhrm>;fc87@8Skm}(honMxR&8ETnp7-|^H7>WdH7;6|L8G;#r
zd?p}YqJ|01X9n^WYJe(1@+pkL44O=(6DH4NSD1X3z0{bgNC{|c5y)mumMG4`($u2L
z_~MeHB59DY43LQ8uPn{WOU#Q;EJ{s`&rK|tT+5+qECiI{VrOIIVCH~h7Um*tkU6YH
S!XVAOAOdcBk@n=993}uW&Ny5E