From cae724f751e1ccc797ec6457af5f11ad8a2f24f2 Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: 星期二, 27 五月 2025 18:30:37 +0800
Subject: [PATCH] bug修复
---
strategy/plate_strength_analysis.py | 3 ++-
log_module/log_export.py | 8 +++-----
data_server.py | 2 +-
strategy/kpl_api.py | 2 +-
strategy/kpl_data_manager.py | 4 +++-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/data_server.py b/data_server.py
index 84a6394..0c6bfda 100644
--- a/data_server.py
+++ b/data_server.py
@@ -193,7 +193,7 @@
if use_time_list and use_time_list[-1][1] > 10:
logger_debug.warning(f"鐜鑾峰彇鏃堕棿澶т簬10s({request_id}):{use_time_list}")
# 鑾峰彇鏉垮潡寮哄害鏁版嵁
- elif url.path == "/load_get_kpl_market_sift_plate":
+ elif url.path == "/load_kpl_market_sift_plate":
# 鍔犺浇鏁版嵁
KPLMarketsSiftPlateLogManager().load_data()
response_data = json.dumps({"code": 0, "msg": "鏆傛棤鍐呭"})
diff --git a/log_module/log_export.py b/log_module/log_export.py
index 9787458..7209d36 100644
--- a/log_module/log_export.py
+++ b/log_module/log_export.py
@@ -53,7 +53,7 @@
return contents
-def load_market_stock_heat(date=tool.get_now_date_str()):
+def load_market_sift_plate(date=tool.get_now_date_str()):
"""
鑾峰彇绮鹃�夋祦鍏ョ殑鎴愬垎鑲�
:param date:
@@ -66,11 +66,9 @@
lines = f.readlines()
for line in lines:
if line:
- time_str = __get_async_log_time(line)
+ time_str = __get_log_time(line)
try:
data = line.split(" - ")[1].strip()
- if data.startswith("["):
- data = data[data.find("]") + 1:].strip()
data_dict = eval(data)
fdatas.append((time_str, data_dict))
except:
@@ -128,7 +126,7 @@
if __name__ == '__main__':
- datas = load_kpl_market_strong()
+ datas = load_market_sift_plate()
fdatas = []
for data in datas:
# (璺濈09:15:00鐨勭鏁�, 鏃堕棿, 寮哄害)
diff --git a/strategy/kpl_api.py b/strategy/kpl_api.py
index 7f73faa..6e0362a 100644
--- a/strategy/kpl_api.py
+++ b/strategy/kpl_api.py
@@ -15,7 +15,7 @@
from strategy import data_cache
from strategy import basic_methods
-# from strategy.kpl_data_manager import KPLMarketsSiftPlateLogManager
+from strategy.kpl_data_manager import KPLMarketsSiftPlateLogManager
from trade import middle_api_protocol
from utils import hx_qc_value_util, tool
diff --git a/strategy/kpl_data_manager.py b/strategy/kpl_data_manager.py
index fca6363..62ff45f 100644
--- a/strategy/kpl_data_manager.py
+++ b/strategy/kpl_data_manager.py
@@ -2,6 +2,7 @@
from log_module.log import logger_stock_of_markets_plate, logger_debug, logger_kpl_market_sift_plate
from utils import tool
+
# 寮�鐩樺暒鏉垮潡寮哄害鏃ュ織绠＄悊
@tool.singleton
class KPLMarketsSiftPlateLogManager:
@@ -16,7 +17,7 @@
def __load_data(self):
if tool.get_now_time_str() > '13:10:00':
logger_debug.info("KPLMarketsSiftPlateLogManager 寮�濮嬪姞杞芥暟鎹�")
- datas = log_export.load_market_stock_heat()
+ datas = log_export.load_market_sift_plate()
for data in datas:
# (鍙戠敓鏃堕棿,[鍑�娴佸叆鏉垮潡], {"鏉垮潡":(浠ｇ爜, 鍚嶇О, 娑ㄥ箙)})
self.__filter_log_datas.append(self.__filter_origin_data(data))
@@ -36,6 +37,7 @@
def get_filter_log_datas(self):
return self.__filter_log_datas
+
# 寮�鐩樺暒涓偂寮哄害鏃ュ織绠＄悊
@tool.singleton
class KPLMarketStockHeatLogManager:
diff --git a/strategy/plate_strength_analysis.py b/strategy/plate_strength_analysis.py
index 9948648..b67d07d 100644
--- a/strategy/plate_strength_analysis.py
+++ b/strategy/plate_strength_analysis.py
@@ -7,6 +7,7 @@
from log_module.log import logger_common, logger_kpl_jingxuan_in, logger_debug, logger_kpl_market_sift_plate
from strategy import kpl_api, data_cache, basic_methods
+from strategy.kpl_data_manager import KPLMarketStockHeatLogManager
from utils import tool, hx_qc_value_util
@@ -101,7 +102,7 @@
# logger.info(f"绮鹃�夋澘鍧楄偂绁ㄥ己搴︽暟鎹洿鏂� == {market_sift_plate_stock_dict}")
# 鍙湪鐩樹腑鏃堕棿鑾峰彇
- kpl_api.KPLStockOfMarketsPlateLogManager().add_log(market_sift_plate['list'], log_datas)
+ KPLMarketStockHeatLogManager().add_log(market_sift_plate['list'], log_datas)
# 琛屾儏銆嬬簿閫夋澘鍧椼�嬫帓鍚嶅墠20涓�嬪搴斾釜鑲°�嬬鍚堟潯浠剁殑涓偂
return market_sift_plate_stock_dict
--
Gitblit v1.8.0