gp-server.git - Gitblit

			@@ -312,11 +312,12 @@
			class TargetCodePlateKeyManager:
			__redisManager = redis_manager.RedisManager(1)
			__CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
			__KPLCodeJXBlockManager = KPLCodeJXBlockManager()

			def __get_redis(self):
			return self.__redisManager.getRedis()

			# 返回key集合(排除无效板块),今日涨停原因,今日历史涨停原因,历史涨停原因,二级,板块
			# 返回key集合(排除无效板块),今日涨停原因,今日历史涨停原因,历史涨停原因,二级,精选板块
			def get_plate_keys(self, code):
			keys = set()
			k1 = set()
			@@ -332,9 +333,10 @@
			if industry:
			k3 = {industry}

			k4 = self.__CodesPlateKeysManager.get_blocks(code)
			if k4 is None:
			k4 = set()
			k4 = set()
			jingxuan_blocks = self.__KPLCodeJXBlockManager.get_jx_blocks(code)
			if jingxuan_blocks:
			k4 \|= set([x[1] for x in jingxuan_blocks])
			for k in [k1, k11, k2, k3, k4]:
			keys \|= k

			@@ -359,7 +361,7 @@
			__TargetCodePlateKeyManager = TargetCodePlateKeyManager()
			__LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
			__CodesHisReasonAndBlocksManager = CodesHisReasonAndBlocksManager()
			__KPLCodeJXBlockManager = KPLCodeJXBlockManager()


			# 获取可以买的板块
			# current_limit_up_datas: 今日实时涨停
			@@ -398,16 +400,16 @@
			for k in k2:
			if k not in constant.KPL_INVALID_BLOCKS:
			keys.add(k)
			if not keys:
			# 始终获取精选板块
			if True:
			# 获取
			jx_blocks = cls.__KPLCodeJXBlockManager.get_jx_blocks(code)
			if jx_blocks:
			keys \|= set([k[1] for k in jx_blocks[:2]])
			if k4:
			keys \|= k4
			log.logger_kpl_debug.info("{}最终关键词：{}", code, keys)

			# 涨停列表中匹配关键词，返回（板块:代码集合），代码集合中已经排除自身
			if not keys:
			return cls.BLOCK_TYPE_NONE, None, "尚未找到涨停原因"
			return None, "尚未找到涨停原因"
			code_limit_up_reason_dict = {}
			load_code_block()
			msg_list = []
			@@ -415,18 +417,18 @@
			can_buy_blocks = []
			for block in keys:
			is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas,
			yesterday_current_limit_up_codes, 20)
			yesterday_current_limit_up_codes, 50)
			is_top_4_current, top_4_current = kpl_block_util.is_current_top_block(code, block, current_limit_up_datas,
			yesterday_current_limit_up_codes, 10)
			yesterday_current_limit_up_codes, 50)
			is_top_4 = is_top_8_record and is_top_4_current
			msg_list.append(f"\n实时top10: {top_4_current}(涨停数量：{len(current_limit_up_datas)})")
			msg_list.append(f"历史top20: {top_8_record}")
			msg_list.append(f"\n实时top10(涨停数量：{len(current_limit_up_datas)})")
			msg_list.append(f"历史top20(涨停数量：{len(top_8_record)})")

			# 获取主板实时身位
			# 获取主板实时身位,剔除高位板
			current_shsz_rank = kpl_block_util.get_code_current_rank(code, block, current_limit_up_datas,
			code_limit_up_reason_dict, shsz=True)
			code_limit_up_reason_dict, yesterday_current_limit_up_codes, shsz=True)
			record_shsz_rank = kpl_block_util.get_code_record_rank(code, block, limit_up_record_datas,
			code_limit_up_reason_dict, shsz=True)
			code_limit_up_reason_dict, yesterday_current_limit_up_codes, shsz=True)
			# 获取主板历史身位
			if is_top_4:
			pen_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
			@@ -437,7 +439,7 @@
			pen_limit_up_codes) + 1:
			# 属于龙1,龙2
			can_buy_blocks.append((block,
			f"{block}：top4涨停板块，主板开1({pen_limit_up_codes}),属于主板前龙{len(pen_limit_up_codes) + 1}(实时身位-{current_shsz_rank})"))
			f"{block}：top10涨停板块，主板开1({pen_limit_up_codes}),属于主板前龙{len(pen_limit_up_codes) + 1}(实时身位-{current_shsz_rank})"))
			continue
			else:
			msg_list.append(
			@@ -468,7 +470,7 @@
			f"板块-{block}: 不是top4涨停板块，满足精选/行业流入要求,不为主板龙1（实时身位-{current_shsz_rank},历史身位-{record_shsz_rank}）")
			continue
			if len(can_buy_blocks) == len(keys):
			blocks = "/".join([x[0] for x in can_buy_blocks])
			blocks = [x[0] for x in can_buy_blocks]
			blocks_msg = "\n".join([x[1] for x in can_buy_blocks])
			return blocks, blocks_msg

			@@ -482,10 +484,10 @@
			if constant.TEST:
			return True, "", cls.BLOCK_TYPE_NONE

			block, block_msg = cls.get_can_buy_block(code, current_limit_up_datas,
			limit_up_record_datas, yesterday_current_limit_up_codes,
			before_blocks_dict)
			if block is None:
			blocks, block_msg = cls.get_can_buy_block(code, current_limit_up_datas,
			limit_up_record_datas, yesterday_current_limit_up_codes,
			before_blocks_dict)
			if not blocks:
			return False, block_msg

			# ---------------------------------判断目标代码的板块-------------------start------------
			@@ -536,9 +538,9 @@
			# ---------------------------------加载已经下单/成交的代码信息------------start-------------
			# match_reasons = match_limit_up_result.keys()
			# 判断匹配到的原因是否已经有下单/买入成功的代码
			codes_delegate = set(trade_manager.get_codes_by_trade_states(
			codes_delegate = set(trade_manager.CodesTradeStateManager().get_codes_by_trade_states_cache(
			{trade_manager.TRADE_STATE_BUY_DELEGATED, trade_manager.TRADE_STATE_BUY_PLACE_ORDER}))
			codes_success = set(trade_manager.get_codes_by_trade_states(
			codes_success = set(trade_manager.CodesTradeStateManager().get_codes_by_trade_states_cache(
			{trade_manager.TRADE_STATE_BUY_SUCCESS}))

			codes = codes_delegate \| codes_success
			@@ -550,7 +552,7 @@
			for c in codes:
			keys_, k1_, k11_, k2_, k3_, k4_ = cls.__TargetCodePlateKeyManager.get_plate_keys(c)
			# 实时涨停原因
			trade_codes_blocks_dict[c] = k1_
			trade_codes_blocks_dict[c] = k1_\|k4_
			# 统计板块中的代码
			trade_block_codes_dict = {}
			for c in trade_codes_blocks_dict:
			@@ -566,11 +568,11 @@
			# ---------------------------------加载已经下单/成交的代码信息------------end-------------

			msg_list = []
			for key in [block]:
			for key in blocks:
			# 板块中已经有成交的就不下单了
			if key in trade_success_blocks_count:
			success_codes_count = len(trade_success_blocks_count[key])
			if success_codes_count >= 2:
			if success_codes_count >= 1:
			msg_list.append(f"【{key}】中已经有{success_codes_count}个成交代码")
			log.logger_kpl_debug.debug(f"{code}：板块（{key}）已经有成交【{trade_success_blocks_count[key]}】")
			continue