From 0e68e24f54db11d340785b17570fff2bc5fc7ac6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 24 七月 2023 13:05:16 +0800
Subject: [PATCH] bug修复
---
l2/l2_data_util.py | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/l2/l2_data_util.py b/l2/l2_data_util.py
index ccc489f..c7c25d4 100644
--- a/l2/l2_data_util.py
+++ b/l2/l2_data_util.py
@@ -14,7 +14,7 @@
import constant
from code_attribute import gpcode_manager
from l2 import l2_data_log, l2_data_source_util
-from logs_ import log
+from log_module import log
from db import redis_manager
from utils import tool
@@ -32,17 +32,18 @@
local_today_buyno_map = {}
-def load_l2_data(code, force=False):
+def load_l2_data(code, load_latest=True, force=False):
redis = _redisManager.getRedis()
# 鍔犺浇鏈�杩戠殑l2鏁版嵁
- if local_latest_datas.get(code) is None or force:
- # 鑾峰彇鏈�杩戠殑鏁版嵁
- _data = redis.get("l2-data-latest-{}".format(code))
- if _data is not None:
- if code in local_latest_datas:
- local_latest_datas[code] = json.loads(_data)
- else:
- local_latest_datas.setdefault(code, json.loads(_data))
+ if load_latest :
+ if local_latest_datas.get(code) is None or force:
+ # 鑾峰彇鏈�杩戠殑鏁版嵁
+ _data = redis.get("l2-data-latest-{}".format(code))
+ if _data is not None:
+ if code in local_latest_datas:
+ local_latest_datas[code] = json.loads(_data)
+ else:
+ local_latest_datas.setdefault(code, json.loads(_data))
# 鑾峰彇浠婃棩鐨勬暟鎹�
if local_today_datas.get(code) is None or force:
@@ -103,8 +104,7 @@
# 鍙～鍏呬拱鍏ユ暟鎹�
key = "{}".format(data["val"]["orderNo"])
if local_today_buyno_map[code].get(key) is None:
- local_today_buyno_map[code].setdefault(key, [])
- local_today_buyno_map[code].get(key).append(data)
+ local_today_buyno_map[code].setdefault(key, data)
@tool.async_call
@@ -152,11 +152,12 @@
if len(add_datas) > 0:
# 淇濆瓨鏈�杩戠殑鏁版嵁
__start_time = round(time.time() * 1000)
- redis.setex("l2-data-latest-{}".format(code), tool.get_expire(), json.dumps(datas))
- l2_data_log.l2_time(code, round(time.time() * 1000) - __start_time, "淇濆瓨鏈�杩憀2鏁版嵁鐢ㄦ椂")
- # 璁剧疆杩涘唴瀛�
- local_latest_datas[code] = datas
- set_l2_data_latest_count(code, len(datas))
+ if datas:
+ redis.setex("l2-data-latest-{}".format(code), tool.get_expire(), json.dumps(datas))
+ l2_data_log.l2_time(code, round(time.time() * 1000) - __start_time, "淇濆瓨鏈�杩憀2鏁版嵁鐢ㄦ椂")
+ # 璁剧疆杩涘唴瀛�
+ local_latest_datas[code] = datas
+ set_l2_data_latest_count(code, len(datas))
try:
log.logger_l2_data.info("{}-{}", code, add_datas)
except Exception as e:
--
Gitblit v1.8.0