diff --git a/dags/ai/stock/stock.py b/dags/ai/stock/stock.py index 5ce5775..8bca98f 100644 --- a/dags/ai/stock/stock.py +++ b/dags/ai/stock/stock.py @@ -11,8 +11,8 @@ db_util = MysqlClient( password="Goojia123456" ) date = int(dateutils.format_date(dateutils.add_months(datetime.today(), months=-1), fm='%Y%m%d')) -select_stocks = db_util.scan_by_sql_to_data_frame("select ts_code as 股票代码, stock_name as 股票名称,close as 股价, pe as PE,turnover_rate as 换手率 from mu_stocks where `year_month`= (select max(`year_month`) from mu_stocks)") -stat = db_util.scan_by_sql_to_data_frame(f"select ts_code as 股票代码, count(ts_code) as 命中次数 from mu_stocks where `year_month` > {date} group by ts_code") +select_stocks = db_util.scan_by_sql_to_data_frame("select ts_code as 股票代码, stock_name as 股票名称,close as 股价, pe as PE,turnover_rate as 换手率 from mu_stocks_new where `trade_date`= (select max(`trade_date`) from mu_stocks_new)") +stat = db_util.scan_by_sql_to_data_frame(f"select ts_code as 股票代码, count(ts_code) as 命中次数 from mu_stocks_new where `trade_date` > {date} group by ts_code") select_stocks = select_stocks.merge(stat, on='股票代码', how='left') select_stocks['命中次数'] = select_stocks['命中次数'].fillna(0) select_stocks = select_stocks.sort_values(by=['命中次数', 'PE'], ascending=[False, True])