From c32b8cbd6f5da8059f742f8d76010307b2e58cf8 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 27 七月 2023 15:03:30 +0800
Subject: [PATCH] bug修复
---
third_data/kpl_block_util.py | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/third_data/kpl_block_util.py b/third_data/kpl_block_util.py
index 248bd0e..debb990 100644
--- a/third_data/kpl_block_util.py
+++ b/third_data/kpl_block_util.py
@@ -13,15 +13,16 @@
# 鏄惁涓绘澘寮�1
# limit_up_record_datas 浠婃棩鍘嗗彶娑ㄥ仠
-def is_shsz_open_limit_up(code, block, limit_up_record_datas, code_block_dict):
+def get_shsz_open_limit_up_codes(code, block, limit_up_record_datas, code_block_dict):
# 鑾峰彇浠婃棩9锛�30鐨勬椂闂存埑
time_str = datetime.datetime.now().strftime("%Y-%m-%d") + " 09:30:00"
timestamp = time.mktime(time.strptime(time_str, '%Y-%m-%d %H:%M:%S'))
+ limit_up_codes = set()
for k in limit_up_record_datas:
if code_block_dict.get(k[3]) == block:
if int(k[5]) < timestamp:
- return True, f"{k[3]}寮�涓�"
- return False, ""
+ limit_up_codes.add(k[3])
+ return limit_up_codes
# 浠ｇ爜鏄惁鏄悗鎺�
@@ -87,12 +88,12 @@
return False, block_codes_infos[:topn]
-def is_record_top_block(code, block, limit_up_record_datas, topn):
+def is_record_top_block(code, block, limit_up_record_datas, yesterday_current_limit_up_codes, topn):
block_codes_infos = []
limit_up_time = time.time()
for k in limit_up_record_datas:
- # 鍓旈櫎楂樹綅浠ｇ爜
- if k[12] != '棣栨澘':
+ # 鍒ゆ柇鏄惁鏄鏉�
+ if k[0] in yesterday_current_limit_up_codes:
continue
if k[3] != code:
@@ -104,11 +105,12 @@
return __is_top_block(block, block_codes_infos, topn)
-def is_current_top_block(code, block, current_limit_up_datas, topn):
+def is_current_top_block(code, block, current_limit_up_datas, yesterday_current_limit_up_codes, topn):
block_codes_infos = []
limit_up_time = time.time()
for k in current_limit_up_datas:
- if k[4] != '棣栨澘':
+ # 鍒ゆ柇鏄惁鏄鏉�
+ if k[0] in yesterday_current_limit_up_codes:
continue
if k[0] != code:
block_codes_infos.append((k[0], k[5], int(k[2])))
--
Gitblit v1.8.0