From fb47d36048e94b9a506d5c153e3dd19a01e37df1 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 十月 2023 16:30:27 +0800
Subject: [PATCH] bug修复
---
l2_data_util.py | 71 +++++++++++++----------------------
1 files changed, 27 insertions(+), 44 deletions(-)
diff --git a/l2_data_util.py b/l2_data_util.py
index eccea79..af18fa3 100644
--- a/l2_data_util.py
+++ b/l2_data_util.py
@@ -6,10 +6,12 @@
# 姣旇緝鏃堕棿鐨勫ぇ灏�
import json
import time
-from tool import async_call
+
+from db.redis_manager_delegate import RedisUtils
+from utils.tool import async_call
from l2 import l2_data_manager
-import tool
+from utils import tool
def run_time():
@@ -28,7 +30,7 @@
# 鏄惁涓哄ぇ鍗�
def is_big_money(val):
price = float(val["price"])
- money = price * int(val["num"])
+ money = price * val["num"]
if price > 3.0:
if money >= 30000:
return True
@@ -40,11 +42,22 @@
return True
else:
return False
- # if int(val["num"]) >= constant.BIG_MONEY_NUM:
- # return True
- # if int(val["num"]) * limit_up_price >= constant.BIG_MONEY_AMOUNT:
- # return True
- # return False_
+
+
+# 鑾峰彇澶ц祫閲戠殑閲戦
+def get_big_money_val(limit_up_price):
+ if limit_up_price > 3.0:
+ return 300 * 10000
+ else:
+ max_money = limit_up_price * 10000
+ return max_money * 0.95
+
+
+# if int(val["num"]) >= constant.BIG_MONEY_NUM:
+# return True
+# if int(val["num"]) * limit_up_price >= constant.BIG_MONEY_AMOUNT:
+# return True
+# return False_
def compare_time(time1, time2):
@@ -69,8 +82,6 @@
json_value = json.loads(value)
_data = {"key": key, "val": item, "re": json_value["re"], "index": int(json_value["index"])}
return _data
-
-
# 鍑忓幓鏃堕棿
@@ -113,32 +124,6 @@
max_time = __sub_time(cancel_data["val"]["time"], min_space)
min_time = __sub_time(cancel_data["val"]["time"], max_space)
return min_time, max_time
-
-
-# 鏍规嵁涔版挙鏁版嵁(涓庝粖鏃ユ�荤殑鏁版嵁)璁＄畻涔板叆鏁版嵁
-def get_buy_data_with_cancel_data(cancel_data, local_today_num_operate_map):
- min_space, max_space = compute_time_space_as_second(cancel_data["val"]["cancelTime"],
- cancel_data["val"]["cancelTimeUnit"])
- max_time = __sub_time(cancel_data["val"]["time"], min_space)
- min_time = __sub_time(cancel_data["val"]["time"], max_space)
- buy_datas = local_today_num_operate_map.get(
- "{}-{}-{}".format(cancel_data["val"]["num"], "0", cancel_data["val"]["price"]))
- if buy_datas is None:
- # 鏃犳暟鎹�
- return None, None
- for i in range(0, len(buy_datas)):
- data = buy_datas[i]
- if int(data["val"]["operateType"]) != 0:
- continue
- if int(data["val"]["num"]) != int(cancel_data["val"]["num"]):
- continue
- if min_space == 0 and max_space == 0:
- if compare_time(data["val"]["time"], min_time) == 0:
- return data["index"], data
-
- elif compare_time(data["val"]["time"], min_time) > 0 and compare_time(data["val"]["time"], max_time) <= 0:
- return data["index"], data
- return None, None
# 鍒ゆ柇鍗栨挙鐨勫崠淇″彿鏄惁鍦ㄧ洰鏍囦俊鍙蜂箣鍓�
@@ -194,28 +179,26 @@
if abs(get_time_as_seconds(time_str) - get_time_as_seconds(time_)) > 3:
continue
if same_time_nums[time_] > 20:
- redis = l2_data_manager._redisManager.getRedis()
- redis.setex("big_data-{}-{}".format(code, int(round(time.time() * 1000))), tool.get_expire(), d1)
+ RedisUtils.setex(l2_data_manager._redisManager.getRedis(), "big_data-{}-{}".format(code, int(round(time.time() * 1000))), tool.get_expire(),
+ d1)
break
# 淇濆瓨l2鏈�鏂版暟鎹殑澶у皬
-@async_call
+# @async_call
def save_l2_latest_data_number(code, num):
- redis = l2_data_manager._redisManager.getRedis()
- redis.setex("l2_latest_data_num-{}".format(code), 3, num)
+ RedisUtils.setex(l2_data_manager._redisManager.getRedis(), "l2_latest_data_num-{}".format(code), 3, num)
# 鑾峰彇鏈�鏂版暟鎹潯鏁�
def get_l2_latest_data_number(code):
- redis = l2_data_manager._redisManager.getRedis()
- num = redis.get("l2_latest_data_num-{}".format(code))
+ num =RedisUtils.get(l2_data_manager._redisManager.getRedis(), "l2_latest_data_num-{}".format(code))
if num is not None:
return int(num)
return None
-# l2鏁版嵁鎷兼帴宸ュ叿 TODO 鏆傛椂杩樻湭鍚敤
+# l2鏁版嵁鎷兼帴宸ュ叿 鏆傛椂杩樻湭鍚敤
class L2DataConcatUtil:
# 鍒濆鍖�
--
Gitblit v1.8.0