From d0fd153d07f9bd41cf0a30ddce30402eaef83da3 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 14 十一月 2023 09:26:46 +0800
Subject: [PATCH] A类/B类一键切换

---
 third_data/code_plate_key_manager.py |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 21662e2..774ff1a 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -467,29 +467,36 @@
         # msg_list.append(f"\n瀹炴椂top10(娑ㄥ仠鏁伴噺锛歿len(current_limit_up_datas)})")
         # msg_list.append(f"鍘嗗彶top20(娑ㄥ仠鏁伴噺锛歿len(top_8_record)})")
 
-        # 闇�瑕佹帓闄ょ殑浠g爜
-        exclude_codes = HighIncreaseCodeManager().list_all()
+        # 闇�瑕佹帓闄ょ殑鑰佸ぇ鐨勪唬鐮�
+        exclude_first_codes = HighIncreaseCodeManager().list_all()
+
+        # 鑾峰彇涓绘澘寮�1鐨勪唬鐮�
+        open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
+                                                                          code_limit_up_reason_dict)
+        # 鍓旈櫎楂樹綅鏉�
+        if open_limit_up_codes and yesterday_current_limit_up_codes:
+            open_limit_up_codes -= yesterday_current_limit_up_codes
+
 
         # 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉�
         current_shsz_rank, front_current_shsz_rank_codes = kpl_block_util.get_code_current_rank(code, block,
                                                                                                 current_limit_up_datas,
                                                                                                 code_limit_up_reason_dict,
                                                                                                 yesterday_current_limit_up_codes,
-                                                                                                exclude_codes,
+                                                                                                exclude_first_codes,
+                                                                                                len(open_limit_up_codes),
                                                                                                 shsz=True)
         record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
                                                                                        limit_up_record_datas,
                                                                                        code_limit_up_reason_dict,
                                                                                        yesterday_current_limit_up_codes,
                                                                                        shsz=True)
-        # 鑾峰彇涓绘澘鍘嗗彶韬綅
-        open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
-                                                                          code_limit_up_reason_dict)
+
         if open_limit_up_codes:
             # 涓绘澘寮�1
             if current_shsz_rank < len(open_limit_up_codes) + 1 and record_shsz_rank < len(open_limit_up_codes) + 2:
                 # 灞炰簬榫�1,榫�2
-                return True, f"{tool.get_now_time_str()} {block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({open_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(open_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank}/{len(current_limit_up_datas)})"
+                return True, f"{tool.get_now_time_str()} {block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({open_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(open_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank}:{front_current_shsz_rank_codes}/{len(current_limit_up_datas)})"
             else:
                 if record_shsz_rank >= len(open_limit_up_codes) + 1:
                     cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}")

--
Gitblit v1.8.0