From 0bdbed9454c78b45993607e048a94444d1dee174 Mon Sep 17 00:00:00 2001 From: muliangshu <283299495@qq.com> Date: Tue, 23 Jul 2024 10:50:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=9D=87?= =?UTF-8?q?=E4=BB=B7=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/jh/price/price_third_gxd.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dags/jh/price/price_third_gxd.py b/dags/jh/price/price_third_gxd.py index a807e6a..98cc8b1 100644 --- a/dags/jh/price/price_third_gxd.py +++ b/dags/jh/price/price_third_gxd.py @@ -36,6 +36,8 @@ for city in city_name_id_map: anjuke_price.rename(columns={'price': '安居客价格'}, inplace=True) base_price_gj = get_district_stat_on(city) seaweed_df = get_seaweed(city) + if seaweed_df.empty: + continue seaweed_df['_id'] = seaweed_df['_id'].astype('str') if base_price_gj.empty: continue From 9f8aa6c7a75c15c18ed6c28b0a035d9699e3e20c Mon Sep 17 00:00:00 2001 From: muliangshu <283299495@qq.com> Date: Tue, 23 Jul 2024 10:57:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=9D=87?= =?UTF-8?q?=E4=BB=B7=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/jh/price/price_third_gxd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dags/jh/price/price_third_gxd.py b/dags/jh/price/price_third_gxd.py index 98cc8b1..9562b45 100644 --- a/dags/jh/price/price_third_gxd.py +++ b/dags/jh/price/price_third_gxd.py @@ -63,12 +63,12 @@ df_concat.to_excel(yearmonth + '小区第三方均价输出.xlsx', encoding='utf output_path = pathAll + "/" + yearmonth + '小区第三方均价输出.xlsx' df_concat.to_excel(output_path, index=False) -cloudPath = '共享/统计/' + yearmonth + '小区第三方均价输出.xlsx' +cloudPath = '共享/建行/' + yearmonth + '小区第三方均价输出.xlsx' nextcloudutils.up_to_nextcloud(output_path, cloudPath) logging.info(f"区域涨跌幅数据Excel文件已经上传到云盘") infos = "【第三方价格自动检测】" -dingutils.send_text(infos + "数据Excel文件已经上传到云盘, 请点击 https://nextcloud.fangjia.com/s/3aw663fy9BbiBeL 查看详情", "1b6d0d782d3c316f2d3b6b18ea5144816170dd392befbf2042a24a01fb84b736") +dingutils.send_text(infos + "数据Excel文件已经上传到云盘,请点击 https://nextcloud.fangjia.com/s/KwxGsosMcnYxdoa 查看详情", "1b6d0d782d3c316f2d3b6b18ea5144816170dd392befbf2042a24a01fb84b736") From 446088c7d9a564611d5a2740cae9f7066f0a2132 Mon Sep 17 00:00:00 2001 From: muliangshu <283299495@qq.com> Date: Tue, 23 Jul 2024 10:58:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=9D=87?= =?UTF-8?q?=E4=BB=B7=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/jh/price/price_third_gxd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dags/jh/price/price_third_gxd.py b/dags/jh/price/price_third_gxd.py index 9562b45..b473364 100644 --- a/dags/jh/price/price_third_gxd.py +++ b/dags/jh/price/price_third_gxd.py @@ -58,7 +58,7 @@ for city in city_name_id_map: price_merge = price_merge.merge(data_df_temp[['_id','国信达价格']], on='_id', how='left') price_merge.rename(columns={'city': '城市', 'district': '区域', '_id': '小区ID', 'name': '小区名','yearmonth':'月份'}, inplace=True) df_concat = pd.concat([df_concat,price_merge]) -df_concat.to_excel(yearmonth + '小区第三方均价输出.xlsx', encoding='utf-8', index=False) +# df_concat.to_excel(yearmonth + '小区第三方均价输出.xlsx', encoding='utf-8', index=False) output_path = pathAll + "/" + yearmonth + '小区第三方均价输出.xlsx' df_concat.to_excel(output_path, index=False)