From 8d4be7d30a05b97590d29dfd3c83eebce4c4fb14 Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: 星期一, 31 三月 2025 18:00:54 +0800
Subject: [PATCH] bug修改
---
strategy/kpl_api.py | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/strategy/kpl_api.py b/strategy/kpl_api.py
index a87bfd5..994e23c 100644
--- a/strategy/kpl_api.py
+++ b/strategy/kpl_api.py
@@ -229,6 +229,9 @@
def request_plate_codes(i):
plate_name = i[1]
log_data = None
+ its_stock = json.loads(getCodesByPlate(i[0]))
+ if data_cache.OPENING_TIME < now_time < data_cache.NOON_MARKET_TIME:
+ log_data = {plate_name: its_stock['list']}
# 灏濊瘯杩囨护鎺夋棤鎰忎箟鐨勬蹇垫澘鍧�(plate_name not in ['绉戝垱鏉�', '鍖椾氦鎵�', '娆℃柊鑲�', '鏃�', 'ST鏉垮潡', 'ST鎽樺附', '骞惰喘閲嶇粍', '鍥戒紒鏀归潻','瓒呰穼', '澹宠祫婧�', '鑲℃潈杞', '閫佽浆濉潈']) and '澧為暱' in plate_name
if (plate_name not in ['绉戝垱鏉�', '鍖椾氦鎵�', '娆℃柊鑲�', '鏃�', 'ST鏉垮潡', 'ST鎽樺附', '骞惰喘閲嶇粍', '鍥戒紒鏀归潻', '瓒呰穼',
'澹宠祫婧�', '鑲℃潈杞', '閫佽浆濉潈']) or ('澧為暱' in plate_name):
@@ -236,8 +239,6 @@
# print(f"{i[1]} 寮哄害:{i[2]}")
# 閫氳繃鏉垮潡ID鑾峰彇鍏朵笅闈㈢殑涓偂寮哄害鍒楄〃
# print(f"======={i[0]}=======")
- its_stock = json.loads(getCodesByPlate(i[0]))
- log_data = {plate_name: its_stock['list']}
# its_stock_list_info = its_stock['list']
# logger.info(f"its_stock_list_info==={its_stock_list_info}")
@@ -261,8 +262,7 @@
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]]
@@ -746,16 +746,20 @@
try:
if data_cache.position_automatic_management_switch is True:
now_time = tool.get_now_time_str()
- if data_cache.L1_DATA_START_TIME < now_time < data_cache.UPDATE_DATA_TIME:
+ if data_cache.L1_DATA_START_TIME < now_time < data_cache.CLOSING_TIME:
# 鑾峰彇澶х洏缁煎悎寮哄害鍒嗘暟
data_cache.real_time_market_strong = get_market_strong()
# data_cache.time_sharing_market_strong_dirt = time_sharing_market_strong_dirt.update({now: data_cache.real_time_market_strong})
# 璇ogger.info鐨勭殑鏃ュ織涓嶅啀闇�瑕佹墦鍗帮紝鍚庣画灏嗚浆鍏ュ埌GUI瀹㈡埛绔笂鐩存帴鏄剧ず锛岃鏁版嵁鐨勬墦鍗颁氦鐢变笅鏂圭殑鎵撳嵃鏈哄埗寮傛鎵ц鍗曠嫭瀛樺偍锛屼互渚垮悗缁彲瑙嗗寲鍛堢幇鍚庤繘琛屾洿楂樻晥鐨勬暟鎹垎鏋�
# logger.info(f"澶х洏琛屾儏鎯呯华缁煎悎寮哄害 [鍒嗘暟]==={data_cache.real_time_market_strong}鍒�")
- # 澶х洏缁煎悎寮哄害鍒嗘暟 鐨� 寮傛鏃ュ織
- # logger_Overall_market_strength_score.info(data_cache.real_time_market_strong)
- async_log_util.info(logger_Overall_market_strength_score, f"{data_cache.real_time_market_strong}")
-
+ if data_cache.MORN_MARKET_CLOSING_TIME < now_time < data_cache.NOON_MARKET_OPENING_TIME:
+ pass
+ logger.info(f"鍗堥棿浼戝競鏃堕棿鍐� 涓嶆墦鍗板ぇ鐩樼患鍚堝己搴﹀垎鏁�")
+ else:
+ # 澶х洏缁煎悎寮哄害鍒嗘暟 鐨� 寮傛鏃ュ織
+ # logger_Overall_market_strength_score.info(data_cache.real_time_market_strong)
+ async_log_util.info(logger_Overall_market_strength_score,
+ f"{data_cache.real_time_market_strong}")
usefulMoney = data_cache.account_finance_dict[0].get('usefulMoney', 0)
logger.info(f"璐︽埛鍙敤璧勯噾==={usefulMoney}鍏�")
# 浣庤糠鎯呯华姣斾緥
@@ -763,7 +767,8 @@
# 33鍒嗘槸涓袱绾у垎鍖栭樁姊笉濂斤紝鐩墠涓嶅ソ鎷挎崗锛屾殏鏃朵笉鐢�
# if data_cache.real_time_market_strong <= 33:
if data_cache.real_time_market_strong < 30:
- low_emotion_mood_ratio = 0.1
+ # 濡傛灉澶х洏缁煎悎寮哄害鍒嗘暟灏忎簬30锛屽皢浣庤糠鎯呯华鍒嗘暟姣斾緥璁剧疆涓�0.01锛屽彲鐢ㄨ祫閲戠缉灏忎竴鐧惧��
+ low_emotion_mood_ratio = 0.01
if data_cache.real_time_market_strong <= 10:
low_emotion_mood_ratio = 0
logger.info(f"鏋佺浣庤糠鎯呯华姣斾緥===={low_emotion_mood_ratio * 100}%")
--
Gitblit v1.8.0