'commit'

dsSchoolBuddy/ElasticSearch/T4_SelectAllData.py

@@ -1,35 +1,16 @@
 import warnings
 
-from elasticsearch import Elasticsearch
-
 from Config import Config
+from ElasticSearch.Utils.EsSearchUtil import EsSearchUtil
 
-# 抑制HTTPS相关警告
-warnings.filterwarnings('ignore', message='Connecting to .* using TLS with verify_certs=False is insecure')
-warnings.filterwarnings('ignore', message='Unverified HTTPS request is being made to host')
-
-
-# 初始化Elasticsearch连接
-es = Elasticsearch(
-    hosts=Config.ES_CONFIG['hosts'],
-    basic_auth=Config.ES_CONFIG['basic_auth'],
-    verify_certs=False
-)
+# 创建EsSearchUtil实例
+search_util = EsSearchUtil(Config.ES_CONFIG)
 
 # 查询所有数据
 def select_all_data(index_name):
     try:
-        # 构建查询条件 - 匹配所有文档
-        # 修改查询条件为获取前10条数据
-        query = {
-            "query": {
-                "match_all": {}
-            },
-            "size": 1000  # 仅获取10条数据
-        }
-        
-        # 执行查询
-        response = es.search(index=index_name, body=query)
+        # 调用EsSearchUtil中的select_all_data方法
+        response = search_util.select_all_data()
         hits = response['hits']['hits']
         
         if not hits: