From e41743643fdb0adf8021ae2f10969cfb3b3032fc Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 19 Aug 2025 13:42:40 +0800
Subject: [PATCH] 'commit'

---
 .../ElasticSearch/Utils/EsSearchUtil.py       |  20 +++++++++---------
 .../__pycache__/EsSearchUtil.cpython-310.pyc  | Bin 15868 -> 15892 bytes
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dsSchoolBuddy/ElasticSearch/Utils/EsSearchUtil.py b/dsSchoolBuddy/ElasticSearch/Utils/EsSearchUtil.py
index 1d41639e..69f0d165 100644
--- a/dsSchoolBuddy/ElasticSearch/Utils/EsSearchUtil.py
+++ b/dsSchoolBuddy/ElasticSearch/Utils/EsSearchUtil.py
@@ -614,25 +614,25 @@ class EsSearchUtil:
             seg_set = set(seg_list)
 
             # 检查是否已有学生信息，如果没有则从ES加载
-            if user_id not in student_info:
+            if user_id not in self.student_info:
                 # 从ES加载学生信息
                 info_from_es = self.get_student_info_from_es(user_id)
                 if info_from_es:
-                    student_info[user_id] = info_from_es
+                    self.student_info[user_id] = info_from_es
                     logger.info(f"从ES加载用户 {user_id} 的信息: {info_from_es}")
                 else:
-                    student_info[user_id] = {}
+                    self.student_info[user_id] = {}
 
             # 提取并更新年级信息
             grade_found = False
-            for grade, keywords in GRADE_KEYWORDS.items():
+            for grade, keywords in self.GRADE_KEYWORDS.items():
                 for keyword in keywords:
                     if keyword in seg_set:
-                        if 'grade' not in student_info[user_id] or student_info[user_id]['grade'] != grade:
-                            student_info[user_id]['grade'] = grade
+                        if 'grade' not in self.student_info[user_id] or self.student_info[user_id]['grade'] != grade:
+                            self.student_info[user_id]['grade'] = grade
                             logger.info(f"提取到用户 {user_id} 的年级信息: {grade}")
                             # 保存到ES
-                            self.save_student_info_to_es(user_id, student_info[user_id])
+                            self.save_student_info_to_es(user_id, self.student_info[user_id])
                         grade_found = True
                         break
                 if grade_found:
@@ -646,11 +646,11 @@ class EsSearchUtil:
                 if match:
                     grade_num = match.group(1)
                     grade = f"{grade_num}年级"
-                    if 'grade' not in student_info[user_id] or student_info[user_id]['grade'] != grade:
-                        student_info[user_id]['grade'] = grade
+                    if 'grade' not in self.student_info[user_id] or self.student_info[user_id]['grade'] != grade:
+                        self.student_info[user_id]['grade'] = grade
                         logger.info(f"通过正则提取到用户 {user_id} 的年级信息: {grade}")
                         # 保存到ES
-                        self.save_student_info_to_es(user_id, student_info[user_id])
+                        self.save_student_info_to_es(user_id, self.student_info[user_id])
         except Exception as e:
             logger.error(f"提取学生信息失败: {str(e)}", exc_info=True)
 
diff --git a/dsSchoolBuddy/ElasticSearch/Utils/__pycache__/EsSearchUtil.cpython-310.pyc b/dsSchoolBuddy/ElasticSearch/Utils/__pycache__/EsSearchUtil.cpython-310.pyc
index c2e277831a8d13cea18e7eb427ee7a15ca6d5bf2..fb2d085c11994d1cc48500afe668ab3786de6314 100644
GIT binary patch
delta 411
zcmY*UJxc>Y5S`iEz1!^FrAQ$OHa04Ph#(<>SXlT6?6uoMWANh=1L`a(tgRBO5V-^Y
zfTRrsf`xy;(#l^U2s(+0;4bXGeKR}ny|3FI#piKsfY&(xbUb;EcPgD%1h{!=K^+M#
zT5&I&*AnF2p_3#C>Rua@ErOI^89GHO*&sFLN$f&PrM_j<2P;YSVIVU^I8!IE=&<N~
z#zCqx*oULNL*W9aNi#0H9Bt-EwjsH&^N}TJWAotma|x^}0R^XC(x8C3?t5jmv#4bP
z!D{ET9A4JQPp)RDOn!4@bJjGBGi1`xhJ=}LA%)49!ZflG$A~Cm%khBC{8N5hO#f4!
z%#=Ce)C~vjURRgBsh5Z98h#8%)ooETo)Hoa7LjkSfSUIT=5YxN%u5uXQuFyOrN(I1
NY3B9faJ}{>egNM2UnT$m

delta 351
zcmZ9Gy-EW?6h`lz+1Z`!PY4LXV8BW(Yz!hB$byZXK7w|)i2t}50_q(s1Ust@SOj4g
zY=uZbd=SNl@D(f^lSaJN;qt*bBmTZl&XXhrcb)oE|L!H(Ot&ToaP?;32pI`U+zTs>
zV0nwyV`1bF^L2*OafMc~%GX$#;xcXTd52&miwp>@Z-P=+umcC#zOaGStQ~i3jce=;
zA@7s=-L_zegWWliY5@nwGA9m9@s+OJ%>R`@AZ>kwGrUOI&rfI6VSg~88igmJ4LK|$
ziWn<lBaZSZM`cX03ye7)10|2H;g50j&-m($vl>zv7*+aIXE81wx(jHE=k6+gPT#v5
iVoA$Tc&Kp^weV!ak;XR0*u+M$+-n7MZcev*AL0jvRa7?s