From a825d4e0ee51adb84c75e0b0c3ec420e02ef91c6 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Mon, 4 Jul 2022 15:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E69=E4=B8=AA=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E9=98=88=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/租金和房价设置阀值(69个城市).xlsx | Bin 0 -> 12145 bytes dags/mt/supply/data/美团19城市列表.xlsx | Bin 9312 -> 9137 bytes dags/mt/supply/data/美团69城市列表.xlsx | Bin 0 -> 10175 bytes dags/mt/supply/data_stat.py | 11 ++- dags/mt/supply/deal.py | 1 - dags/mt/supply/facilitys.py | 89 ++++++++++-------- 6 files changed, 56 insertions(+), 45 deletions(-) create mode 100644 dags/mt/supply/data/租金和房价设置阀值(69个城市).xlsx create mode 100644 dags/mt/supply/data/美团69城市列表.xlsx diff --git a/dags/mt/supply/data/租金和房价设置阀值(69个城市).xlsx b/dags/mt/supply/data/租金和房价设置阀值(69个城市).xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ce6e3ecca0d44a39615422d42e24f76588f54a29 GIT binary patch literal 12145 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 literal 0 HcmV?d00001 diff --git a/dags/mt/supply/data/美团19城市列表.xlsx b/dags/mt/supply/data/美团19城市列表.xlsx index f90c24adcf129daad28cba7e26f444ec72137b80..2023c6112558ed021c8867241ab2004bea031df8 100644 GIT binary patch delta 1438 zcmV;P1!4N&NU=w-rvU{vYOW$!ldJ(8e}$62PQx$|#&;y%A@ZKsN&ir+G?f5#q7o8C zAU4aswh@UF*@mtp%pX-!0R+d8Knl`m z?0Y``@fuL6{HY)ay|!t4Z4?+yX4odz4p5HD%epn3FJ^2P8FjVM#$(s=Rd7gXKfRR44J#@HITW4f{ zz^U8hzIPz26lB``yeO`6BX!3|g}Hl=hOKL@;K8b`fi8?94q6#7f8XfdPioKAyYwn2 z2ds6<=OD$0ab>S3E|2mvS~=@&9WrH2KBjhDy!%bWhv<4263vZmnA# zUQ)SJLJS6ZX-c zv`ZZ07WsaU!|}A=D)r5yV-?hL+lG7F{?=7!NJ~78UT9 z86EqXGb5kJT*qi6io*|QDjm(MxJa3eDk;BsWXpxK1H*PgIp53J>|!pkRu#cJL@@)8 z^WCyoRS#611fWCiQ7k#VJ?Q zbvr)H1e5x-vEr1og0?onq&{t~IOVRO?M*PHkFOTxZ-U?O$5&^()xF%nSLrso^Q?s$ zZ()&PU2c3*(m2>Yp?DwGHsBLF%^LhC1HAo3hECSjhG~LMk87(0M&tJcf0fI>kRG$x z2!{}VEMrwwxc~qF(f|Me6aWAKcx*3oXkl_?WK(oMn8E_iKhMUFvg0znW(_kwq5 zYOg)I2qAR0i$G4G2WVz0PQ!HdI8`IMbtMR9=}vK%8zdJR@EDmO;_|)6hi_(^SgAEO z91>ZWj5AP3c`5=eEiC3AqgPNYo(f+jLJM17WSF_(z%YyIx5O4ok@`(*&P$A*$Eil@ z%V%n$mmZs?=DI;&aEU0f($g$^(a{G2m8X`(!W2|XVb$XMgPq~vjJWP{?0$FM{&c&3 z8!gW0e}8Yc!&monep=msa(}bH8m$Ea{2h~TAU^_R80C;RKb98xZWpk5&ARv=3BMt$NlRhIh0k)HMBR~NWleQx~0j-ns sBOx0z!{T3n0ssJS2LJ#V000000000103ZMW0NIl-Br67#9{>OV0R2FZGynhq delta 1611 zcmV-R2DJIHN8m`XrvU{8+fdk6ldJ(8e~pr{PQx$|hIb_1A@ZKsNlO7MNhLs?sDwlj zh|RLEZA9Wkwju2X8w)SM-hmDAPVIBxByC6q1EcT%@4Np_4u^{@b)G=!B$pBLJ%SvN zJQs4U>YUxr7KUL8D=Oco6b}@?61{$_r2?0qt0l)RY$ynj2G4e~dMs zL&mgc9ny-^TxHDIr<&n{@dq{o91t?V85ky*VYmXiMN33mq~I;GcvNW(5FA4a8AzkC z@A>%0Yd~fC&xTs*IJ3ko3%k=cZkH{1Bew2^PFiDGmR{MbW7zyYz8ha&*Q>gTtZu~t z#i8JoD_|y9@%rs^vwB}Ye}uSGSgkIYGHu58*wX~W*)raIy{=zYA^xpcT%EpQf^cje z+N9qpx4rX=$q2;(2?Cc4+@L=pr?h`W3AwKZ@AX&tnnJc6{~zMI-N&p*SLTxfqTH7p=#PAX%GqGx*#+gEC$$u;k z^)4}u29|r1tdd!p-X)TWnsf;Z{gDh+6oSK(;s*(}?LstE%wqkf6piWAUh@y-<(jp) z*S?;!5}&%6Qy#s!s80&6l~IL_xspj&+T||i$$YR+$uEKehb5WbADSx+Zg6v3Q3?Cz zx7!y4_J2;>wsG5-nAh)BoE;FoPk+E}4#q0^#4IDLrGEl1I$14qfv4ymeWant$eJ$J zvy|Y3U-DZ(YtF7C%eFtD0&XEkR!HO+*ebPm3%{b2x^Tb1MKW&15jId&8QI(;Mt}WH z@Dgv3obGUb-QVrmQ}d#u913=*>_%08L~hHB%t^0(SM3)NyV7DQ*YSf3<$tQe1pJMp za5R%hve&NC&W#J{`G-W@AIy6=^_6ugzCL$gtEE^ zT&2t8h}+@#MbF7N3mTp3Lr-=ZwqFPBP9553Vf#(c?$n|EI&8lU+MPPI--PXVLAz6j z_S>-CVRL!rP956s!gklZE`RM#9op~1c7!cpck0mo5VlinrUAc~hXM16fC=QBJPe={ z=+Q8HULGY(&_~1gd3lsD0U!+%=;cwu1cNjTp_fMq6ByDkhh82fOpr*!D0+F6FaaYC z)9B?ZAM=(ft@%cmce_#XhUbEYwpRVZcq0XFb%?%9j(C2{(bvHAy-upA+?un2?@3cp*h z^gRIp0AK=>J{cN+ZPLq1!$1@O(7oV4gxTAPU5H4ME(E_oKOi(?8)zmmGZkHGLF=RS z0aC?QQCc5h3vHFug5+mAeokYIE6HEVbX4ZtTfvxr70bjiSS~nCwHn6+OIY zm>U}Y@!wc?zP2Xe{{UB$Cr zV*Ds~6TuKa+Nl{t{XDLH$+^(T+AZpZFi7ndUxi|HBUgwI8!$bP6}qqDy(jBzax6Xq zS)uzJg{j@*&Lxa)|8sG2A;vee5gM%p0;?XAz#l&X6C9HPATk0s9FsL5k_83ZP}o+J z%pg<&9+M#}^BfFce8UmcT_AvFSq9h1u;EE~UDu=G6v z003YD000yK0000000031AOHXWQIirPK@9~D004MwFLQKxY-Mwk(H|g_fFce7x|5G0 zHUZ(2#v(ugz>^0fJOQhdL?a;^4z9I$tpWf5sR#f77ytkO000000RSKX007sMfFmmg JLm&VE0004B=e_^{ diff --git a/dags/mt/supply/data/美团69城市列表.xlsx b/dags/mt/supply/data/美团69城市列表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..0e9df008f88ab2e5f2ab468766b498f46967657a GIT binary patch literal 10175 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 DBV5C^ literal 0 HcmV?d00001 diff --git a/dags/mt/supply/data_stat.py b/dags/mt/supply/data_stat.py index 9a19e6b..2f9e10c 100644 --- a/dags/mt/supply/data_stat.py +++ b/dags/mt/supply/data_stat.py @@ -27,7 +27,11 @@ for city in cities: action['curr_city'] = city action['count'] = len(temp_df) for item in result_df.columns: - action[item] = round(len(temp_df[temp_df[item].notna()]) * 100 / len(temp_df), 2) + if item == 'deal_num' or item == 'school' or item == 'market' or item == 'subway' \ + or item == 'bank' or item == 'hospital': + action[item] = round(len(temp_df[temp_df[item] > 0]) * 100 / len(temp_df), 2) + else: + action[item] = round(len(temp_df[temp_df[item].notna()]) * 100 / len(temp_df), 2) if action['rent_price'] < 90: action['rent_flag'] = '租金覆盖率低于90%' if action['avg_price'] < 90: @@ -41,7 +45,7 @@ df.to_excel(aim_file_name, index=False) def deal_nan_val(x): if np.isnan(x['avg_price']): - x['avg_price'] = None + x['avg_price'] = None if np.isnan(x['rent_price']): x['rent_price'] = None if np.isnan(x['lng']): @@ -122,7 +126,8 @@ def save2_clickhouse(): # 删除旧数据 clickhouse_client.execute( "ALTER TABLE fangjia_stat.mt_community_stat DELETE WHERE city='" + city + "' and year_month = toDate('" + curr_month_start + "')") - clickhouse_client.to_sql(data=temp_df, table='mt_community_stat', engine='MergeTree', if_exists=False, order_by={'year_month'}) + clickhouse_client.to_sql(data=temp_df, table='mt_community_stat', engine='MergeTree', if_exists=False, + order_by={'year_month'}) def up_to_nextcloud(): diff --git a/dags/mt/supply/deal.py b/dags/mt/supply/deal.py index 09cfbf9..811470d 100644 --- a/dags/mt/supply/deal.py +++ b/dags/mt/supply/deal.py @@ -79,7 +79,6 @@ result_df['deal_num'].fillna(0, inplace=True) result_df['es_num'].fillna(0, inplace=True) result_df['deal_num'] += result_df['es_num'] result_df = result_df.drop(columns={'es_num'}) -result_df['deal_num'] = result_df['deal_num'].replace(0.0, None) # 暂时标识所有小区均未删除 result_df['status'] = 0 diff --git a/dags/mt/supply/facilitys.py b/dags/mt/supply/facilitys.py index 6231864..219ae8d 100644 --- a/dags/mt/supply/facilitys.py +++ b/dags/mt/supply/facilitys.py @@ -16,8 +16,6 @@ path = "/home/airflow/data/mt" output_date = sys.argv[1] if sys.argv[1] else dateutils.format_date(datetime.datetime.now(), '%Y%m') -seaweed_new_result_df = pd.read_csv(path + '/FJW_COMM_' + output_date + '.csv', sep='@', encoding='utf-8') - month_start = dateutils.format_date(dateutils.add_months(dateutils.parse_date(output_date, '%Y%m'), months=-1), '%Y%m') + '01' curr_month_start = output_date + '01' logging.info("日期信息:" + month_start + ' ' + curr_month_start) @@ -76,53 +74,62 @@ district_facilitys_new_df = district_facilitys_new_df.rename(columns={'district_ district_facilitys_new_df = district_facilitys_new_df.drop_duplicates(subset=['city', 'region', 'name'], keep='first') result_df = pd.read_csv(path + '/FJW_COMM_' + output_date + '.csv', sep='@', encoding='utf-8') +if 'school' in result_df.columns: + result_df = result_df.drop(columns=['school', 'bank', 'hospital', 'market', 'subway']) + result_df = pd.merge(result_df, district_facilitys_new_df, how='left', on=['city', 'region', 'name']) result_df.loc[:, 'district_facilitys'] = None # 剔除特别大的 def format_facilitys(x): - if type(x['school']) is not int: - x.school = 0 - else: - if x.school > 10: - x.school = 10 - - if type(x['bank']) is not int: - x.bank = 0 - else: - if x.bank > 30: - x.bank = 30 - - if type(x['hospital']) is not int: - x.hospital = 0 - else: - if x.hospital > 10: - x.hospital = 10 - if type(x['market']) is not int: - x.market = 0 - else: - if x.market > 15: - x.market = 15 - - if type(x['subway']) is not int: - x.subway = 0 - else: - if x.subway > 5: - x.subway = 5 - # 对于存在周边配套的输出字段 info = list() - if x.school > 0: - info.append('学校') - if x.market > 0: - info.append('商场') - if x.subway > 0: - info.append('地铁') - if x.bank > 0: - info.append('银行') - if x.hospital > 0: - info.append('医院') + + if 'school' in x: + if type(x['school']) is not int: + x.school = 0 + else: + if x.school > 0: + info.append('学校') + if x.school > 10: + x.school = 10 + if 'bank' in x: + if type(x['bank']) is not int: + x.bank = 0 + else: + if x.bank > 0: + info.append('银行') + if x.bank > 30: + x.bank = 30 + + if 'hospital' in x: + if type(x['hospital']) is not int: + x.hospital = 0 + else: + if x.hospital > 0: + info.append('医院') + if x.hospital > 10: + x.hospital = 10 + + if 'market' in x: + if type(x['market']) is not int: + x.market = 0 + else: + if x.market > 0: + info.append('商场') + if x.market > 15: + x.market = 15 + + if 'subway' in x: + if type(x['subway']) is not int: + x.subway = 0 + else: + if x.subway > 0: + info.append('地铁') + if x.subway > 5: + x.subway = 5 + x.district_facilitys = '、'.join(info) return x