[增强] 过滤盘前tick, 增加回交易日,日期,时间字段,便于日后数据搜索

This commit is contained in:
msincenselee 2019-12-06 10:49:58 +08:00
commit 56092fe759

View File

@ -58,7 +58,10 @@ from vnpy.trader.object import (
CancelRequest, CancelRequest,
SubscribeRequest, SubscribeRequest,
) )
from vnpy.trader.utility import get_folder_path from vnpy.trader.utility import (
get_folder_path,
get_trading_date
)
from vnpy.trader.event import EVENT_TIMER from vnpy.trader.event import EVENT_TIMER
@ -292,11 +295,21 @@ class CtpMdApi(MdApi):
return return
timestamp = f"{data['ActionDay']} {data['UpdateTime']}.{int(data['UpdateMillisec']/100)}" timestamp = f"{data['ActionDay']} {data['UpdateTime']}.{int(data['UpdateMillisec']/100)}"
dt = datetime.strptime(timestamp, "%Y%m%d %H:%M:%S.%f")
# 不处理开盘前的tick数据
if dt.hour in [8, 20] and dt.minute < 59:
return
if exchange is Exchange.CFFEX and dt.hour == 9 and dt.minute < 14:
return
tick = TickData( tick = TickData(
symbol=symbol, symbol=symbol,
exchange=exchange, exchange=exchange,
datetime=datetime.strptime(timestamp, "%Y%m%d %H:%M:%S.%f"), datetime=dt,
date=dt.strftime('%Y-%m-%d'),
time=dt.strftime('%H:%M:%S.%f'),
trading_day=get_trading_date(dt),
name=symbol_name_map[symbol], name=symbol_name_map[symbol],
volume=data["Volume"], volume=data["Volume"],
open_interest=data["OpenInterest"], open_interest=data["OpenInterest"],
@ -376,6 +389,7 @@ class CtpMdApi(MdApi):
Subscribe to tick data update. Subscribe to tick data update.
""" """
if self.login_status: if self.login_status:
self.gateway.write_log(f'订阅:{req.exchange} {req.symbol}')
self.subscribeMarketData(req.symbol) self.subscribeMarketData(req.symbol)
self.subscribed.add(req.symbol) self.subscribed.add(req.symbol)