From 11a349588bd3a277ef87ff186cb338093c7287f3 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 13 十二月 2023 17:10:56 +0800
Subject: [PATCH] 09:25之前订阅持仓代码的L2数据/修改代码板块的获取接口

---
 third_data/code_plate_key_manager.py |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 106f6cf..8b3b6eb 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -43,11 +43,8 @@
         final_blocks = copy.deepcopy(blocks)
         if len(blocks) > 2:
             final_blocks.clear()
-            # 鏍规嵁娑ㄥ箙鎺掑簭
-            blocks.sort(key=lambda x: x[2])
-            blocks.reverse()
             for b in blocks:
-                if b[1] not in constant.KPL_INVALID_BLOCKS:
+                if b not in constant.KPL_INVALID_BLOCKS:
                     final_blocks.append(b)
             if len(final_blocks) < 2:
                 final_blocks = blocks
@@ -100,7 +97,7 @@
                 if price_rate > 0.07:
                     jx_blocks_info = self.get_jx_blocks_cache(code)
                     if not jx_blocks_info:
-                        blocks = kpl_api.getCodeJingXuanBlocks(code)
+                        blocks = kpl_api.getCodeBlocks(code)
                         self.save_jx_blocks(code, blocks, current_limit_up_blocks)
                         async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�-{blocks}")
                     else:
@@ -118,14 +115,14 @@
 
                             if time.time() - jx_blocks_info[1] > UPDATE_TIME_SPACE:
                                 # 璺濈涓婃鏇存柊鏃堕棿杩囧幓浜�5鍒嗛挓
-                                blocks = kpl_api.getCodeJingXuanBlocks(code)
+                                blocks = kpl_api.getCodeBlocks(code)
                                 self.save_jx_blocks(code, blocks, current_limit_up_blocks)
                                 async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧楋紙鏇存柊锛�-{blocks}")
 
                 elif price_rate > 0.03:
                     # 娣诲姞澶囩敤鏉垮潡
                     if not self.get_jx_blocks_cache(code, by=True):
-                        blocks = kpl_api.getCodeJingXuanBlocks(code)
+                        blocks = kpl_api.getCodeBlocks(code)
                         self.save_jx_blocks(code, blocks, current_limit_up_blocks, by=True)
                         async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�(澶囩敤)-{blocks}")
         except Exception as e:
@@ -450,7 +447,7 @@
             jingxuan_block_info = self.__KPLCodeJXBlockManager.get_jx_blocks_cache(code, by=True)
         if jingxuan_block_info:
             jingxuan_blocks = jingxuan_block_info[0]
-            k4 |= set([x[1] for x in jingxuan_blocks])
+            k4 |= jingxuan_blocks  #set([x[1] for x in jingxuan_blocks])
         for k in [k1, k11, k2, k3, k4]:
             keys |= k
 

--
Gitblit v1.8.0