From fb47d36048e94b9a506d5c153e3dd19a01e37df1 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 十月 2023 16:30:27 +0800
Subject: [PATCH] bug修复
---
third_data/kpl_block_util.py | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/third_data/kpl_block_util.py b/third_data/kpl_block_util.py
index debb990..53bfc80 100644
--- a/third_data/kpl_block_util.py
+++ b/third_data/kpl_block_util.py
@@ -124,45 +124,62 @@
# 鑾峰彇褰撴棩鍘嗗彶韬綅
# shsz:鏄惁涓绘澘
-def get_code_record_rank(code, block, limit_up_record_datas, code_limit_up_reason_dict, shsz=True):
+def get_code_record_rank(code, block, limit_up_record_datas, code_limit_up_reason_dict,
+ yesterday_current_limit_up_codes, shsz=True):
block_codes_infos = []
limit_up_time = time.time()
for k in limit_up_record_datas:
+ if k[3] == code:
+ # 鑾峰彇褰撳墠浠ｇ爜娑ㄥ仠鏃堕棿
+ limit_up_time = int(k[5])
if shsz and k[3].find("00") != 0 and k[3].find("60") != 0:
+ continue
+ # 鍓旈櫎楂樹綅鏉�
+ if k[3] in yesterday_current_limit_up_codes:
continue
if code_limit_up_reason_dict.get(k[3]) == block:
if k[3] != code:
block_codes_infos.append((k[3], int(k[5])))
- else:
- limit_up_time = int(k[5])
+
block_codes_infos.append((code, limit_up_time))
block_codes_infos.sort(key=lambda x: x[1])
+ front_codes = []
for i in range(0, len(block_codes_infos)):
if block_codes_infos[i][0] == code:
- return i
- return 0
+ return i, front_codes
+ else:
+ front_codes.append(block_codes_infos[i][0])
+ return 0, []
# 鑾峰彇褰撴棩瀹炴椂韬綅
# before_blocks_dict鏍煎紡浣峽"浠ｇ爜":set("鏉垮潡")}
-def get_code_current_rank(code, block, current_limit_up_datas, code_limit_up_reason_dict, shsz=False):
+def get_code_current_rank(code, block, current_limit_up_datas, code_limit_up_reason_dict,
+ yesterday_current_limit_up_codes, shsz=False):
block_codes_infos = []
limit_up_time = time.time()
for k in current_limit_up_datas:
+ if k[0] == code:
+ # 鑾峰彇褰撳墠浠ｇ爜娑ㄥ仠鏃堕棿
+ limit_up_time = int(k[2])
if shsz and k[0].find("00") != 0 and k[0].find("60") != 0:
+ continue
+ # 鍓旈櫎楂樹綅鏉�
+ if k[0] in yesterday_current_limit_up_codes:
continue
if code_limit_up_reason_dict.get(k[0]) == block:
if k[0] != code:
# 浠ｇ爜.娑ㄥ仠鏃堕棿
block_codes_infos.append((k[0], int(k[2])))
- else:
- limit_up_time = int(k[2])
block_codes_infos.append((code, limit_up_time))
block_codes_infos.sort(key=lambda x: x[1])
+ front_codes = []
for i in range(0, len(block_codes_infos)):
if block_codes_infos[i][0] == code:
- return i
- return 0
+ return i, front_codes
+ else:
+ front_codes.append(block_codes_infos[i][0])
+ return 0, []
if __name__ == "__main__":
--
Gitblit v1.8.0