Skip to content

Commit 5f52b7f

Browse files
author
yutiansut
committed
#
1 parent 9ab7207 commit 5f52b7f

File tree

3 files changed

+42
-3
lines changed

3 files changed

+42
-3
lines changed

QUANTAXIS/QAStrategy/qactabase.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import QUANTAXIS as QA
2020
from QUANTAXIS.QAStrategy.util import QA_data_futuremin_resample
2121
from QUANTAXIS.QIFI.QifiAccount import ORDER_DIRECTION, QIFI_Account
22+
from QUANTAXIS.QAMarket.market_preset import MARKET_PRESET
2223
from QUANTAXIS.QAEngine.QAThreadEngine import QA_Thread
2324
from QUANTAXIS.QAUtil.QAParameter import MARKET_TYPE, RUNNING_ENVIRONMENT
2425

@@ -62,7 +63,7 @@ def __init__(self, code='rb2005', frequence='1min', strategy_id='QA_STRATEGY', r
6263

6364
self.running_time = ''
6465

65-
self.market_preset = QA.QAARP.MARKET_PRESET()
66+
self.market_preset = MARKET_PRESET()
6667
self._market_data = []
6768
self.risk_check_gap = risk_check_gap
6869
self.latest_price = {}

QUANTAXIS/QAWebServer/qifiserver.py

+38-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from QUANTAXIS.QIFI.QifiManager import QA_QIFIMANAGER, QA_QIFISMANAGER
66
class QAQIFI_Handler(QABaseHandler):
77
#manager = QA_QIFIMANAGER(mongo_ip)
8-
manager = QA_QIFISMANAGER(mongo_ip,model='REALTIME')
8+
manager = QA_QIFISMANAGER(mongo_ip,model='BACKTEST')
99

1010
def get(self):
1111
action = self.get_argument('action', 'acchistory')
@@ -98,6 +98,43 @@ def get(self):
9898

9999

100100
class QAQIFIS_Handler(QABaseHandler):
101+
#manager = QA_QIFIMANAGER(mongo_ip)
102+
manager = QA_QIFISMANAGER(mongo_ip,model='BACKTEST')
103+
104+
def get(self):
105+
action = self.get_argument('action', 'acchistory')
106+
107+
if action == 'accountlist':
108+
res = self.manager.get_allaccountname()
109+
self.write({'res': res})
110+
elif action == 'portfoliolist':
111+
res = self.manager.get_allportfolio()
112+
self.write({'res': res})
113+
elif action == 'accountinportfolio':
114+
portfolio = self.get_argument('portfolio', 't12')
115+
res = self.manager.get_portfolio_panel(portfolio)
116+
117+
self.write({'res': QA_util_to_json_from_pandas(res)})
118+
119+
def post(self):
120+
action = self.get_argument('action', 'change_name')
121+
if action == 'drop_account':
122+
123+
account_cookie = self.get_argument('account_cookie')
124+
res = self.manager.drop_account(account_cookie)
125+
self.write({
126+
'res': res,
127+
'status': 200
128+
})
129+
elif action == 'drop_many':
130+
account_cookies = self.get_argument('account_cookies')
131+
res = self.manager.drop_many(account_cookies)
132+
self.write({
133+
'res': res,
134+
'status': 200
135+
})
136+
137+
class QAQIFIS_REALTIME_Handler(QABaseHandler):
101138
#manager = QA_QIFIMANAGER(mongo_ip)
102139
manager = QA_QIFISMANAGER(mongo_ip,model='REALTIME')
103140

QUANTAXIS/QAWebServer/server.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
from QUANTAXIS.QAWebServer.schedulehandler import (QAScheduleQuery,
3636
QASchedulerHandler,
3737
init_scheduler)
38-
from QUANTAXIS.QAWebServer.qifiserver import QAQIFI_Handler, QAQIFIS_Handler
38+
from QUANTAXIS.QAWebServer.qifiserver import QAQIFI_Handler, QAQIFIS_Handler, QAQIFIS_REALTIME_Handler
3939
from tornado.options import (define, options, parse_command_line,
4040
parse_config_file)
4141
from tornado.web import Application, RequestHandler, authenticated
@@ -71,6 +71,7 @@ def get(self):
7171
(r"/scheduler/query", QAScheduleQuery),
7272
(r"/qifi", QAQIFI_Handler),
7373
(r"/qifis", QAQIFIS_Handler),
74+
(r"/qifirealtime", QAQIFIS_REALTIME_Handler),
7475
(r"/user", QAUserhander)
7576

7677
]

0 commit comments

Comments
 (0)