From cf89766b43b7e5601220e5144edab8ee9307a8ad Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 26 三月 2025 17:29:03 +0800
Subject: [PATCH] 新题材拉黑机制修改

---
 l2/l2_transaction_data_manager.py |  103 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/l2/l2_transaction_data_manager.py b/l2/l2_transaction_data_manager.py
index f8ecf3c..4594b34 100644
--- a/l2/l2_transaction_data_manager.py
+++ b/l2/l2_transaction_data_manager.py
@@ -314,12 +314,14 @@
     @classmethod
     def statistic_big_sell_data(cls, code, fdatas):
         """
-        缁熻澶у崠鍗�
+        缁熻澶у崠鍗�(299w浠ヤ笂)
         @param code:
         @param fdatas: [(鏁版嵁鏈韩, 鏄惁涓诲姩涔�, 鏄惁娑ㄥ仠, 鎬绘垚浜ら, 涓嶅惈ms鏃堕棿锛屽惈ms鏃堕棿)]
         @return: 杩斿洖鏁版嵁閲岄潰鎴愪氦鐨勫ぇ鍗�
         """
         big_sell_datas = []
+        # 姝e湪鎴愪氦鐨勫崠鍗�
+        dealing_order_info = cls.__dealing_order_info_dict.get(code)
         for data in fdatas:
             if not data[2]:
                 # 鍙绠楁澘涓婃垚浜�
@@ -328,23 +330,28 @@
             # q.append((data['SecurityID'], data['TradePrice'], data['TradeVolume'],
             #                   data['OrderTime'], data['MainSeq'], data['SubSeq'], data['BuyNo'],
             #                   data['SellNo'], data['ExecType']))
-            if code not in cls.__dealing_order_info_dict:
+            if dealing_order_info is None:
                 # 鏁版嵁鏍煎紡[璁㈠崟鍙凤紝鎬昏偂鏁帮紝鎴愪氦閲戦]
-                cls.__dealing_order_info_dict[code] = [data[0][7], data[0][2], money]
-            if cls.__dealing_order_info_dict[code][0] == data[0][7]:
-                # 鎴愪氦鍚屼竴涓鍗曞彿
-                cls.__dealing_order_info_dict[code][1] += data[0][2]
-                cls.__dealing_order_info_dict[code][2] += money
+                dealing_order_info = [data[0][7], data[0][2], money]
             else:
-                # 淇濆瓨涓婁竴鏉℃暟鎹�
-                l2_log.info(code, hx_logger_l2_transaction_desc, f"{code}#{cls.__dealing_order_info_dict[code]}")
-                # 璁剧疆鏈�杩戞垚浜ゅ畬鎴愮殑涓�鏉℃暟鎹�
-                deal_info = cls.__dealing_order_info_dict[code]
-                # 鏄惁涓哄ぇ涔板崟
-                if deal_info[2] >= 2990000:
-                    big_sell_datas.append(deal_info)
-                # 鍒濆鍖栨湰鏉℃暟鎹�
-                cls.__dealing_order_info_dict[code] = [data[0][7], data[0][2], money]
+                if dealing_order_info[0] == data[0][7]:
+                    # 鎴愪氦鍚屼竴涓鍗曞彿
+                    dealing_order_info[1] += data[0][2]
+                    dealing_order_info[2] += money
+                else:
+                    # 淇濆瓨涓婁竴鏉℃暟鎹�
+                    # 璁剧疆鏈�杩戞垚浜ゅ畬鎴愮殑涓�鏉℃暟鎹�
+                    deal_info = dealing_order_info
+                    # 淇濆瓨涓婁竴鏉℃暟鎹�
+                    if deal_info[2] >= 2990000:
+                        # 鏄惁涓哄ぇ涔板崟
+                        l2_log.info(code, hx_logger_l2_transaction_desc,
+                                    f"{code}#{deal_info}")
+                        big_sell_datas.append(deal_info)
+                    # 鍒濆鍖栨湰鏉℃暟鎹�
+                    dealing_order_info = [data[0][7], data[0][2], money]
+        # 淇濆瓨鏈�鍚庝竴鏉℃暟鎹殑鐘舵��
+        cls.__dealing_order_info_dict[code] = dealing_order_info
         return big_sell_datas
 
     # 缁熻鎵�鏈夌殑鎴愪氦閲�
@@ -460,33 +467,47 @@
         use_time = time.time() - __start_time
         __start_time = time.time()
         use_time_list.append(("澶勭悊娑ㄥ仠鍗�", use_time))
+        latest_sell_order = cls.__latest_sell_order_dict.get(code)
+        big_sell_order_ids = cls.__big_sell_order_ids_dict.get(code)
+        if big_sell_order_ids is None:
+            big_sell_order_ids = set()
+        big_sell_order_info = cls.__big_sell_order_info_dict.get(code)
+        if big_sell_order_info is None:
+            big_sell_order_info = {}
+        big_sell_order_info_list = cls.__big_sell_order_info_list_dict.get(code)
+        if big_sell_order_info_list is None:
+            big_sell_order_info_list = []
+
+        latest_all_sell_orders = cls.__latest_all_sell_orders_dict.get(code)
+        if latest_all_sell_orders is None:
+            latest_all_sell_orders = []
+
+        last_trade_data = cls.__last_trade_data_dict.get(code)
         for d in fdatas:
             # 鑾峰彇褰撳墠鏄惁涓轰富鍔ㄤ拱
+            if d[1]:
+                # 涓诲姩涔�
+                continue
             try:
-                if d[1]:
-                    # 涓诲姩涔�
-                    continue
                 if d[2]:
                     # 娑ㄥ仠涓诲姩鍗�
                     L2TradeSingleDataProcessor.add_active_limit_up_sell_data(d[0])
 
                 # 鍒ゆ柇鏄惁鏄定鍋滆鍔ㄥ彉涓诲姩
-                last_trade_data = cls.__last_trade_data_dict.get(code)
                 if last_trade_data and last_trade_data[1] and last_trade_data[2]:
                     if d[2]:
                         # 娑ㄥ仠琚姩鍙樹富鍔�
                         L2TradeSingleDataManager.set_sell_passive_to_active_datas(code, last_trade_data[0], d[0])
                 # cls.__latest_sell_order_info_list_dict[code].append(d)
-                if code not in cls.__latest_sell_order_dict:
-                    cls.__latest_sell_order_dict[code] = [d[0][7], d[0][2], d[0][1], (d[0][3], d[0][6]),
-                                                          (d[0][3], d[0][6])]
+                if latest_sell_order is None:
+                    latest_sell_order = [d[0][7], d[0][2], d[0][1], (d[0][3], d[0][6]), (d[0][3], d[0][6])]
                 else:
-                    if cls.__latest_sell_order_dict[code][0] == d[0][7]:
-                        cls.__latest_sell_order_dict[code][1] += d[0][2]
-                        cls.__latest_sell_order_dict[code][2] = d[0][1]
-                        cls.__latest_sell_order_dict[code][4] = (d[0][3], d[0][6])
+                    if latest_sell_order[0] == d[0][7]:
+                        latest_sell_order[1] += d[0][2]
+                        latest_sell_order[2] = d[0][1]
+                        latest_sell_order[4] = (d[0][3], d[0][6])
                     else:
-                        info = cls.__latest_sell_order_dict[code]
+                        info = latest_sell_order
 
                         # 涓婁釜鍗栧崟鎴愪氦瀹屾垚
                         # 灏佸瓨鏁版嵁锛岃绠楁柊璧风偣
@@ -494,22 +515,34 @@
                         # 澶т簬50w鍔犲叆鍗栧崟
                         money = info[1] * info[2]
                         if money >= 500000:
-                            cls.__big_sell_order_ids_dict[code].add(info[0])
-                            cls.__big_sell_order_info_dict[code][info[0]] = info
-                            cls.__big_sell_order_info_list_dict[code].append(info)
+                            big_sell_order_ids.add(info[0])
+                            big_sell_order_info[info[0]] = info
+                            big_sell_order_info_list.append(info)
                         # 鍙繚鐣�10w浠ヤ笂鐨勫崟
                         if money > 100000:
-                            cls.__latest_all_sell_orders_dict[code].append(info)
+                            latest_all_sell_orders.append(info)
                             l2_log.info(code, hx_logger_l2_transaction_sell_order,
                                         f"{info}")
                         if limit_up_price == info[2]:
                             # 灏嗘定鍋滀富鍔ㄥ崠璁板叆鏃ュ織
                             l2_log.info(code, hx_logger_l2_active_sell, f"{info}")
 
-                        cls.__latest_sell_order_dict[code] = [d[0][7], d[0][2], d[0][1], (d[0][3], d[0][6]),
-                                                              (d[0][3], d[0][6])]
+                        latest_sell_order = [d[0][7], d[0][2], d[0][1], (d[0][3], d[0][6]),
+                                             (d[0][3], d[0][6])]
             finally:
-                cls.__last_trade_data_dict[code] = d
+                last_trade_data = d
+
+        cls.__last_trade_data_dict[code] = last_trade_data
+        if latest_sell_order:
+            cls.__latest_sell_order_dict[code] = latest_sell_order
+        if big_sell_order_ids:
+            cls.__big_sell_order_ids_dict[code] = big_sell_order_ids
+        if  big_sell_order_info:
+            cls.__big_sell_order_info_dict[code] = big_sell_order_info
+        if  big_sell_order_info_list:
+            cls.__big_sell_order_info_list_dict[code] = big_sell_order_info_list
+        if  latest_all_sell_orders:
+            cls.__latest_all_sell_orders_dict[code] = latest_all_sell_orders
 
         use_time = time.time() - __start_time
         __start_time = time.time()

--
Gitblit v1.8.0