From e92f5f5898f880c17ee4a9d0f4735e947baa9e43 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Thu, 7 Jul 2022 15:35:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=94=B9=E4=B8=BA=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E5=88=AB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/stat/evaluate/district_count_thirdavg_deal.py | 3 ++- dags/stat/evaluate/district_sell_property.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dags/stat/evaluate/district_count_thirdavg_deal.py b/dags/stat/evaluate/district_count_thirdavg_deal.py index b1eeb18..9ae6820 100644 --- a/dags/stat/evaluate/district_count_thirdavg_deal.py +++ b/dags/stat/evaluate/district_count_thirdavg_deal.py @@ -23,8 +23,9 @@ average_statistics_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'average_s deal_price_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'deal_price') seaweed_df = pd.DataFrame( - list(seaweed_conn.find({'cat': 'district', 'status': 0}, {'city': 1, 'region': 1, 'name': 1, 'alias': 1}) + list(seaweed_conn.find({'cat': 'district', 'status': 0}, {'city': 1, 'region': 1, 'name': 1, 'mapping_alias': 1}) .batch_size(10000))) +seaweed_df = seaweed_df.rename(columns={'mapping_alias': 'alias'}) cities = df[['城市']].drop_duplicates(keep='first')['城市'].values.tolist() diff --git a/dags/stat/evaluate/district_sell_property.py b/dags/stat/evaluate/district_sell_property.py index 7513121..e80987d 100644 --- a/dags/stat/evaluate/district_sell_property.py +++ b/dags/stat/evaluate/district_sell_property.py @@ -16,8 +16,9 @@ one_year_time = dateutils.format_date(dateutils.add_months(dateutils.datetime.da seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') -seaweed_df = pd.DataFrame(list(seaweed_conn.find({'cat': 'district', 'status': 0}, {'city': 1, 'region': 1, 'name': 1, 'alias': 1}) +seaweed_df = pd.DataFrame(list(seaweed_conn.find({'cat': 'district', 'status': 0}, {'city': 1, 'region': 1, 'name': 1, 'mapping_alias': 1}) .batch_size(10000))) +seaweed_df = seaweed_df.rename(columns={'mapping_alias': 'alias'}) def sell_stat(): """