From ba52d7ac92a36f413eacaa686f8535e859664ec6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 28 八月 2023 09:45:11 +0800
Subject: [PATCH] bug修改
---
third_data/data_server.py | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/third_data/data_server.py b/third_data/data_server.py
index 19c6db8..24bb2de 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -59,7 +59,7 @@
for k in limit_up_reason_dict:
limit_up_reason_dict[k].sort(key=lambda x: int(x[5]))
# 缁熻鎯充拱鍗曟暟閲�
- want_codes = gpcode_manager.WantBuyCodesManager.list_code()
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
limit_up_reason_want_count_dict = {}
for d in total_datas:
if d[2] not in limit_up_reason_want_count_dict:
@@ -207,8 +207,8 @@
codes_set = set([d[0] for d in temps])
limit_up_dict, limit_up_codes, open_limit_up_codes = limit_up_data_filter.get_limit_up_info(codes_set)
score_dict = limit_up_data_filter.get_codes_scores_dict(codes_set)
- want_codes = gpcode_manager.WantBuyCodesManager.list_code()
- black_codes = BlackListCodeManager.list_codes()
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
+ black_codes = BlackListCodeManager().list_codes()
total_datas = KPLLimitUpDataRecordManager.total_datas
code_info_dict = {}
for val in total_datas:
@@ -371,15 +371,15 @@
continue
# 浠ｇ爜,鍚嶇О,娑ㄥ仠鏃堕棿,鏄惁鐐告澘,鏄惁鎯充拱,鏄惁宸茬粡涓嬭繃鍗�
codes_info.append(
- [d[3], d[4], tool.to_time_str(int(d[5])), d[3] not in now_limit_up_codes, False, False])
+ [d[3], d[4], tool.to_time_str(int(d[5])), 1 if d[3] not in now_limit_up_codes else 0, 0, 0])
codes_info.sort(key=lambda x: x[2])
# 鏌ヨ鏄惁涓烘兂涔板崟
- want_codes = gpcode_manager.WantBuyCodesManager.list_code()
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
for code_info in codes_info:
code_info[4] = 1 if code_info[0] in want_codes else 0
# 鑾峰彇浠ｇ爜鐘舵��
- if trade_manager.get_trade_state(code_info[0]) != trade_manager.TRADE_STATE_NOT_TRADE:
- code_info[5] = True
+ if trade_manager.CodesTradeStateManager().get_trade_state_cache(code_info[0]) != trade_manager.TRADE_STATE_NOT_TRADE:
+ code_info[5] = 1
response_data = json.dumps({"code": 0, "data": codes_info})
elif url.path == "/get_h_cancel_data":
@@ -391,9 +391,9 @@
l2_data_util.load_l2_data(code)
total_datas = l2_data_util.local_today_datas.get(code)
- trade_state = trade_manager.get_trade_state(code)
+ trade_state = trade_manager.CodesTradeStateManager().get_trade_state_cache(code)
if trade_state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or trade_state == trade_manager.TRADE_STATE_BUY_DELEGATED or trade_state == trade_manager.TRADE_STATE_BUY_SUCCESS:
- hcancel_datas_dict, cancel_indexes_set = HourCancelBigNumComputer.get_watch_index_dict(code)
+ hcancel_datas_dict, cancel_indexes_set = HourCancelBigNumComputer().get_watch_index_dict(code)
# 鏍规嵁鏃ュ織璇诲彇瀹炴椂鐨勮绠楁暟鎹�
h_cancel_latest_compute_info = log_export.get_h_cancel_compute_info(code)
if hcancel_datas_dict:
@@ -436,10 +436,11 @@
datas = self.__kplDataManager.get_from_file(kpl_util.KPLDataType.LIMIT_UP, day)
# (浠ｇ爜,鍚嶇О,棣栨娑ㄥ仠鏃堕棿,鏈�杩戞定鍋滄椂闂�,鍑犳澘,娑ㄥ仠鍘熷洜,鏉垮潡,瀹為檯娴侀��,涓诲姏鍑�棰�,娑ㄥ仠鍘熷洜浠ｇ爜,娑ㄥ仠鍘熷洜浠ｇ爜鏁伴噺)
result_list = []
- for d in datas:
- if d[5] == reason and d[0] != code:
- # (浠ｇ爜,鍚嶇О)
- result_list.append((d[0], d[1]))
+ if datas:
+ for d in datas:
+ if d[5] == reason and d[0] != code:
+ # (浠ｇ爜,鍚嶇О)
+ result_list.append((d[0], d[1]))
response_data = json.dumps({"code": 0, "data": {"reason": reason, "data": result_list}})
else:
response_data = json.dumps({"code": 1, "msg": "鏄ㄦ棩鏈定鍋�"})
@@ -498,7 +499,7 @@
code = d[0]
if code.find("00") == 0 or code.find("60") == 0:
limit_up_time = time.strftime("%H:%M:%S", time.localtime(d[2]))
- code_price_manager.Buy1PriceManager.set_limit_up_time(code, limit_up_time)
+ code_price_manager.Buy1PriceManager().set_limit_up_time(code, limit_up_time)
self.__kplDataManager.save_data(type_, result_list)
kpl_data_manager.KPLLimitUpDataRecordManager.save_record(tool.get_now_date_str(), result_list)
elif type_ == KPLDataType.OPEN_LIMIT_UP.value:
@@ -565,7 +566,9 @@
def run(addr, port):
# 杩愯鐪嬬洏娑堟伅閲囬泦
- kp_client_msg_manager.run_capture()
+ # kp_client_msg_manager.run_capture()
+ kpl_data_manager.run_pull_task()
+
handler = DataServer
# httpd = socketserver.TCPServer((addr, port), handler)
httpd = ThreadedHTTPServer((addr, port), handler)
--
Gitblit v1.8.0