From cd830d988be0dfacd4fd5fac30630ae509fdb71b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 05 六月 2024 16:14:51 +0800
Subject: [PATCH] 上证买入修改

---
 l2/l2_transaction_data_manager.py |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/l2/l2_transaction_data_manager.py b/l2/l2_transaction_data_manager.py
index 9089d03..2cb04ca 100644
--- a/l2/l2_transaction_data_manager.py
+++ b/l2/l2_transaction_data_manager.py
@@ -3,6 +3,7 @@
 """
 import json
 
+import l2_data_util
 from db import redis_manager
 from db.redis_manager_delegate import RedisUtils
 from l2 import l2_log
@@ -19,7 +20,7 @@
 
 class BigOrderDealManager:
     """
-    澶у崟鎴愪氦绠$悊
+    鎴愪氦澶у崟绠$悊
     """
     __total_buy_datas_dict = {}
     __total_sell_datas_dict = {}
@@ -83,6 +84,16 @@
             return 0
         return int(sum([x[2] for x in self.__total_buy_datas_dict[code]]))
 
+    def get_total_buy_count(self, code):
+        """
+        鑾峰彇澶у崟鎴愪氦鐨勭瑪鏁�
+        @param code:
+        @return:
+        """
+        if code not in self.__total_buy_datas_dict:
+            return 0
+        return len(self.__total_buy_datas_dict[code])
+
     def get_total_buy_money_list(self, code):
         """
         鑾峰彇澶у崟鍒楄〃
@@ -92,7 +103,6 @@
         if code not in self.__total_buy_datas_dict:
             return 0
         return [x[2] for x in self.__total_buy_datas_dict[code]]
-
 
     def get_total_sell_money(self, code):
         """
@@ -155,7 +165,7 @@
         return cls.__dealing_order_info_dict.get(code)
 
     @classmethod
-    def statistic_big_buy_data(cls, code, datas):
+    def statistic_big_buy_data(cls, code, datas, limit_up_price):
         """
         缁熻澶у崟涔�
         @param code:
@@ -164,6 +174,8 @@
         """
         big_buy_datas = []
         normal_buy_datas = []
+        # 澶у崟闃堝��
+        threshold_big_money = l2_data_util.get_big_money_val(limit_up_price)
         for data in datas:
             # q.append((data['SecurityID'], data['TradePrice'], data['TradeVolume'],
             #                   data['OrderTime'], data['MainSeq'], data['SubSeq'], data['BuyNo'],
@@ -184,7 +196,7 @@
                 deal_info = cls.__dealing_order_info_dict[code]
                 cls.__latest_deal_order_info_dict[code] = deal_info
                 # 鏄惁涓哄ぇ涔板崟
-                if deal_info[2] >= 2990000:
+                if deal_info[2] >= threshold_big_money:
                     big_buy_datas.append(deal_info)
                 if deal_info[2] >= 500000:
                     normal_buy_datas.append(deal_info)
@@ -287,21 +299,26 @@
         time_dict.clear()
 
     @classmethod
-    def get_latest_2s_continue_deal_volume(cls, code):
+    def get_latest_3s_continue_deal_volumes(cls, code):
         """
-        鑾峰彇鏈�杩戣繛缁�2s鐨勬垚浜ら噺
+        鑾峰彇鏈�杩�3s鐨勬垚浜ら噺鍒嗗竷
         @param code:
-        @return: 鎴愪氦閲�,璇︾粏淇℃伅
+        @return: [(鏃堕棿,閲�)]
         """
         deal_list = cls.__deal_volume_list_dict.get(code)
         if not deal_list:
             return 0, None
-        if len(deal_list) == 0:
-            return deal_list[0][1], deal_list
-        if tool.trade_time_sub(deal_list[-1][0], deal_list[-2][0]) > 1:
-            return deal_list[-1][1], deal_list
-        else:
-            return deal_list[-1][1] + deal_list[-2][1], deal_list
+        fdatas = [deal_list[-1]]
+        # 浠庡�掓暟绗簩涓暟鎹绠�
+        for i in range(len(deal_list) - 2, -1, -1):
+            if tool.trade_time_sub(fdatas[0][0], deal_list[i][0]) < 3:
+                fdatas.append(deal_list[i])
+        return fdatas
+
+    @classmethod
+    def clear_latest_deal_volume(cls, code):
+        if code in cls.__deal_volume_list_dict:
+            cls.__deal_volume_list_dict.pop(code)
 
     # 杩斿洖鏈�杩�1s鐨勫ぇ鍗曞崠锛�(鎬诲崠閲戦,[(鍗栧崟鍙�,鎬绘墜鏁�,浠锋牸,锛�'寮�濮嬫椂闂�',涔板崟鍙凤級,锛�'缁撴潫鏃堕棿',涔板崟鍙凤級),...])
     @classmethod

--
Gitblit v1.8.0