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

---
 code_attribute/gpcode_manager.py |  126 +++++++++++++++++++++--------------------
 1 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py
index 3579fe0..3e7c1ef 100644
--- a/code_attribute/gpcode_manager.py
+++ b/code_attribute/gpcode_manager.py
@@ -6,6 +6,7 @@
 
 import constant
 from db import redis_manager
+from db.redis_manager import RedisUtils
 from utils import tool
 import decimal
 
@@ -36,7 +37,7 @@
 
     @classmethod
     def list_first_code_name_dict(cls):
-        val = cls.__get_redis().get("gp_list_names_first")
+        val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first")
         if val is not None:
             val = json.loads(val)
             return val
@@ -44,7 +45,7 @@
 
     @classmethod
     def list_second_code_name_dict(cls):
-        val = cls.__get_redis().get("gp_list_names")
+        val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
         if val is not None:
             val = json.loads(val)
             return val
@@ -52,7 +53,7 @@
 
     @classmethod
     def get_first_code_name(cls, code):
-        val = cls.__get_redis().get("gp_list_names_first")
+        val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first")
         if not val:
             return None
         val = json.loads(val)
@@ -63,7 +64,7 @@
 
     @classmethod
     def get_second_code_name(cls, code):
-        val = cls.__get_redis().get("gp_list_names")
+        val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
         if not val:
             return None
         val = json.loads(val)
@@ -73,7 +74,7 @@
 
     @classmethod
     def get_first_name_code(cls, name):
-        val = cls.__get_redis().get("gp_list_names_first")
+        val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first")
         if not val:
             return None
         val = json.loads(val)
@@ -81,7 +82,7 @@
 
     @classmethod
     def add_first_code_name(cls, code, name):
-        val = cls.__get_redis().get("gp_list_names_first")
+        val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first")
         if not val:
             return None
         val = json.loads(val)
@@ -90,7 +91,7 @@
 
     @classmethod
     def get_second_name_code(cls, name):
-        val = cls.__get_redis().get("gp_list_names")
+        val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
         if not val:
             return None
         val = json.loads(val)
@@ -109,12 +110,12 @@
     # 鍒犻櫎棣栨澘浠g爜鍚嶇О
     @classmethod
     def clear_first_code_names(cls):
-        cls.__get_redis().delete("gp_list_names_first")
+        RedisUtils.delete(cls.__get_redis(), "gp_list_names_first")
 
     # 璁剧疆浜屾澘浠g爜鍚嶇О
     @classmethod
     def clear_second_code_names(cls):
-        cls.__get_redis().delete("gp_list_names")
+        RedisUtils.delete(cls.__get_redis(), "gp_list_names")
 
 
 # 棣栨澘浠g爜绠$悊
@@ -129,8 +130,8 @@
     @classmethod
     def add_record(cls, codes):
         for code in codes:
-            cls.__get_redis().sadd("first_code_record", code)
-        cls.__get_redis().expire("first_code_record", tool.get_expire())
+            RedisUtils.sadd(cls.__get_redis(), "first_code_record", code)
+        RedisUtils.expire(cls.__get_redis(), "first_code_record", tool.get_expire())
 
     @classmethod
     def is_in_first_record(cls, code):
@@ -143,8 +144,8 @@
     @classmethod
     def add_limited_up_record(cls, codes):
         for code in codes:
-            cls.__get_redis().sadd("first_code_limited_up_record", code)
-        cls.__get_redis().expire("first_code_limited_up_record", tool.get_expire())
+            RedisUtils.sadd(cls.__get_redis(), "first_code_limited_up_record", code)
+        RedisUtils.expire(cls.__get_redis(), "first_code_limited_up_record", tool.get_expire())
 
     # 鏄惁娑ㄥ仠杩�
     @classmethod
@@ -166,12 +167,12 @@
 
     @classmethod
     def clear(cls):
-        cls.__get_redis().delete(cls.__redis_key)
+        RedisUtils.delete(cls.__get_redis(), cls.__redis_key)
 
     @classmethod
     def add_code(cls, code):
-        cls.__get_redis().sadd(cls.__redis_key, code)
-        cls.__get_redis().expire(cls.__redis_key, tool.get_expire())
+        RedisUtils.sadd(cls.__get_redis(), cls.__redis_key, code)
+        RedisUtils.expire(cls.__get_redis(), cls.__redis_key, tool.get_expire())
 
     @classmethod
     def remove_code(cls, code):
@@ -183,7 +184,7 @@
 
     @classmethod
     def list_code(cls):
-        return cls.__get_redis().smembers(cls.__redis_key)
+        return RedisUtils.smembers(cls.__get_redis(), cls.__redis_key)
 
 
 # 鏆傚仠涓嬪崟浠g爜绠$悊
@@ -198,12 +199,12 @@
 
     @classmethod
     def clear(cls):
-        cls.__get_redis().delete(cls.__redis_key)
+        RedisUtils.delete(cls.__get_redis(), cls.__redis_key)
 
     @classmethod
     def add_code(cls, code):
-        cls.__get_redis().sadd(cls.__redis_key, code)
-        cls.__get_redis().expire(cls.__redis_key, tool.get_expire())
+        RedisUtils.sadd(cls.__get_redis(), cls.__redis_key, code)
+        RedisUtils.expire(cls.__get_redis(), cls.__redis_key, tool.get_expire())
 
     @classmethod
     def remove_code(cls, code):
@@ -215,7 +216,7 @@
 
     @classmethod
     def list_code(cls):
-        return cls.__get_redis().smembers(cls.__redis_key)
+        return RedisUtils.smembers(cls.__get_redis(), cls.__redis_key)
 
 
 def __parse_codes_data(code_datas):
@@ -239,10 +240,10 @@
     codes, name_codes = __parse_codes_data(code_datas)
     redis_instance = __redisManager.getRedis()
     # 鍒犻櫎涔嬪墠鐨�
-    redis_instance.delete("gp_list")
+    RedisUtils.delete(redis_instance, "gp_list")
     CodesNameManager.clear_second_code_names()
     for d in codes:
-        redis_instance.sadd("gp_list", d)
+        RedisUtils.sadd(redis_instance, "gp_list", d)
     CodesNameManager.set_second_code_names(name_codes)
 
 
@@ -253,7 +254,7 @@
     redis_instance = __redisManager.getRedis()
     codes, name_codes = __parse_codes_data(code_datas)
     for d in codes:
-        redis_instance.sadd("gp_list", d)
+        RedisUtils.sadd(redis_instance, "gp_list", d)
     old_name_codes = CodesNameManager.list_second_code_name_dict()
     if old_name_codes is None:
         old_name_codes = name_codes
@@ -272,16 +273,16 @@
     codes_set = set()
     for code in codes:
         codes_set.add(code)
-    old_codes_set = redis_instance.smembers("gp_list_first")
+    old_codes_set = RedisUtils.smembers(redis_instance, "gp_list_first")
     if old_codes_set is None:
         old_codes_set = set()
     del_set = old_codes_set - codes_set
     add_codes = codes_set - old_codes_set
     for code in add_codes:
-        redis_instance.sadd("gp_list_first", code)
+        RedisUtils.sadd(redis_instance, "gp_list_first", code)
     for code in del_set:
         redis_instance.srem("gp_list_first", code)
-    redis_instance.expire("gp_list_first", tool.get_expire())
+    RedisUtils.expire(redis_instance, "gp_list_first", tool.get_expire())
 
     old_name_codes = CodesNameManager.list_first_code_name_dict()
     if old_name_codes is None:
@@ -302,7 +303,7 @@
 # 鑾峰彇棣栨澘浠g爜
 def get_first_gp_codes():
     redis_instance = __redisManager.getRedis()
-    return redis_instance.smembers("gp_list_first")
+    return RedisUtils.smembers(redis_instance, "gp_list_first")
 
 
 # 鏄惁鍦ㄩ鏉块噷闈�
@@ -349,17 +350,18 @@
     # 鑾峰彇鍩烘湰淇℃伅
     redis_instance = __redisManager.getRedis()
     # 鍒犻櫎涔嬪墠鐨�
-    redis_instance.delete("gp_limit_up_list")
+    RedisUtils.delete(redis_instance, "gp_limit_up_list")
     for d in gpset:
-        redis_instance.sadd("gp_limit_up_list", json.dumps(d))
-    redis_instance.expire("gp_limit_up_list", tool.get_expire())
-    redis_instance.setex("gp_limit_up_list_update_time", tool.get_expire(), round(time.time() * 1000))
+        RedisUtils.sadd(redis_instance, "gp_limit_up_list", json.dumps(d))
+    RedisUtils.expire(redis_instance, "gp_limit_up_list", tool.get_expire())
+    RedisUtils.setex(redis_instance, "gp_limit_up_list_update_time", tool.get_expire(), round(time.time() * 1000))
 
 
 # 鑾峰彇娑ㄥ仠鍒楄〃
 def get_limit_up_list():
     redis_instance = __redisManager.getRedis()
-    return redis_instance.get("gp_limit_up_list_update_time"), redis_instance.smembers("gp_limit_up_list")
+    return RedisUtils.get(redis_instance, "gp_limit_up_list_update_time"), RedisUtils.smembers(redis_instance,
+                                                                                               "gp_limit_up_list")
 
 
 def rm_gp(code):
@@ -375,7 +377,7 @@
 
 def get_gp_list():
     redis_instance = __redisManager.getRedis()
-    codes = redis_instance.smembers("gp_list")
+    codes = RedisUtils.smembers(redis_instance, "gp_list")
     first_codes = get_first_gp_codes()
     return set.union(codes, first_codes)
 
@@ -383,7 +385,7 @@
 # 鑾峰彇浜屾澘浠g爜
 def get_second_gp_list():
     redis_instance = __redisManager.getRedis()
-    codes = redis_instance.smembers("gp_list")
+    codes = RedisUtils.smembers(redis_instance, "gp_list")
     return codes
 
 
@@ -402,7 +404,7 @@
 # 鑾峰彇鏀剁洏浠�
 def get_price_pre(code):
     redis_instance = __redisManager.getRedis()
-    result = redis_instance.get("price-pre-{}".format(code))
+    result = RedisUtils.get(redis_instance, "price-pre-{}".format(code))
     if result is not None:
         return float(result)
     return None
@@ -427,7 +429,7 @@
     if code not in codes and not FirstCodeManager.is_in_first_record(code) and not force:
         return
     redis_instance = __redisManager.getRedis()
-    redis_instance.setex("price-pre-{}".format(code), tool.get_expire(), str(price))
+    RedisUtils.setex(redis_instance, "price-pre-{}".format(code), tool.get_expire(), str(price))
 
 
 __limit_up_price_dict = {}
@@ -463,7 +465,7 @@
 # 鑾峰彇鐜颁环
 def get_price(code):
     redis_instance = __redisManager.getRedis()
-    result = redis_instance.get("price-{}".format(code))
+    result = RedisUtils.get(redis_instance, "price-{}".format(code))
     if result is not None:
         return float(result)
     return None
@@ -472,16 +474,16 @@
 # 璁剧疆鐜颁环
 def set_price(code, price):
     redis_instance = __redisManager.getRedis()
-    redis_instance.setex("price-{}".format(code), tool.get_expire(), price)
+    RedisUtils.setex(redis_instance, "price-{}".format(code), tool.get_expire(), price)
 
 
 # 鑾峰彇姝e湪鐩戝惉鐨勪唬鐮�
 def get_listen_codes():
     redis_instance = __redisManager.getRedis()
-    keys = redis_instance.keys("listen_code-*-*")
+    keys = RedisUtils.keys(redis_instance, "listen_code-*-*")
     codes = set()
     for k in keys:
-        code = redis_instance.get(k)
+        code = RedisUtils.get(redis_instance, k)
         if code is not None and len(code) > 0:
             codes.add(code)
     return codes
@@ -491,7 +493,7 @@
 def get_listen_code_by_pos(client_id, pos):
     redis_instance = __redisManager.getRedis()
     key = "listen_code-{}-{}".format(client_id, pos)
-    value = redis_instance.get(key)
+    value = RedisUtils.get(redis_instance, key)
     # print("redis:", key,value)
     return value
 
@@ -499,7 +501,7 @@
 # 璁剧疆浣嶇疆鐨勭洃鍚唬鐮�
 def set_listen_code_by_pos(client_id, pos, code):
     redis_instance = __redisManager.getRedis()
-    redis_instance.setex("listen_code-{}-{}".format(client_id, pos), tool.get_expire(), code)
+    RedisUtils.setex(redis_instance, "listen_code-{}-{}".format(client_id, pos), tool.get_expire(), code)
     # 鍚屾鐩戝惉鐨勪唬鐮侀泦鍚�
     __sync_listen_codes_pos()
 
@@ -508,12 +510,12 @@
 def __sync_listen_codes_pos():
     redis_instance = __redisManager.getRedis()
     # 鑾峰彇宸茬粡姝e湪鐩戝惉鐨勪唬鐮�
-    keys = redis_instance.keys("code_listen_pos-*")
+    keys = RedisUtils.keys(redis_instance, "code_listen_pos-*")
     codes_set = set()
     for key in keys:
         codes_set.add(key.replace("code_listen_pos-", ""))
 
-    keys = redis_instance.keys("listen_code-*-*")
+    keys = RedisUtils.keys(redis_instance, "listen_code-*-*")
 
     for key in keys:
         result = redis_instance.get(key)
@@ -524,15 +526,15 @@
             key_ = "code_listen_pos-{}".format(code_)
             val = redis_instance.get(key_)
             if val is None:
-                redis_instance.setex(key_, tool.get_expire(), json.dumps((client_id_, pos_)))
+                RedisUtils.setex(redis_instance, key_, tool.get_expire(), json.dumps((client_id_, pos_)))
             else:
                 val = json.loads(val)
                 if val[0] != client_id_ or val[1] != pos_:
-                    redis_instance.setex(key_, tool.get_expire(), json.dumps((client_id_, pos_)))
+                    RedisUtils.setex(redis_instance, key_, tool.get_expire(), json.dumps((client_id_, pos_)))
 
     # 绉婚櫎娌℃湁鐩戝惉鐨勪唬鐮�
     for code_ in codes_set:
-        redis_instance.delete(code_)
+        RedisUtils.delete(redis_instance, code_)
 
 
 # 鍒濆鍖栦綅缃�
@@ -540,23 +542,23 @@
     redis_instance = __redisManager.getRedis()
     key = "listen_code-{}-{}".format(client_id, pos)
     redis_instance.setnx(key, "")
-    redis_instance.expire(key, tool.get_expire())
+    RedisUtils.expire(redis_instance, key, tool.get_expire())
 
 
 # 娓呴櫎鎵�鏈夌洃鍚唬鐮�
 def clear_listen_codes():
     redis_instance = __redisManager.getRedis()
-    keys = redis_instance.keys("listen_code-*-*")
+    keys = RedisUtils.keys(redis_instance, "listen_code-*-*")
     for key in keys:
-        redis_instance.setex(key, tool.get_expire(), "")
+        RedisUtils.setex(redis_instance, key, tool.get_expire(), "")
 
 
 def clear_first_codes():
     redis_instance = __redisManager.getRedis()
-    redis_instance.delete("gp_list_first")
-    redis_instance.delete("gp_list_names_first")
-    redis_instance.delete("first_code_record")
-    redis_instance.delete("first_code_limited_up_record")
+    RedisUtils.delete(redis_instance, "gp_list_first")
+    RedisUtils.delete(redis_instance, "gp_list_names_first")
+    RedisUtils.delete(redis_instance, "first_code_record")
+    RedisUtils.delete(redis_instance, "first_code_limited_up_record")
 
 
 # 鑾峰彇鍙互鎿嶄綔鐨勪綅缃�
@@ -571,7 +573,7 @@
     for client_id in client_ids:
         redis_instance = __redisManager.getRedis()
         k = "listen_code-{}-*".format(client_id)
-        keys = redis_instance.keys(k)
+        keys = RedisUtils.keys(redis_instance, k)
         # random.shuffle(keys)
         codes = []
         for key in keys:
@@ -613,7 +615,7 @@
     for client_id in client_ids:
         redis_instance = __redisManager.getRedis()
         k = "listen_code-{}-*".format(client_id)
-        keys = redis_instance.keys(k)
+        keys = RedisUtils.keys(redis_instance, k)
         for key in keys:
             code = redis_instance.get(key)
             if not code:
@@ -670,27 +672,29 @@
 # 璁剧疆姝e湪鎿嶄綔鐨勪唬鐮�
 def set_operate(code):
     redis_instance = __redisManager.getRedis()
-    redis_instance.setex("gp_operate-{}".format(code), 30, "1")
+    RedisUtils.setex(
+        redis_instance, "gp_operate-{}".format(code), 30, "1")
 
 
 # 鎵归噺璁剧疆姝e湪鎿嶄綔鐨勪唬鐮�
 def set_operates(codes):
     redis_instance = __redisManager.getRedis()
     for code in codes:
-        redis_instance.setex("gp_operate-{}".format(code), 30, "1")
+        RedisUtils.setex(
+            redis_instance, "gp_operate-{}".format(code), 30, "1")
 
 
 # 绉婚櫎姝e湪鎿嶄綔鐨勪唬鐮�
 def rm_operate(code):
     redis_instance = __redisManager.getRedis()
-    redis_instance.delete("gp_operate-{}".format(code))
+    RedisUtils.delete(redis_instance, "gp_operate-{}".format(code))
 
 
 # 鎵归噺绉婚櫎姝e湪鎿嶄綔鐨勪唬鐮�
 def rm_operates(codes):
     redis_instance = __redisManager.getRedis()
     for code in codes:
-        redis_instance.delete("gp_operate-{}".format(code))
+        RedisUtils.delete(redis_instance, "gp_operate-{}".format(code))
 
 
 if __name__ == '__main__':

--
Gitblit v1.8.0