⚡️ fix(data_downloader): 修复数据缺失的警告,确保daily数据完整后再进行合并
This commit is contained in:
parent
995d724781
commit
e1c47616dd
@ -217,9 +217,6 @@ def download_stock_data(pro, ts_code, start_date, end_date):
|
|||||||
"""下载股票的所有类型数据并合并"""
|
"""下载股票的所有类型数据并合并"""
|
||||||
# 下载daily价格数据
|
# 下载daily价格数据
|
||||||
daily_df = pro.daily(ts_code=ts_code, start_date=start_date, end_date=end_date)
|
daily_df = pro.daily(ts_code=ts_code, start_date=start_date, end_date=end_date)
|
||||||
if daily_df.empty:
|
|
||||||
print(f"警告:{ts_code}没有找到daily数据")
|
|
||||||
return pd.DataFrame()
|
|
||||||
|
|
||||||
# 下载daily_basic数据
|
# 下载daily_basic数据
|
||||||
daily_basic_df = pro.daily_basic(ts_code=ts_code, start_date=start_date, end_date=end_date)
|
daily_basic_df = pro.daily_basic(ts_code=ts_code, start_date=start_date, end_date=end_date)
|
||||||
@ -227,6 +224,10 @@ def download_stock_data(pro, ts_code, start_date, end_date):
|
|||||||
# 下载moneyflow数据
|
# 下载moneyflow数据
|
||||||
moneyflow_df = pro.moneyflow(ts_code=ts_code, start_date=start_date, end_date=end_date)
|
moneyflow_df = pro.moneyflow(ts_code=ts_code, start_date=start_date, end_date=end_date)
|
||||||
|
|
||||||
|
if daily_df.empty or daily_basic_df.empty or moneyflow_df.empty:
|
||||||
|
print(f"警告:{ts_code}daily数据不全,无法合并")
|
||||||
|
return pd.DataFrame()
|
||||||
|
|
||||||
# 确保每个DataFrame都有trade_date列作为合并键
|
# 确保每个DataFrame都有trade_date列作为合并键
|
||||||
if 'trade_date' not in daily_df.columns:
|
if 'trade_date' not in daily_df.columns:
|
||||||
print(f"错误:{ts_code}的daily数据缺少trade_date列")
|
print(f"错误:{ts_code}的daily数据缺少trade_date列")
|
||||||
|
Loading…
Reference in New Issue
Block a user