From e240fb424005fd880be8cb3a5f91a7c1e163e3b5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 18 十一月 2024 18:18:35 +0800
Subject: [PATCH] 修改打包文件
---
third_data/code_plate_key_manager.py | 330 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 225 insertions(+), 105 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index cdd0181..28d6f7f 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -4,6 +4,7 @@
# 娑ㄥ仠浠ｇ爜鍏抽敭璇嶆澘鍧楃鐞�
import copy
+import datetime
import json
import time
@@ -11,13 +12,13 @@
from db.redis_manager_delegate import RedisUtils
from third_data import kpl_block_util, kpl_api, kpl_util
from settings.trade_setting import MarketSituationManager
-from third_data.history_k_data_manager import HistoryKDataManager
-from third_data.history_k_data_util import HistoryKDatasUtils
-from utils import global_util, tool, buy_condition_util, init_data_util
-from log_module import log, async_log_util
+from third_data.kpl_data_constant import LimitUpCodesBlockRecordManager
+from third_data.third_blocks_manager import BlockMapManager
+from utils import global_util, tool, buy_condition_util
+from log_module import async_log_util
from db import redis_manager_delegate as redis_manager
-from log_module.log import logger_kpl_block_can_buy
+from log_module.log import logger_kpl_block_can_buy, logger_kpl_jx_out, logger_kpl_jx_in
from third_data.kpl_util import KPLPlatManager
from trade import trade_manager, l2_trade_util, trade_constant
@@ -31,16 +32,41 @@
__code_blocks = {}
# 澶囩敤
__code_by_blocks = {}
+ # 婵�杩涗拱鐨勪唬鐮佹澘鍧�
+ __code_blocks_for_radical_buy = {}
__instance = None
def __new__(cls, *args, **kwargs):
if not cls.__instance:
cls.__instance = super(KPLCodeJXBlockManager, cls).__new__(cls, *args, **kwargs)
+ cls.__load_data()
return cls.__instance
- def __get_redis(self):
- return self.__redisManager.getRedis()
+ @classmethod
+ def __load_data(cls):
+ keys = RedisUtils.keys(cls.__get_redis(), "kpl_jx_blocks_by-*")
+ if keys:
+ for k in keys:
+ val = RedisUtils.get(cls.__get_redis(), k)
+ val = json.loads(val)
+ cls.__code_by_blocks[k.split("-")[1]] = (val, time.time())
+ keys = RedisUtils.keys(cls.__get_redis(), "kpl_jx_blocks-*")
+ if keys:
+ for k in keys:
+ val = RedisUtils.get(cls.__get_redis(), k)
+ val = json.loads(val)
+ cls.__code_blocks[k.split("-")[1]] = (val, time.time())
+ keys = RedisUtils.keys(cls.__get_redis(), "kpl_jx_blocks_radical-*")
+ if keys:
+ for k in keys:
+ val = RedisUtils.get(cls.__get_redis(), k)
+ val = json.loads(val)
+ cls.__code_blocks_for_radical_buy[k.split("-")[1]] = (val, time.time())
+
+ @classmethod
+ def __get_redis(cls):
+ return cls.__redisManager.getRedis()
def save_jx_blocks(self, code, blocks: list, current_limit_up_blocks: set, by=False):
if not blocks:
@@ -61,28 +87,18 @@
RedisUtils.setex_async(self.__db, f"kpl_jx_blocks-{code}", tool.get_expire(), json.dumps(final_blocks))
self.__code_blocks[code] = (final_blocks, time.time())
- # 鑾峰彇绮鹃�夋澘鍧�
- def get_jx_blocks(self, code, by=False):
- if by:
- if code in self.__code_by_blocks:
- return self.__code_by_blocks[code]
- val = RedisUtils.get(self.__get_redis(), f"kpl_jx_blocks_by-{code}")
- if val is None:
- return None
- else:
- val = json.loads(val)
- self.__code_by_blocks[code] = val
- return self.__code_by_blocks[code]
- else:
- if code in self.__code_blocks:
- return self.__code_blocks[code]
- val = RedisUtils.get(self.__get_redis(), f"kpl_jx_blocks-{code}")
- if val is None:
- return None
- else:
- val = json.loads(val)
- self.__code_blocks[code] = val
- return self.__code_blocks[code]
+ def save_jx_blocks_for_radical_buy(self, code, blocks: list):
+ if not blocks:
+ return
+ RedisUtils.setex_async(self.__db, f"kpl_jx_blocks_radical-{code}", tool.get_expire(), json.dumps(blocks))
+ self.__code_blocks_for_radical_buy[code] = (blocks, time.time())
+
+ # 鑾峰彇绮鹃�夋澘鍧楋紙婵�杩涗拱锛�
+ def get_jx_blocks_radical(self, code):
+ blocks_info = self.__code_blocks_for_radical_buy.get(code)
+ if blocks_info:
+ return set(blocks_info[0])
+ return None
def get_jx_blocks_cache(self, code, by=False):
if by:
@@ -107,6 +123,8 @@
async_log_util.info(logger_kpl_block_can_buy,
f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�-{blocks} 鑰楁椂:{int(time.time() - start_time)}s")
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
+ # 璺熼殢绮鹃�夋澘鍧椾竴璧锋洿鏂�
+ self.load_jx_blocks_radical(code)
else:
# 杩樻病娑ㄥ仠鐨勯渶瑕佹洿鏂扮簿閫夋澘鍧� 鏇存柊绮鹃�夋澘鍧�
if abs(float(buy_1_price) - float(limit_up_price)) >= 0.001:
@@ -127,8 +145,8 @@
async_log_util.info(logger_kpl_block_can_buy,
f"{code}:鑾峰彇鍒扮簿閫夋澘鍧楋紙鏇存柊锛�-{blocks} 鑰楁椂:{int(time.time() - start_time)}s")
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
-
-
+ # 璺熼殢绮鹃�夋澘鍧椾竴璧锋洿鏂�
+ self.load_jx_blocks_radical(code)
elif price_rate > 0.03:
# 娣诲姞澶囩敤鏉垮潡
if not self.get_jx_blocks_cache(code, by=True):
@@ -137,9 +155,24 @@
self.save_jx_blocks(code, blocks, current_limit_up_blocks, by=True)
async_log_util.info(logger_kpl_block_can_buy,
f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�(澶囩敤)-{blocks} 鑰楁椂:{int(time.time() - start_time)}s")
+ # 璺熼殢绮鹃�夋澘鍧椾竴璧锋洿鏂�
+ self.load_jx_blocks_radical(code)
+
+ if price_rate > 0.03:
+ if not self.__code_blocks_for_radical_buy.get(code):
+ self.load_jx_blocks_radical(code)
except Exception as e:
logger_kpl_block_can_buy.error(f"{code} 鑾峰彇鏉垮潡鍑洪敊")
logger_kpl_block_can_buy.exception(e)
+
+ def load_jx_blocks_radical(self, code):
+ start_time = time.time()
+ blocks = kpl_api.getCodeJingXuanBlocks(code, jx=False)
+ blocks = set([b[1] for b in blocks])
+ # fblocks = BlockMapManager().filter_blocks(blocks)
+ async_log_util.info(logger_kpl_block_can_buy,
+ f"{code}:鑾峰彇鍒版澘鍧�(婵�杩涗拱) 杩囨护鍓�-{blocks} 鑰楁椂:{int(time.time() - start_time)}s")
+ self.save_jx_blocks_for_radical_buy(code, list(blocks))
# 绂佹涓嬪崟鐨勬澘鍧�
@@ -257,12 +290,6 @@
def get_today_limit_up_reason(cls, code):
return cls.__today_total_limit_up_reason_dict.get(code)
- # 浠婃棩娑ㄥ仠鍘熷洜鍙樺寲
- def set_today_limit_up_reason_change(self, code, from_reason, to_reason):
- RedisUtils.sadd(self.__get_redis(), f"kpl_limit_up_reason_his-{code}", from_reason)
- RedisUtils.expire(self.__get_redis(), f"kpl_limit_up_reason_his-{code}", tool.get_expire())
- self.__set_total_keys(code)
-
# 璁剧疆浠ｇ爜鐨勪粖鏃ユ定鍋滃師鍥�
def __set_total_keys(self, code):
keys = set()
@@ -314,31 +341,115 @@
__KPLPlateForbiddenManager = KPLPlateForbiddenManager()
__LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
__KPLPlatManager = KPLPlatManager()
+ # 绮鹃�夋祦鍏ュ墠鍑�
+ __top_jx_blocks = set()
+ # 绮鹃�夋祦鍑哄墠鍑�
+ __top_jx_out_blocks = set()
@classmethod
- def set_top_5_reasons(cls, datas):
- temp_list = []
- for d in datas:
- cls.total_reason_dict[d[1]] = d
- # 鎺掑簭
- for i in range(0, len(datas)):
- if datas[i][1] not in constant.KPL_INVALID_BLOCKS:
- # 锛堝悕绉�,鍑�娴佸叆閲戦,鎺掑悕锛�
- temp_list.append((datas[i][1], datas[i][3], len(temp_list)))
- # 鍙幏鍙栧墠10涓�
- if len(temp_list) > 10:
- break
- if datas[i][3] < 3 * 10000 * 10000:
- break
+ def set_market_jingxuan_blocks(cls, datas):
+ """
+ 璁剧疆绮鹃�夋祦鍏ユ暟鎹�
+ @param datas:
+ @return:
+ """
+ # blocks = set()
+ # 鑰佺増鏈疄鐜版柟寮�
+ # for data in datas:
+ # if data[3] <= 0:
+ # break
+ # blocks.add(data[1])
+ # cls.__top_jx_blocks = blocks
+ if True:
+ return
+ blocks = set()
+ for data in datas:
+ if data[1] in constant.KPL_INVALID_BLOCKS:
+ continue
+ if data[3] < 5e7:
+ continue
+ blocks.add(data[1])
+ if len(blocks) >= 10:
+ break
+ blocks.add(kpl_util.filter_block(data[1]))
+ # 璁板綍绮鹃�夋祦鍑烘棩蹇�
+ async_log_util.info(logger_kpl_jx_in, f"鍘熸暟鎹細{datas[:20]} 鏉垮潡锛歿blocks}")
+ cls.__top_jx_blocks = BlockMapManager().filter_blocks(blocks)
- for temp in temp_list:
- names = cls.__KPLPlatManager.get_same_plat_names_by_id(temp[0])
- for name in names:
- if name == temp[1]:
- continue
- temp_list.append((name, temp[1], temp[2]))
- cls.top_5_reason_list = temp_list
- cls.__reset_top_5_dict()
+ @classmethod
+ def set_market_jingxuan_blocks_from_custom(cls, datas):
+ """
+ 璁剧疆鑷畾涔夌簿閫夋祦鍏ユ暟鎹�
+ @param datas:[(鏉垮潡,娴佸叆閲戦)]
+ @return:
+ """
+ blocks = set()
+ for data in datas:
+ if data[0] in constant.KPL_INVALID_BLOCKS:
+ continue
+ if data[1] < 5e7:
+ continue
+ blocks.add(data[0])
+ if len(blocks) >= 10:
+ break
+ blocks.add(kpl_util.filter_block(data[0]))
+ # 璁板綍绮鹃�夋祦鍑烘棩蹇�
+ async_log_util.info(logger_kpl_jx_in, f"鍘熸暟鎹細{datas[:20]} 鏉垮潡锛歿blocks}")
+ cls.__top_jx_blocks = BlockMapManager().filter_blocks(blocks)
+
+ @classmethod
+ def set_market_jingxuan_out_blocks(cls, datas):
+ """
+ 璁剧疆绮鹃�夋祦鍑烘暟鎹�
+ @param datas:
+ @return:
+ """
+ if True:
+ return
+ blocks = set()
+ for data in datas:
+ if data[1] in constant.KPL_INVALID_BLOCKS:
+ continue
+ if data[3] > -5e7:
+ # 杩囨护5鍗冧竾浠ヤ笂鐨�
+ break
+ blocks.add(data[1])
+ if len(blocks) >= 10:
+ break
+ blocks.add(kpl_util.filter_block(data[1]))
+ # 璁板綍绮鹃�夋祦鍑烘棩蹇�
+ async_log_util.info(logger_kpl_jx_out, f"鍘熸暟鎹細{datas[:10]} 鏉垮潡锛歿blocks}")
+ cls.__top_jx_out_blocks = BlockMapManager().filter_blocks(blocks)
+
+ @classmethod
+ def set_market_jingxuan_out_blocks_from_custom(cls, datas):
+ """
+ 璁剧疆鑷畾涔夌簿閫夋祦鍑烘暟鎹�
+ @param datas:[(鏉垮潡,娴佸叆閲戦)]
+ @return:
+ """
+ blocks = set()
+ for data in datas:
+ if data[0] in constant.KPL_INVALID_BLOCKS:
+ continue
+ if data[1] > -5e7:
+ # 杩囨护5鍗冧竾浠ヤ笂鐨�
+ break
+ blocks.add(data[0])
+ if len(blocks) >= 10:
+ break
+ blocks.add(kpl_util.filter_block(data[0]))
+ # 璁板綍绮鹃�夋祦鍑烘棩蹇�
+ async_log_util.info(logger_kpl_jx_out, f"鍘熸暟鎹細{datas[:10]} 鏉垮潡锛歿blocks}")
+ cls.__top_jx_out_blocks = BlockMapManager().filter_blocks(blocks)
+
+ @classmethod
+ def get_top_market_jingxuan_blocks(cls):
+ return cls.__top_jx_blocks
+
+ @classmethod
+ def get_top_market_jingxuan_out_blocks(cls):
+ return cls.__top_jx_out_blocks
@classmethod
def set_top_5_industry(cls, datas):
@@ -371,35 +482,6 @@
temp_set = cls.top_5_key_dict.keys()
return temp_set
- # 閫氳繃鍏抽敭瀛楀垽鏂兘涔扮殑浠ｇ爜鏁伴噺
- @classmethod
- def get_can_buy_codes_count(cls, code, key):
- # 鍒ゆ柇琛屼笟娑ㄥ仠绁ㄦ暟閲忥紝闄ゅ紑鑷繁蹇呴』澶т簬1涓�
- temp_codes = LimitUpCodesPlateKeyManager.total_key_codes_dict.get(key)
- if temp_codes is None:
- temp_codes = set()
- else:
- temp_codes = set(temp_codes)
- temp_codes.discard(code)
- if len(temp_codes) < 1:
- # 鍚庢帓鎵嶈兘鎸傚崟
- return 0, "韬綅涓嶄负鍚庢帓"
-
- forbidden_plates = cls.__KPLPlateForbiddenManager.list_all_cache()
- if key in forbidden_plates:
- return 0, "涓嶄拱璇ユ澘鍧�"
-
- # 10:30浠ュ墠鍙互鎸�2涓崟
- if int(tool.get_now_time_str().replace(':', '')) < int("100000"):
- return 2, "10:00浠ュ墠鍙互鎸�2涓崟"
- # 10:30浠ュ悗
- if key not in cls.top_5_key_dict:
- return 0, "鍑�娴佸叆娌″湪鍓�5"
- if cls.top_5_key_dict[key][1] > 3 * 10000 * 10000:
- return 2, "鍑�娴佸叆鍦ㄥ墠5涓斿ぇ浜�3浜�"
- else:
- return 1, "鍑�娴佸叆鍦ㄥ墠5"
-
@classmethod
def is_in_top(cls, keys):
reasons = cls.get_can_buy_key_set()
@@ -419,6 +501,14 @@
__history_limit_up_reason_dict = {}
# 鏉垮潡
__blocks_dict = {}
+
+ __instance = None
+
+ def __new__(cls, *args, **kwargs):
+ if not cls.__instance:
+ cls.__instance = super(CodesHisReasonAndBlocksManager, cls).__new__(cls, *args, **kwargs)
+
+ return cls.__instance
def __get_redis(self):
return self.__redisManager.getRedis()
@@ -488,6 +578,9 @@
return self.__history_blocks_dict_cache.get(code)
try:
kpl_results = KPLLimitUpDataUtil.get_latest_block_infos(code=code)
+ # 鍙栨渶杩�2鏉℃暟鎹�
+ if kpl_results and len(kpl_results) > 2:
+ kpl_results = kpl_results[-2:]
keys = set()
if kpl_results:
keys |= set([x[2] for x in kpl_results])
@@ -500,6 +593,14 @@
pass
return set()
+ def get_history_blocks_cache(self, code):
+ """
+ 鑾峰彇180澶╃殑鍘嗗彶娑ㄥ仠鍘熷洜缂撳瓨
+ @param code:
+ @return:
+ """
+ return self.__history_blocks_dict_cache.get(code)
+
# 鐩爣浠ｇ爜鏉垮潡鍏抽敭璇嶇鐞�
class TargetCodePlateKeyManager:
@@ -511,7 +612,7 @@
return self.__redisManager.getRedis()
# 杩斿洖key闆嗗悎(鎺掗櫎鏃犳晥鏉垮潡),浠婃棩娑ㄥ仠鍘熷洜,浠婃棩鍘嗗彶娑ㄥ仠鍘熷洜,鍘嗗彶娑ㄥ仠鍘熷洜,浜岀骇,绮鹃�夋澘鍧�
- def get_plate_keys(self, code):
+ def get_plate_keys(self, code, contains_today=True):
"""
鑾峰彇浠ｇ爜鐨勬澘鍧�: 锛�180澶╃殑娑ㄥ仠鍘熷洜+鎺ㄨ崘鍘熷洜锛�+浠婃棩娑ㄥ仠鍘熷洜+浠婃棩娑ㄥ仠鎺ㄨ崘鍘熷洜+浠婃棩鎺ㄨ崘鍘熷洜
@param code:
@@ -543,14 +644,22 @@
if jingxuan_block_info:
jingxuan_blocks = jingxuan_block_info[0]
k4 |= set(jingxuan_blocks) # set([x[1] for x in jingxuan_blocks])
- if k1:
+ if k1 and contains_today:
# 娑ㄥ仠杩�
keys |= k1
# 鑾峰彇涓嶅埌娑ㄥ仠鍘熷洜
- keys |= k4
+ if contains_today:
+ keys |= k4
keys = keys - set(constant.KPL_INVALID_BLOCKS)
return keys, k1, k11, k2, k3, k4
+
+ def get_plate_keys_for_radical_buy(self, code):
+ """
+ 婵�杩涗拱鍏ョ殑鏉垮潡
+ @param code:
+ @return:
+ """
class CodePlateKeyBuyManager:
@@ -582,12 +691,12 @@
l2_trade_util.forbidden_trade(code, msg=msg)
logger_kpl_block_can_buy.info(msg)
- # 鏄惁闇�瑕佹縺杩涗拱
+ # 鏄惁闇�瑕佺Н鏋佷拱
@classmethod
def __is_need_active_buy(cls, code, block, current_rank, open_limit_up_count):
"""
- 鏉垮潡鏄惁闇�瑕佹縺杩涗拱鍏�
- 瑙勫垯锛氭牴鎹韩浣嶅垽鏂槸鍚﹂渶瑕佹縺杩涗拱锛屾牴鎹椂闂村垝鍒�
+ 鏉垮潡鏄惁闇�瑕佺Н鏋佷拱鍏�
+ 瑙勫垯锛氭牴鎹韩浣嶅垽鏂槸鍚﹂渶瑕佺Н鏋佷拱锛屾牴鎹椂闂村垝鍒�
@param code: 浠ｇ爜
@param block: 鏉垮潡鍚嶇О
@param current_rank: 鐩墠鍦ㄦ澘鍧椾腑鐨勮韩浣嶏紝浠�0寮�濮�
@@ -609,7 +718,7 @@
break
return False
- # 杩斿洖鍐呭(鏄惁鍙拱, 鏄惁涓虹嫭鑻�, 鎻忚堪淇℃伅, 鏄惁涓哄己鍔夸富绾�, 鏄惁闇�瑕佹縺杩涗拱)
+ # 杩斿洖鍐呭(鏄惁鍙拱, 鏄惁涓虹嫭鑻�, 鎻忚堪淇℃伅, 鏄惁涓哄己鍔夸富绾�, 鏄惁闇�瑕佺Н鏋佷拱)
@classmethod
def __is_block_can_buy(cls, code, block, current_limit_up_datas, code_limit_up_reasons_dict,
yesterday_current_limit_up_codes, limit_up_record_datas, current_limit_up_block_codes_dict,
@@ -692,7 +801,7 @@
current_open_limit_up_codes),
shsz=True,
limit_up_time=first_limit_up_time)
- # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
+ # 璁＄畻鏄惁闇�瑕佺Н鏋佷拱鍏�
is_active_buy = cls.__is_need_active_buy(code, block, current_shsz_rank, len(current_open_limit_up_codes))
# record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
@@ -825,7 +934,7 @@
shsz=True,
limit_up_time=first_limit_up_time)
- # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
+ # 璁＄畻鏄惁闇�瑕佺Н鏋佷拱鍏�
is_active_buy = cls.__is_need_active_buy(code, block, current_shsz_rank, len(current_open_limit_up_codes))
if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
@@ -852,21 +961,31 @@
# 鍔犺浇娑ㄥ仠浠ｇ爜鐨勭洰鏍囨澘鍧�
def load_code_block():
if limit_up_record_datas:
+ # 鑾峰彇浠婃棩9:30浠ュ墠鐨勬椂闂�
+ time_str = datetime.datetime.now().strftime("%Y-%m-%d") + " 09:30:00"
+ timestamp = time.mktime(time.strptime(time_str, '%Y-%m-%d %H:%M:%S'))
+
for d in limit_up_record_datas:
if d[2] in constant.KPL_INVALID_BLOCKS and d[3] in before_blocks_dict:
code_limit_up_reasons_dict[d[3]] = {list(before_blocks_dict.get(d[3]))[0]}
else:
code_limit_up_reasons_dict[d[3]] = {d[2]}
- # 涓嶅寘鍚帹鑽愬師鍥�
- # if d[6]:
- # code_limit_up_reasons_dict[d[3]] |= set(d[6].split("銆�"))
+ # 寮�1鎵嶈兘鍖呭惈鎺ㄨ崘鍘熷洜
+ if d[6] and int(d[5]) < timestamp:
+ code_limit_up_reasons_dict[d[3]] |= set(d[6].split("銆�"))
return code_limit_up_reasons_dict
if current_limit_up_datas is None:
current_limit_up_datas = []
# 鑾峰彇鐩爣浠ｇ爜鏉垮潡
- keys, k1, k11, k2, k3, k4 = cls.__TargetCodePlateKeyManager.get_plate_keys(code)
+ # keys, k1, k11, k2, k3, k4 = cls.__TargetCodePlateKeyManager.get_plate_keys(code)
+ keys = LimitUpCodesBlockRecordManager().get_radical_buy_blocks(code)
+ if not keys:
+ keys = set()
+ keys = BlockMapManager().filter_blocks(keys)
+ if keys:
+ keys -= constant.KPL_INVALID_BLOCKS
# log.logger_kpl_debug.info("{}鏈�缁堝叧閿瘝锛歿}", code, keys)
@@ -875,6 +994,7 @@
fresults = []
if not keys:
return fresults, set()
+
code_limit_up_reasons_dict = {}
load_code_block()
for block in keys:
@@ -893,7 +1013,7 @@
# 鏄惁鍙互涓嬪崟
# 杩斿洖锛氬彲浠ヤ拱鐨勬澘鍧�,鏄惁鐙嫍,娑堟伅
- # 鍙拱鐨勬澘鍧�, 鏄惁鐙嫍, 娑堟伅, 鍙拱鐨勫己鍔挎澘鍧�, 鍏抽敭璇�, 婵�杩涗拱鐨勬澘鍧�
+ # 鍙拱鐨勬澘鍧�, 鏄惁鐙嫍, 娑堟伅, 鍙拱鐨勫己鍔挎澘鍧�, 鍏抽敭璇�, 绉瀬涔扮殑鏉垮潡
@classmethod
def can_buy(cls, code):
if constant.TEST:
@@ -903,7 +1023,7 @@
# return True, "涓嶅垽鏂澘鍧楄韩浣�"
return cls.__can_buy_compute_result_dict.get(code)
- # 杩斿洖:(鍙互涔扮殑鏉垮潡鍒楄〃, 鏄惁鏄嫭鑻�, 娑堟伅绠�浠�,鍙拱鐨勫己鍔夸富绾�, 婵�杩涗拱鍏ユ澘鍧楀垪琛�)
+ # 杩斿洖:(鍙互涔扮殑鏉垮潡鍒楄〃, 鏄惁鏄嫭鑻�, 娑堟伅绠�浠�,鍙拱鐨勫己鍔夸富绾�, 绉瀬涔板叆鏉垮潡鍒楄〃)
@classmethod
def __compute_can_buy_blocks(cls, code, current_limit_up_datas, limit_up_record_datas,
yesterday_current_limit_up_codes, before_blocks_dict,
@@ -966,7 +1086,7 @@
msg_list = []
active_buy_blocks = []
for r in blocks_compute_results:
- # r鐨勬暟鎹粨鏋�(鏉垮潡,鏄惁鍙互涔�,鏄惁鐙嫍,娑堟伅,鏄惁鏄己鍔挎澘鍧�, 婵�杩涗拱鍏ヤ俊鎭�)
+ # r鐨勬暟鎹粨鏋�(鏉垮潡,鏄惁鍙互涔�,鏄惁鐙嫍,娑堟伅,鏄惁鏄己鍔挎澘鍧�, 绉瀬涔板叆淇℃伅)
if r[2]:
# 鐙嫍
unique_count += 1
@@ -991,7 +1111,7 @@
msg_list.append(r[3])
if r[5]:
active_buy_blocks.append(r[0])
- msg_list.append(f"銆恵r[0]}銆戞縺杩涗拱鍏�({r[5]})")
+ msg_list.append(f"銆恵r[0]}銆戠Н鏋佷拱鍏�({r[5]})")
else:
if r[3]:
msg_list.append(r[3])
--
Gitblit v1.8.0