From 25d046cc6e189e9cf1b923570e801fbf1ae7815c Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Thu, 9 Mar 2023 15:09:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8Anull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/business/business/community/avg_cost.py | 38 ++++---------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/dags/business/business/community/avg_cost.py b/dags/business/business/community/avg_cost.py index e73be89..4232fd1 100644 --- a/dags/business/business/community/avg_cost.py +++ b/dags/business/business/community/avg_cost.py @@ -24,41 +24,17 @@ def find_around_price(city_now, lng, lat): """ if pd.isna(lng): return None - filter = [] + filter_query = [] if pd.notna(city_now): - filter.append({ - "term": { - "city": { - "value": city_now - } - } - }) - filter.append({ - "terms": { - "tag": [ - "美食;中餐厅", - "美食;外国餐厅" - ] - } - }) - filter.append({ - "range": { - "price": { - "gte": 10, - "lte": 300 - } - } - }) - filter.append({ - "geo_distance": { - "distance": 1000, - "location": [lng, lat] - } - }) + filter_query.append({"term": {"city": {"value": city_now}}}) + filter_query.append({"terms": {"tag": ["美食;中餐厅", "美食;外国餐厅"]}}) + filter_query.append({"range": {"price": {"gte": 10, "lte": 300}}}) + filter_query.append({"geo_distance": {"distance": 1000, "location": [lng, lat]}}) + ret_es = es206_client.elastic_client.search({ "query": { "bool": { - "filter": filter + "filter": filter_query } }, "size": 0,