From 5ef51b8c5e33045e1e32af8d48f8c752cb505f1e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 27 七月 2023 16:47:47 +0800
Subject: [PATCH] bug修复
---
third_data/data_server.py | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/third_data/data_server.py b/third_data/data_server.py
index aed7207..2f9d561 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -42,38 +42,34 @@
def __get_limit_up_list(self):
# 缁熻鐩墠涓烘鐨勪唬鐮佹定鍋滄暟閲忥紙鍒嗘定鍋滃師鍥狅級
- now_limit_up_codes_info = self.__kplDataManager.get_data(KPLDataType.LIMIT_UP)
- limit_up_reason_dict = {}
- if now_limit_up_codes_info:
- for d in now_limit_up_codes_info:
- if d[5] not in limit_up_reason_dict:
- limit_up_reason_dict[d[5]] = [0, 0]
- limit_up_reason_dict[d[5]][0] += 1
- # 鑾峰彇鎯充拱鍘熷洜鎯充拱鍗曠殑浠ｇ爜鏁伴噺
- reason_map = self.__KPLCodeLimitUpReasonManager.list_all()
- want_codes = gpcode_manager.WantBuyCodesManager.list_code()
- # 鍏朵粬鎯充拱鍗�
- other_count = 0
- for k in reason_map:
- reson = reason_map[k]
- if k in want_codes and reson in limit_up_reason_dict:
- limit_up_reason_dict[reson][1] += 1
- elif k in want_codes:
- other_count += 1
-
- limit_up_reason_statistic_info = [(k, limit_up_reason_dict[k][0], limit_up_reason_dict[k][1]) for k in
- limit_up_reason_dict]
- limit_up_reason_statistic_info.sort(key=lambda x: x[1])
- limit_up_reason_statistic_info.reverse()
- if other_count > 0:
- limit_up_reason_statistic_info.insert(0, ('鍏朵粬', other_count, other_count))
-
total_datas = KPLLimitUpDataRecordManager.total_datas
if not total_datas:
KPLLimitUpDataRecordManager.load_total_datas()
total_datas = KPLLimitUpDataRecordManager.total_datas
# 閫氳繃娑ㄥ仠鏃堕棿鎺掑簭
total_datas = list(total_datas)
+
+ # 缁熻娑ㄥ仠鍘熷洜
+ limit_up_reason_dict = {}
+ for d in total_datas:
+ if d[2] not in limit_up_reason_dict:
+ limit_up_reason_dict[d[2]] = []
+ limit_up_reason_dict[d[2]].append(d)
+ 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()
+ limit_up_reason_want_count_dict = {}
+ for d in total_datas:
+ if d[2] not in limit_up_reason_want_count_dict:
+ limit_up_reason_want_count_dict[d[2]] = 0
+ limit_up_reason_want_count_dict[d[2]] += 1
+
+ limit_up_reason_statistic_info = [
+ (k, len(limit_up_reason_dict[k]), limit_up_reason_want_count_dict.get(k), limit_up_reason_dict[k][0][5]) for
+ k in
+ limit_up_reason_dict]
+ limit_up_reason_statistic_info.sort(key=lambda x: int(x[3]))
codes_set = set([d[3] for d in total_datas])
# 鍒ゆ柇鏄緳鍑狅紝鍒ゆ柇鏄惁娑ㄥ仠锛屽垽鏂槸鍚︾偢鏉匡紝鍔犺浇鍒嗘暟
@@ -298,7 +294,7 @@
self.__blocks_dict[code] = (time.time(), data["kpl_code_info"]["plate"])
response_data = json.dumps({"code": 0, "data": data})
- print("get_score_info 鑰楁椂锛�", time.time()-start_time)
+ print("get_score_info 鑰楁椂锛�", time.time() - start_time)
# 鑾峰彇璇勫垎淇℃伅
pass
@@ -360,15 +356,28 @@
# 鑾峰彇鏉垮潡涓嬬殑浠ｇ爜
# 缁熻鐩墠涓烘鐨勪唬鐮佹定鍋滄暟閲忥紙鍒嗘定鍋滃師鍥狅級
now_limit_up_codes_info = self.__kplDataManager.get_data(KPLDataType.LIMIT_UP)
+ now_limit_up_codes = set([d[0] for d in now_limit_up_codes_info])
+ # 鑾峰彇鍘嗗彶娑ㄥ仠
+ record_limit_up_datas = KPLLimitUpDataRecordManager.total_datas
+ if not record_limit_up_datas:
+ KPLLimitUpDataRecordManager.load_total_datas()
+ record_limit_up_datas = KPLLimitUpDataRecordManager.total_datas
+
codes_info = []
- for d in now_limit_up_codes_info:
- if d[5] != plate:
+ for d in record_limit_up_datas:
+ if d[2] != plate:
continue
- codes_info.append([d[0], d[1], 0])
+ # 浠ｇ爜,鍚嶇О,娑ㄥ仠鏃堕棿,鏄惁鐐告澘,鏄惁鎯充拱,鏄惁宸茬粡涓嬭繃鍗�
+ codes_info.append([d[3], d[4], tool.to_time_str(d[5]), d[3] not in now_limit_up_codes, False, False])
+ codes_info.sort(key=lambda x: x[2])
# 鏌ヨ鏄惁涓烘兂涔板崟
want_codes = gpcode_manager.WantBuyCodesManager.list_code()
for code_info in codes_info:
- code_info[2] = 1 if code_info[0] in want_codes else 0
+ 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
+
response_data = json.dumps({"code": 0, "data": codes_info})
elif url.path == "/get_h_cancel_data":
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
--
Gitblit v1.8.0