From 2ccd2ee1112ee84f5139fc5b8cf2ce070f8f991e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 31 十二月 2024 17:20:17 +0800
Subject: [PATCH] 测试
---
api/outside_api_command_callback.py | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index d891aa1..dd7c54d 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -18,7 +18,8 @@
from code_attribute import gpcode_manager, code_volumn_manager, zyltgb_util
from code_attribute.code_data_util import ZYLTGBUtil
from code_attribute.code_l1_data_manager import L1DataManager
-from code_attribute.gpcode_manager import CodePrePriceManager, CodesNameManager, WantBuyCodesManager
+from code_attribute.gpcode_manager import CodePrePriceManager, CodesNameManager, WantBuyCodesManager, \
+ HumanRemoveForbiddenManager
from db import mysql_data_delegate as mysql_data, redis_manager_delegate as redis_manager
from db.redis_manager_delegate import RedisUtils
from huaxin_client import l1_subscript_codes_manager
@@ -291,8 +292,10 @@
if code_list_type == outside_api_command_manager.CODE_LIST_WANT:
if operate == outside_api_command_manager.OPERRATE_SET:
gpcode_manager.WantBuyCodesManager().add_code(code)
- # 鍔犳兂涔板崟瑕佷粠榛戝悕鍗曠Щ闄�
- l2_trade_util.remove_from_forbidden_trade_codes(code)
+ if l2_trade_util.is_in_forbidden_trade_codes(code):
+ l2_trade_util.remove_from_forbidden_trade_codes(code)
+ # 鍔犳兂涔板崟瑕佷粠榛戝悕鍗曠Щ闄�
+ HumanRemoveForbiddenManager().add_code(code)
name = gpcode_manager.get_code_name(code)
if not name:
results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -315,8 +318,9 @@
cancel_type=trade_constant.CANCEL_TYPE_HUMAN)
except Exception as e:
logger_debug.exception(e)
- l2_trade_util.forbidden_trade(code, msg="鎵嬪姩鍔犲叆 trade_server")
+ l2_trade_util.forbidden_trade(code, msg="鎵嬪姩鍔犲叆 trade_server", force=True)
WantBuyCodesManager().remove_code(code)
+ HumanRemoveForbiddenManager().remove_code(code)
name = gpcode_manager.get_code_name(code)
if not name:
results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -324,7 +328,7 @@
gpcode_manager.CodesNameManager.add_first_code_name(code, results[code])
elif operate == outside_api_command_manager.OPERRATE_DELETE:
l2_trade_util.remove_from_forbidden_trade_codes(code)
- WantBuyCodesManager().add_code(code)
+ HumanRemoveForbiddenManager().add_code(code)
elif operate == outside_api_command_manager.OPERRATE_GET:
codes = gpcode_manager.BlackListCodeManager().list_codes_cache()
datas = []
@@ -483,7 +487,7 @@
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:
@@ -541,6 +545,7 @@
# 鑾峰彇浠婃棩K绾跨殑鏇存柊鏁伴噺
try:
dates = HistoryKDatasUtils.get_latest_trading_date_cache(5)
+ logger_debug.info(f"鑾峰彇鍒扮殑浜ゆ槗鏃ワ細{dates}")
latest_trading_date = None
if dates:
latest_trading_date = dates[0]
@@ -548,6 +553,7 @@
raise Exception("娌℃湁鑾峰彇鍒颁笂涓�涓氦鏄撴棩鐨勬棩鏈�")
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)
@@ -1408,7 +1414,7 @@
if code not in block_codes:
block_codes[code] = {}
block_codes[code][b] = len(codes)
- self.send_response({"code": 0, "data": json.dumps(block_codes)},
+ self.send_response({"code": 0, "data": block_codes},
client_id,
request_id)
--
Gitblit v1.8.0