gp-server.git - Gitblit

			@@ -36,7 +36,8 @@
			logger_trade, logger_trade_position_api_request, logger_request_api, \
			logger_real_place_order_position, logger_device
			from output import l2_output_util
			from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager
			from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager, \
			history_k_data_util
			from third_data.code_plate_key_manager import KPLCodeJXBlockManager, RealTimeKplMarketData
			from third_data.history_k_data_manager import HistoryKDataManager
			from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils
			@@ -45,10 +46,10 @@
			from third_data.kpl_limit_up_data_manager import CodeLimitUpSequenceManager
			from third_data.kpl_util import KPLDataType
			from third_data.third_blocks_manager import CodeThirdBlocksManager, SOURCE_TYPE_KPL, BlockMapManager
			from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant
			from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant, trade_record_log_util
			import l2_data_util as l2_data_util_old
			from trade.buy_money_count_setting import BuyMoneyAndCountSetting, RadicalBuyBlockCodeCountManager
			from trade.buy_radical import block_special_codes_manager
			from trade.buy_radical import block_special_codes_manager, radical_buy_data_manager

			from trade.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
			huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
			@@ -374,6 +375,7 @@
			elif code_list_type == outside_api_command_manager.CODE_LIST_MUST_BUY:
			if operate == outside_api_command_manager.OPERRATE_SET:
			gpcode_manager.MustBuyCodesManager().add_code(code)
			trade_record_log_util.add_must_buy(code, "手动拉红")
			name = gpcode_manager.get_code_name(code)
			if not name:
			results = HistoryKDatasUtils.get_gp_codes_names([code])
			@@ -487,7 +489,8 @@
			try:
			fdata = {}
			try:
			date = JueJinApi.get_previous_trading_date(tool.get_now_date_str())
			date = HistoryKDatasUtils.get_trading_dates(tool.date_sub(tool.get_now_date_str(), 10),
			tool.get_now_date_str())
			if date:
			fdata["juejin"] = 1
			except Exception as e:
			@@ -544,14 +547,10 @@

			# 获取今日K线的更新数量
			try:
			dates = HistoryKDatasUtils.get_latest_trading_date_cache(5)
			latest_trading_date = None
			if dates:
			latest_trading_date = dates[0]
			if latest_trading_date is None:
			raise Exception("没有获取到上一个交易日的日期")
			latest_trading_date = history_k_data_util.get_k_bar_dead_date()
			codes = HistoryKDataManager().get_history_bars_codes(latest_trading_date)
			count = len(codes)
			logger_debug.info(f"K线代码数量：{count}")
			fdata["today_history_k_bar_count"] = count
			except Exception as e:
			logger_debug.exception(e)
			@@ -1350,8 +1349,9 @@
			data = {
			"radical_buy": {"price": (constant.MIN_CODE_RADICAL_BUY_PRICE, constant.MAX_CODE_RADICAL_BUY_PRICE),
			"zyltgb": constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES,
			"top_block_count_by_market_strong":constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG,
			"special_codes_max_block_in_rank": constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL
			"top_block_count_by_market_strong": constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG,
			"special_codes_max_block_in_rank": constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL,
			"ignore_block_in_money_market_strong":constant.IGNORE_BLOCK_IN_MONEY_MARKET_STRONG
			}}
			self.send_response({"code": 0, "data": data, "msg": f""},
			client_id,
			@@ -1364,11 +1364,13 @@
			constant.MAX_CODE_RADICAL_BUY_PRICE = radical_buy["price"][1]
			constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES = radical_buy["zyltgb"]
			if radical_buy.get("top_block_count_by_market_strong"):
			constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG = radical_buy.get("top_block_count_by_market_strong")
			constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG = radical_buy.get(
			"top_block_count_by_market_strong")
			if radical_buy.get("special_codes_max_block_in_rank"):
			constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL = radical_buy.get(
			"special_codes_max_block_in_rank")

			if radical_buy.get('ignore_block_in_money_market_strong') is not None:
			constant.IGNORE_BLOCK_IN_MONEY_MARKET_STRONG = radical_buy.get('ignore_block_in_money_market_strong')
			self.send_response({"code": 0, "data": {}, "msg": f""},
			client_id,
			request_id)
			@@ -1407,7 +1409,7 @@
			fblocks, before_fblocks = RadicalBuyBlockManager.get_code_blocks(code)
			# 获取板块历史涨停
			for b in fblocks:
			codes = LimitUpDataConstant.get_history_limit_up_block_codes(b)
			codes = LimitUpDataConstant.get_history_limit_up_block_codes(b)
			if codes:
			if code not in block_codes:
			block_codes[code] = {}
			@@ -1416,6 +1418,16 @@
			client_id,
			request_id)

			elif ctype == "test_place_order":
			# 获取相同板块的涨停代码数量
			code = data.get("code")
			# total_datas = l2_data_util.local_today_datas.get(code)
			# trade_manager.test_order(code, total_datas[-1], total_datas[-1]["index"])
			# radical_buy_data_manager.pull_pre_deal_big_orders(code)
			self.send_response({"code": 0, "data": {}},
			client_id,
			request_id)



			except Exception as e: