diff --git a/dags/jh/price/price_third_gxd.py b/dags/jh/price/price_third_gxd.py index b7deee3..a807e6a 100644 --- a/dags/jh/price/price_third_gxd.py +++ b/dags/jh/price/price_third_gxd.py @@ -4,7 +4,7 @@ import sys import pandas as pd import requests -from goojia_utils import dateutils, nextcloudutils +from goojia_utils import dateutils, nextcloudutils, dingutils from citymap import city_name_id_map from pqsql_connect import get_community_base_price,get_evaluation_third_price,get_third_price @@ -56,7 +56,6 @@ 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]) - break df_concat.to_excel(yearmonth + '小区第三方均价输出.xlsx', encoding='utf-8', index=False) output_path = pathAll + "/" + yearmonth + '小区第三方均价输出.xlsx' @@ -68,15 +67,6 @@ logging.info(f"区域涨跌幅数据Excel文件已经上传到云盘") infos = "【第三方价格自动检测】" -data = { - "msgtype": "text", - "text": { - "content": infos + "数据Excel文件已经上传到云盘, 请点击 https://nextcloud.fangjia.com/s/3aw663fy9BbiBeL 查看详情" - } -} - -# 发送消息至群 -requests.post(url='https://oapi.dingtalk.com/robot/send?access_token=1b6d0d782d3c316f2d3b6b18ea5144816170dd392befbf2042a24a01fb84b736', - json=data) +dingutils.send_text(infos + "数据Excel文件已经上传到云盘, 请点击 https://nextcloud.fangjia.com/s/3aw663fy9BbiBeL 查看详情", "1b6d0d782d3c316f2d3b6b18ea5144816170dd392befbf2042a24a01fb84b736")