From 8c51895ecab1de9c6faf664d389168473951f3bd Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: 星期三, 26 三月 2025 13:52:10 +0800
Subject: [PATCH] 日志修改
---
strategy/kpl_api.py | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/strategy/kpl_api.py b/strategy/kpl_api.py
index 4ff40b8..df5528d 100644
--- a/strategy/kpl_api.py
+++ b/strategy/kpl_api.py
@@ -227,6 +227,7 @@
@dask.delayed
def request_plate_codes(i):
plate_name = i[1]
+ log_data = None
# 灏濊瘯杩囨护鎺夋棤鎰忎箟鐨勬蹇垫澘鍧�(plate_name not in ['绉戝垱鏉�', '鍖椾氦鎵�', '娆℃柊鑲�', '鏃�', 'ST鏉垮潡', 'ST鎽樺附', '骞惰喘閲嶇粍', '鍥戒紒鏀归潻','瓒呰穼', '澹宠祫婧�', '鑲℃潈杞', '閫佽浆濉潈']) and '澧為暱' in plate_name
if (plate_name not in ['绉戝垱鏉�', '鍖椾氦鎵�', '娆℃柊鑲�', '鏃�', 'ST鏉垮潡', 'ST鎽樺附', '骞惰喘閲嶇粍', '鍥戒紒鏀归潻', '瓒呰穼',
'澹宠祫婧�', '鑲℃潈杞', '閫佽浆濉潈']) or ('澧為暱' in plate_name):
@@ -236,14 +237,7 @@
# print(f"======={i[0]}=======")
its_stock = json.loads(getCodesByPlate(i[0]))
- # 鍙湪鐩樹腑鏃堕棿鑾峰彇
- now_time = tool.get_now_time_str()
- if data_cache.L1_DATA_START_TIME < now_time < data_cache.CLOSING_TIME:
- log_data = {plate_name: its_stock['list']}
- async_log_util.info(logger_stock_of_markets_plate, f"{log_data}")
- # logger.info(f"its_stock['list'] ===銆嬨�� {log_data}")
- # logger.info(f"its_stock['list'][0] === {its_stock['list'][0]}")
# its_stock_list_info = its_stock['list']
# logger.info(f"its_stock_list_info==={its_stock_list_info}")
@@ -267,7 +261,8 @@
stock_power_list = []
for s in its_stock['list']:
# 杩囨护鎺夋定骞呭ぇ浜� and s[6] < 6.5 涓斿皬浜�0%鐨� 鍜� 鍚嶇О涓寘鍚玈T鐨� 鍜� 娑ㄩ�熷皬浜庣瓑浜�0%鐨� 鍜� 鍙鏄ㄦ棩鏈定鍋� 鍜� 涓婅瘉鎴栨繁璇佺殑姝ｈ偂 and s[9] > 0.0025
- if s[6] > 0 and s[1].find("ST") < 0 and s[1].find("XD") < 0 and s[23].find("鏉�") < 0 and s[24].find("鏉�") < 0 and (s[0].startswith('60') or s[0].startswith('00')) and s[9] > 1:
+ if s[6] > 0 and s[1].find("ST") < 0 and s[1].find("XD") < 0 and s[23].find("鏉�") < 0 and s[24].find(
+ "鏉�") < 0 and (s[0].startswith('60') or s[0].startswith('00')) and s[9] > 1:
# print(f"{s[1]}锛屼釜鑲′唬鐮侊細{s[0]}锛� 娑ㄥ箙锛歿s[6]}% 娑ㄩ�燂細{s[9]}% 姒傚康锛歿s[4]} 涓诲姏璧勯噾鎺ㄦ祴锛歿s[2]} 棰嗘定娆℃暟锛歿s[40]} 浠婃棩绗嚑鏉匡細{s[23]} 鏄惁鐮寸増{s[24]}")
# 瀵逛釜鑲″己搴� 涓昏 灞炴�у垪琛ㄨ繘琛岃濉�
its_stock_power = [s[1], s[0], s[6], s[9], s[4], s[2], s[40]]
@@ -282,6 +277,7 @@
stock_power_item = {i[1]: stock_power_list}
# 骞舵洿鏂板埌绮鹃�夋澘鍧椾釜鑲″瓧鍏镐腑
market_sift_plate_stock_dict.update(stock_power_item)
+ return log_data
data = (getMarketJingXuanRealRankingInfo())
market_sift_plate = json.loads(data)
@@ -297,10 +293,19 @@
for d in market_sift_plate['list']:
ds.append(request_plate_codes(d))
dask_result = batch_get_plate_codes(ds)
- dask_result.compute()
+ compute_results = dask_result.compute()
+ log_datas={}
+ for r in compute_results:
+ if not r:
+ continue
+ for b in r:
+ log_datas[b] = r[b]
now_time = tool.get_now_time_str()
if data_cache.L1_DATA_START_TIME < now_time < data_cache.CLOSING_TIME:
logger.info(f"绮鹃�夋澘鍧楄偂绁ㄥ己搴︽暟鎹洿鏂� == {market_sift_plate_stock_dict}")
+ # 鍙湪鐩樹腑鏃堕棿鑾峰彇
+ async_log_util.info(logger_stock_of_markets_plate, f"{(market_sift_plate['list'],log_datas)}")
+
return market_sift_plate_stock_dict
@@ -778,7 +783,9 @@
if data_cache.BUY_MONEY_PER_CODE < 0:
# 鏍规嵁璐︽埛鍙敤閲戦 璁＄畻浠婃棩璁″垝涓嬪崟閲戦
# ((澶х洏缁煎悎寮哄害鍒嗘暟 + 澶х洏鎸囨暟鎯呯华棰勬湡鍒嗘暟) * 0.01) * (璐︽埛鍙敤閲戦 * 鏋佺浣庤糠鎯呯华姣斾緥 / 浠婃棩鏈�澶ф柊澧炴寔浠撶エ鏁�)
- data_cache.today_planned_order_amount = ((data_cache.real_time_market_strong + index_trend_expectation_score) * 0.01) * (usefulMoney * low_emotion_mood_ratio / Unfinished_opening_plan_number)
+ data_cache.today_planned_order_amount = ((
+ data_cache.real_time_market_strong + index_trend_expectation_score) * 0.01) * (
+ usefulMoney * low_emotion_mood_ratio / Unfinished_opening_plan_number)
else:
data_cache.today_planned_order_amount = data_cache.BUY_MONEY_PER_CODE
@@ -799,4 +806,5 @@
# start_time = time.time()
# get_market_sift_plate_its_stock_power()
# print("鑰楁椂锛�", time.time() - start_time)
- get_market_sift_plate_its_stock_power_process(None)
+ get_market_sift_plate_its_stock_power()
+ # get_market_sift_plate_its_stock_power_process(None)
--
Gitblit v1.8.0