From 2e806a81cbad3748072807fe7ff0a501e2a57f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Thu, 6 Mar 2025 10:39:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9F=8E=E5=B8=82=E4=BC=A0?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/business/business/community/avg_cost.py | 7 ++++++- dags/business/business/community/business_district.py | 7 ++++++- dags/business/business/community/comm.py | 9 +++++++-- dags/business/business/community/consumption.py | 9 +++++++-- dags/business/business/community/credit.py | 9 +++++++-- dags/business/business/community/del_comm.py | 9 +++++++-- dags/business/business/community/education.py | 7 ++++++- dags/business/business/community/education2.py | 7 ++++++- .../business/community/estate_charge_complete.py | 9 +++++++-- .../business/business/community/estate_charge_ranking.py | 9 +++++++-- dags/business/business/community/extra.py | 9 +++++++-- dags/business/business/community/full_name.py | 9 +++++++-- dags/business/business/community/life.py | 7 ++++++- dags/business/business/community/medical.py | 7 ++++++- dags/business/business/community/other.py | 9 +++++++-- dags/business/business/community/percentile.py | 9 +++++++-- dags/business/business/community/person_rating.py | 9 +++++++-- dags/business/business/community/price.py | 7 ++++++- dags/business/business/community/price_rating.py | 9 +++++++-- .../business/community/relative_price_ranking.py | 7 ++++++- .../business/community/relative_price_ranking_fix.py | 7 ++++++- dags/business/business/community/sell.py | 9 +++++++-- dags/business/business/community/total_price.py | 9 +++++++-- dags/business/business/community/total_price_complete.py | 9 +++++++-- dags/business/business/community/trade.py | 9 +++++++-- dags/business/business/community/traffic.py | 7 ++++++- 26 files changed, 172 insertions(+), 42 deletions(-) diff --git a/dags/business/business/community/avg_cost.py b/dags/business/business/community/avg_cost.py index 3fe7bae..4eaac4a 100644 --- a/dags/business/business/community/avg_cost.py +++ b/dags/business/business/community/avg_cost.py @@ -156,4 +156,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/business_district.py b/dags/business/business/community/business_district.py index 8ccf599..5ebe1a4 100644 --- a/dags/business/business/community/business_district.py +++ b/dags/business/business/community/business_district.py @@ -107,4 +107,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) \ No newline at end of file +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/comm.py b/dags/business/business/community/comm.py index 892248f..655aac7 100644 --- a/dags/business/business/community/comm.py +++ b/dags/business/business/community/comm.py @@ -214,5 +214,10 @@ def sync(city=None): log.info(f"完成同步小区基本属性至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/consumption.py b/dags/business/business/community/consumption.py index d64f39c..193f9f0 100644 --- a/dags/business/business/community/consumption.py +++ b/dags/business/business/community/consumption.py @@ -318,6 +318,11 @@ def save_png(community_city): plt.close() -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) #dingutils.send_text("【分布图生成完毕】财力评级已完成, 请点击 https://nextcloud.fangjia.com/s/Jqs5BzXi8xLYeH9 查看分布图", "c7ac6c86bfbe49a95e30a68616c4d784ae7781c715430dc9c5f6b46d3e6ebd78") diff --git a/dags/business/business/community/credit.py b/dags/business/business/community/credit.py index 649427a..c5ec35e 100644 --- a/dags/business/business/community/credit.py +++ b/dags/business/business/community/credit.py @@ -74,5 +74,10 @@ def sync(city=None): log.info(f"完成置信度打分 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/del_comm.py b/dags/business/business/community/del_comm.py index b6d46e4..bd95a47 100644 --- a/dags/business/business/community/del_comm.py +++ b/dags/business/business/community/del_comm.py @@ -88,5 +88,10 @@ def sync(city=None): log.info(f"完成删除小区基本属性至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/education.py b/dags/business/business/community/education.py index b9135b4..5bd80ec 100644 --- a/dags/business/business/community/education.py +++ b/dags/business/business/community/education.py @@ -85,4 +85,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) \ No newline at end of file +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/education2.py b/dags/business/business/community/education2.py index b49168b..01f050c 100644 --- a/dags/business/business/community/education2.py +++ b/dags/business/business/community/education2.py @@ -98,4 +98,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) \ No newline at end of file +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/estate_charge_complete.py b/dags/business/business/community/estate_charge_complete.py index 2033e5f..11f2cbb 100644 --- a/dags/business/business/community/estate_charge_complete.py +++ b/dags/business/business/community/estate_charge_complete.py @@ -325,5 +325,10 @@ def sync(city=None): sync_by_city(city) -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) \ No newline at end of file +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/estate_charge_ranking.py b/dags/business/business/community/estate_charge_ranking.py index 5e09847..421735f 100644 --- a/dags/business/business/community/estate_charge_ranking.py +++ b/dags/business/business/community/estate_charge_ranking.py @@ -164,6 +164,11 @@ def save_png(community_city): plt.close() -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) #dingutils.send_text("【分布图生成完毕】物业费评级已完成, 请点击 https://nextcloud.fangjia.com/s/HbifLoEDc5wi8HR 查看分布图", "c7ac6c86bfbe49a95e30a68616c4d784ae7781c715430dc9c5f6b46d3e6ebd78") \ No newline at end of file diff --git a/dags/business/business/community/extra.py b/dags/business/business/community/extra.py index baa6bf1..cd941b8 100644 --- a/dags/business/business/community/extra.py +++ b/dags/business/business/community/extra.py @@ -141,5 +141,10 @@ def sync(city=None): log.info(f"完成同步附加标签至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) \ No newline at end of file +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/full_name.py b/dags/business/business/community/full_name.py index f65988e..9f3d304 100644 --- a/dags/business/business/community/full_name.py +++ b/dags/business/business/community/full_name.py @@ -64,5 +64,10 @@ def sync(city=None): log.info(f"完成转换省市区全拼至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) \ No newline at end of file +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/life.py b/dags/business/business/community/life.py index 55ee981..a26c74a 100644 --- a/dags/business/business/community/life.py +++ b/dags/business/business/community/life.py @@ -99,4 +99,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) \ No newline at end of file +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/medical.py b/dags/business/business/community/medical.py index ab9b194..aecf0c8 100644 --- a/dags/business/business/community/medical.py +++ b/dags/business/business/community/medical.py @@ -85,4 +85,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) \ No newline at end of file +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/other.py b/dags/business/business/community/other.py index 3e42cb2..c16dcd6 100644 --- a/dags/business/business/community/other.py +++ b/dags/business/business/community/other.py @@ -57,5 +57,10 @@ def sync(city=None): log.info(f"完成同步售租比、人口数至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) \ No newline at end of file +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/percentile.py b/dags/business/business/community/percentile.py index 32ccef0..0fa216e 100644 --- a/dags/business/business/community/percentile.py +++ b/dags/business/business/community/percentile.py @@ -116,5 +116,10 @@ def calc_percentile(city=None): log.info("更新完成,共更新: {}".format(count)) -city = sys.argv[1] if len(sys.argv) > 1 else None -calc_percentile(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + calc_percentile(city) +else: + calc_percentile(sys_city) diff --git a/dags/business/business/community/person_rating.py b/dags/business/business/community/person_rating.py index a74ed8a..45d84f6 100644 --- a/dags/business/business/community/person_rating.py +++ b/dags/business/business/community/person_rating.py @@ -75,5 +75,10 @@ def sync(city=None): calc_person_rating(city) -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/price.py b/dags/business/business/community/price.py index 7d1b1cc..ee5876f 100644 --- a/dags/business/business/community/price.py +++ b/dags/business/business/community/price.py @@ -148,4 +148,9 @@ def sync(curr_city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/price_rating.py b/dags/business/business/community/price_rating.py index 01740f8..0a7ae37 100644 --- a/dags/business/business/community/price_rating.py +++ b/dags/business/business/community/price_rating.py @@ -85,5 +85,10 @@ def sync(city=None): calc_price_rating(city) -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/relative_price_ranking.py b/dags/business/business/community/relative_price_ranking.py index 9a79b75..0b25c4c 100644 --- a/dags/business/business/community/relative_price_ranking.py +++ b/dags/business/business/community/relative_price_ranking.py @@ -157,4 +157,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/relative_price_ranking_fix.py b/dags/business/business/community/relative_price_ranking_fix.py index d66b857..a2b3c03 100644 --- a/dags/business/business/community/relative_price_ranking_fix.py +++ b/dags/business/business/community/relative_price_ranking_fix.py @@ -67,4 +67,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/sell.py b/dags/business/business/community/sell.py index bc93af3..6ad7918 100644 --- a/dags/business/business/community/sell.py +++ b/dags/business/business/community/sell.py @@ -91,5 +91,10 @@ def sync(city=None): log.info(f"完成同步出售信息至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) \ No newline at end of file +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file diff --git a/dags/business/business/community/total_price.py b/dags/business/business/community/total_price.py index 951c1b2..f90143a 100644 --- a/dags/business/business/community/total_price.py +++ b/dags/business/business/community/total_price.py @@ -66,5 +66,10 @@ def sync(city=None): log.info(f"完成同步户均总价信息至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/total_price_complete.py b/dags/business/business/community/total_price_complete.py index aaf6696..97a704e 100644 --- a/dags/business/business/community/total_price_complete.py +++ b/dags/business/business/community/total_price_complete.py @@ -173,5 +173,10 @@ def sync(city=None): log.info(f"完成补全户均总价信息至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/trade.py b/dags/business/business/community/trade.py index 4d88e35..9726710 100644 --- a/dags/business/business/community/trade.py +++ b/dags/business/business/community/trade.py @@ -77,5 +77,10 @@ def sync(city=None): log.info(f"完成同步成交信息至206 {index_name}") -city = sys.argv[1] if len(sys.argv) > 1 else None -sync(city) +sys_city = sys.argv[1] if len(sys.argv) > 1 else None +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) diff --git a/dags/business/business/community/traffic.py b/dags/business/business/community/traffic.py index f38024d..2da6c20 100644 --- a/dags/business/business/community/traffic.py +++ b/dags/business/business/community/traffic.py @@ -89,4 +89,9 @@ def sync(city=None): sys_city = sys.argv[1] if len(sys.argv) > 1 else None -sync(sys_city) \ No newline at end of file +if pd.notna(sys_city) and "," in sys_city: + cities = sys_city.split(",") + for city in cities: + sync(city) +else: + sync(sys_city) \ No newline at end of file