From c8b740733f0f9fcf438fc4606eea317011ebd8bd Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 28 四月 2023 16:42:47 +0800
Subject: [PATCH] 看盘页面及相关接口修改

---
 third_data/block_info.py |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/third_data/block_info.py b/third_data/block_info.py
index c0885f0..f9f2c11 100644
--- a/third_data/block_info.py
+++ b/third_data/block_info.py
@@ -29,12 +29,12 @@
 
 
 # (浠g爜, 鍚嶇О, 棣栨娑ㄥ仠鏃堕棿, 鏈�杩戞定鍋滄椂闂�, 鍑犳澘, 娑ㄥ仠鍘熷洜, 鏉垮潡, 瀹為檯娴侀��, 涓诲姏鍑�棰�)
-def __get_blocks(code, limit_up_datas):
+def __get_blocks(code, limit_up_datas, filter=True):
     blocks = []
     for data in limit_up_datas:
         if data[0] == code:
             block = data[5]
-            if block in kpl_data_manager.INVALID_BLOCKS:
+            if block in kpl_data_manager.INVALID_BLOCKS and filter:
                 continue
             blocks.append(block)
     return blocks
@@ -71,6 +71,24 @@
     latest_datas = __kplDataManager.get_data(kpl_util.KPLDataType.LIMIT_UP)
     blocks = __get_blocks(code, latest_datas)
     return blocks
+
+
+def get_target_block(code, filter=False):
+    latest_datas = __kplDataManager.get_data(kpl_util.KPLDataType.LIMIT_UP)
+    blocks = __get_blocks(code, latest_datas, filter)
+    if not blocks:
+        blocks = __load_before_block(code)
+        # 鑾峰彇鐩爣鏉垮潡
+    target_block = None
+    if blocks:
+        for block in blocks:
+            if block in kpl_data_manager.INVALID_BLOCKS and filter:
+                continue
+            target_block = block
+            break
+    if not target_block:
+        return None
+    return target_block
 
 
 # 鑾峰彇浠g爜鎵�鍦ㄦ澘鍧椾俊鎭�
@@ -140,6 +158,8 @@
                 code_ = d[3]
                 limit_up_codes_info_set.add((code_, d[5]))
                 block_codes_set.add(code_)
+            elif d[3]==code:
+                limit_up_codes_info_set.add((d[3], d[5]))
     # 鑾峰彇娑ㄥ仠鐨勯『搴�
     limit_up_index = -1
     limit_up_codes_info_list = list(limit_up_codes_info_set)

--
Gitblit v1.8.0