From a3c05bddc4c61d63b804ee541cf6dd01717ba94d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 02 八月 2023 16:39:08 +0800
Subject: [PATCH] redis封装

---
 l2/safe_count_manager.py |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/l2/safe_count_manager.py b/l2/safe_count_manager.py
index 6a5d023..4ed9cf0 100644
--- a/l2/safe_count_manager.py
+++ b/l2/safe_count_manager.py
@@ -4,6 +4,7 @@
 # 涓嬪崟L2鐨勫畨鍏ㄧ瑪鏁扮鐞�
 import json
 
+from db.redis_manager import RedisUtils
 from l2 import l2_data_source_util
 from trade import l2_trade_factor
 from db import redis_manager
@@ -23,13 +24,13 @@
     # 璁板綍姣忎竴娆$殑澶勭悊杩涘害
     def __save_compute_progress(self, code, last_buy_single_index, process_index, buy_num, cancel_num):
         key = "safe_count_l2-{}-{}".format(code, last_buy_single_index)
-        self.__getRedis().setex(key, tool.get_expire(),
-                                json.dumps((last_buy_single_index, process_index, buy_num, cancel_num)))
+        RedisUtils.setex(self.__getRedis(), key, tool.get_expire(),
+                         json.dumps((last_buy_single_index, process_index, buy_num, cancel_num)))
 
     # 杩斿洖鏁版嵁涓庢洿鏂版椂闂�
     def __get_compute_progress(self, code, last_buy_single_index):
         key = "safe_count_l2-{}-{}".format(code, last_buy_single_index)
-        val = self.__getRedis().get(key)
+        val = RedisUtils.get( self.__getRedis(), key)
         if val is None:
             return None, -1, 0, 0
         val = json.loads(val)
@@ -38,11 +39,11 @@
     # 淇濆瓨鏈�杩戠殑涓嬪崟淇℃伅
     def __save_latest_place_order_info(self, code, buy_single_index, buy_exec_index, cancel_index):
         key = "latest_place_order_info-{}".format(code)
-        self.__getRedis().setex(key, tool.get_expire(), json.dumps((buy_single_index, buy_exec_index, cancel_index)))
+        RedisUtils.setex( self.__getRedis(), key, tool.get_expire(), json.dumps((buy_single_index, buy_exec_index, cancel_index)))
 
     def __get_latest_place_order_info(self, code):
         key = "latest_place_order_info-{}".format(code)
-        val = self.__getRedis().get(key)
+        val = RedisUtils.get(self.__getRedis(), key)
         if val is None:
             return None, None, None
         val = json.loads(val)
@@ -50,22 +51,23 @@
 
     def __get_all_compute_progress(self, code):
         key_regex = f"safe_count_l2-{code}-*"
-        keys = self.__getRedis().keys(key_regex)
+        keys = RedisUtils.keys(self.__getRedis(), key_regex)
         vals = []
         for k in keys:
-            val = self.__getRedis().get(k)
+            val = RedisUtils.get(self.__getRedis(), k)
             val = json.loads(val)
             vals.append(val)
         return vals
 
     def clear_data(self, code):
         key_regex = f"safe_count_l2-{code}-*"
-        keys = self.__getRedis().keys(key_regex)
+        keys = RedisUtils.keys(self.__getRedis(), key_regex)
         for k in keys:
-            self.__getRedis().delete(k)
+            RedisUtils.delete(self.__getRedis(),k)
 
         key = f"latest_place_order_info-{code}"
-        self.__getRedis().delete(key)
+        RedisUtils.delete(
+            self.__getRedis(),key)
 
     # 鑾峰彇鍩虹鐨勫畨鍏ㄧ瑪鏁�
     def __get_base_save_count(self, code, is_first):

--
Gitblit v1.8.0