xm

utils/redis_client.py

@@ -2,8 +2,9 @@ import asyncio
 import redis
 import json
 import re
+import time
 from loguru import logger
-from config.settings import REDIS_CONFIG, COMPUTER_NAMES, COMPUTER_NAME_PATTERN
+from config.settings import REDIS_CONFIG, COMPUTER_NAMES, COMPUTER_NAME_PATTERN,SYNC_CONFIG
 import utils.helpers as helpers
 from typing import List, Dict, Any, Set, Tuple, Optional
 from datetime import datetime, timedelta
@@ -382,7 +383,6 @@ class RedisClient:
                 return []
             
             # 按天统计数据
-            from config.settings import SYNC_CONFIG
             recent_days = SYNC_CONFIG['recent_days']
             
             today = datetime.now()
@@ -410,8 +410,11 @@ class RedisClient:
                             'withdrawal': 0.0,
                             'has_balance': False
                         }
+                    if fund_data.get('lz_amount'):
+                        lz_amount = float(fund_data.get('lz_amount', 0))
+                    else:
+                        lz_amount = float(fund_data.get('lz_money', 0))
                     
-                    lz_amount = float(fund_data.get('lz_amount', 0))
                     
                     if lz_type == 'lz_balance':
                         date_stats[date_str]['balance'] = lz_amount
@@ -494,7 +497,134 @@ class RedisClient:
         
         return prev_balance_map
     
+    
+    async def _collect_all_orders(self, accounts: Dict[str, Dict]) -> List[Dict]:
+        """收集所有账号的订单数据"""
+        all_orders = []
+        
+        try:
+            # 按交易所分组账号
+            account_groups = self._group_accounts_by_exchange(accounts)
+            
+            # 并发收集每个交易所的数据
+            tasks = []
+            for exchange_id, account_list in account_groups.items():
+                task = self._collect_exchange_orders(exchange_id, account_list)
+                tasks.append(task)
+            
+            # 等待所有任务完成并合并结果
+            results = await asyncio.gather(*tasks, return_exceptions=True)
+            
+            for result in results:
+                if isinstance(result, list):
+                    all_orders.extend(result)
+            
+        except Exception as e:
+            logger.error(f"收集订单数据失败: {e}")
+        
+        return all_orders
 
+    async def _collect_exchange_orders(self, exchange_id: str, account_list: List[Dict]) -> List[Dict]:
+        """收集某个交易所的订单数据"""
+        orders_list = []
+        
+        try:
+            # 并发获取每个账号的数据
+            tasks = []
+            for account_info in account_list:
+                k_id = int(account_info['k_id'])
+                st_id = account_info.get('st_id', 0)
+                task = self._get_recent_orders_from_redis(k_id, st_id, exchange_id)
+                tasks.append(task)
+            
+            results = await asyncio.gather(*tasks, return_exceptions=True)
+            
+            for result in results:
+                if isinstance(result, list):
+                    orders_list.extend(result)
+            
+            logger.debug(f"交易所 {exchange_id}: 收集到 {len(orders_list)} 条订单")
+            
+        except Exception as e:
+            logger.error(f"收集交易所 {exchange_id} 订单数据失败: {e}")
+        
+        return orders_list
+    
+    async def _get_recent_orders_from_redis(self, k_id: int, st_id: int, exchange_id: str) -> List[Dict]:
+        """从Redis获取最近N天的订单数据"""
+        try:
+            redis_key = f"{exchange_id}:orders:{k_id}"
+            recent_days = SYNC_CONFIG['recent_days']
+            # 计算最近N天的日期
+            today = datetime.now()
+            recent_dates = []
+            for i in range(recent_days):
+                date = today - timedelta(days=i)
+                date_format = date.strftime('%Y-%m-%d')
+                recent_dates.append(date_format)
+            
+            # 使用scan获取所有符合条件的key
+            cursor = 0
+            recent_keys = []
+            
+            while True:
+                cursor, keys = self.client.hscan(redis_key, cursor, count=1000)
+                
+                for key, _ in keys.items():
+                    key_str = key.decode('utf-8') if isinstance(key, bytes) else key
+                    
+                    if key_str == 'positions':
+                        continue
+                    
+                    # 检查是否以最近N天的日期开头
+                    for date_format in recent_dates:
+                        if key_str.startswith(date_format + '_'):
+                            recent_keys.append(key_str)
+                            break
+                
+                if cursor == 0:
+                    break
+            
+            if not recent_keys:
+                return []
+            
+            # 批量获取订单数据
+            orders_list = []
+            
+            # 分批获取，避免单次hgetall数据量太大
+            chunk_size = 500
+            for i in range(0, len(recent_keys), chunk_size):
+                chunk_keys = recent_keys[i:i + chunk_size]
+                
+                # 使用hmget批量获取
+                chunk_values = self.client.hmget(redis_key, chunk_keys)
+                
+                for key, order_json in zip(chunk_keys, chunk_values):
+                    if not order_json:
+                        continue
+                    
+                    try:
+                        order = json.loads(order_json)
+                        
+                        # 验证时间
+                        order_time = order.get('time', 0)
+                        if order_time >= int(time.time()) - recent_days * 24 * 3600:
+                            # 添加账号信息
+                            order['k_id'] = k_id
+                            order['st_id'] = st_id
+                            order['exchange_id'] = exchange_id
+                            orders_list.append(order)
+                            
+                    except json.JSONDecodeError as e:
+                        logger.debug(f"解析订单JSON失败: key={key}, error={e}")
+                        continue
+            
+            return orders_list
+            
+        except Exception as e:
+            logger.error(f"获取Redis订单数据失败: k_id={k_id}, error={e}")
+            return []
+    
 
     def close(self):
         """关闭连接池"""