From 726e083845c4cfe2d50f381ee09336136be3e01e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 五月 2024 18:21:32 +0800
Subject: [PATCH] 可转债接口

---
 middle_api_server.py |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/middle_api_server.py b/middle_api_server.py
index a83f3ce..3e6c927 100644
--- a/middle_api_server.py
+++ b/middle_api_server.py
@@ -14,6 +14,7 @@
 from db import mysql_data, redis_manager
 from db.redis_manager import RedisUtils
 from log import logger_request_debug
+from middle_l1_data_server import L1DataManager
 from output import push_msg_manager
 from utils import socket_util, hosting_api_util, huaxin_trade_record_manager, huaxin_util, tool, global_data_cache_util
 from utils.history_k_data_util import HistoryKDatasUtils, JueJinApi
@@ -158,11 +159,14 @@
                             break
 
                         elif type_ == 'common':
-                            # 楠岃瘉绛惧悕
-                            # if not is_sign_right:
-                            #    raise Exception("绛惧悕閿欒")
                             params = data_json["data"]
-                            result = hosting_api_util.common_request(params)
+                            ctype = params.get("ctype")
+                            trade_sell_types = {"get_current_l1_codes", "get_positions", "get_l2_deal_price"}
+                            if ctype in trade_sell_types:
+                                result = hosting_api_util.common_request(params,
+                                                                         client_type=socket_manager.ClientSocketManager.CLIENT_TYPE_TRADE_SELL)
+                            else:
+                                result = hosting_api_util.common_request(params)
                             return_str = json.dumps(result)
                             break
 
@@ -213,12 +217,25 @@
                             # 鍚屾浜ゆ槗鏁版嵁
                             sync_type = data_json["data"]["type"]
                             hosting_api_util.refresh_trade_data(sync_type)
+                            hosting_api_util.refresh_trade_data(sync_type, blocking=False,
+                                                                client_type=socket_manager.ClientSocketManager.CLIENT_TYPE_TRADE_SELL)
                             return_str = json.dumps(
                                 {"code": 0, "data": {}, "msg": ""})
                         elif type_ == "get_huaxin_subscript_codes":
                             # 鑾峰彇鍗庨懌璁㈤槄鐨勪唬鐮�
                             fresults = global_data_cache_util.huaxin_subscript_codes
                             update_time = global_data_cache_util.huaxin_subscript_codes_update_time
+                            if update_time is None:
+                                update_time = ''
+                            return_str = json.dumps(
+                                {"code": 0,
+                                 "data": {"count": len(fresults), "list": fresults, "update_time": update_time},
+                                 "msg": ""})
+                            pass
+                        elif type_ == "get_huaxin_position_subscript_codes":
+                            # 鑾峰彇鍗庨懌璁㈤槄鐨勪唬鐮�
+                            fresults = global_data_cache_util.huaxin_position_subscript_codes
+                            update_time = global_data_cache_util.huaxin_position_subscript_codes_update_time
                             if update_time is None:
                                 update_time = ''
                             return_str = json.dumps(
@@ -294,7 +311,7 @@
                             return_str = json.dumps(result)
                         elif type_ == "trade_server_channels":
                             trade_channels = socket_manager.ClientSocketManager.list_client(
-                                socket_manager.ClientSocketManager.CLIENT_TYPE_TRADE)
+                                socket_manager.ClientSocketManager.CLIENT_TYPE_TRADE_SELL)
                             common_channels = socket_manager.ClientSocketManager.list_client(
                                 socket_manager.ClientSocketManager.CLIENT_TYPE_COMMON)
                             data = {}
@@ -336,10 +353,6 @@
                             code = data_json["data"]["code"]
                             result = hosting_api_util.get_code_position_info(code)
                             return_str = json.dumps(result)
-                        elif type_ == "common":
-                            params = data_json["data"]
-                            result = hosting_api_util.common_request(params)
-                            return_str = json.dumps(result)
                         elif type_ == "register_msg_receiver":
                             params = data_json["data"]
                             msg_types = params["types"]
@@ -375,12 +388,21 @@
                                     continue
                                 fresults.append(temp)
                                 return_str = json.dumps(json.dumps({"code": 0, "data": fresults}))
+                        elif type_ == "get_buy1_info":
+                            code = data_json["data"]["code"]
+                            result = hosting_api_util.common_request({"ctype": "get_buy1_info", "code": code},
+                                                                     client_type=socket_manager.ClientSocketManager.CLIENT_TYPE_TRADE_SELL)
+                            return_str = json.dumps(result)
+                        elif type_ == "get_l1_data":
+                            results = L1DataManager.get_current_l1_data()
+                            return_str = json.dumps({"code": 0, "data": results})
                     finally:
                         log.request_info("middle_api_server", f"璇锋眰缁撴潫锛歿type_}")
                 break
                 # sk.close()
             except Exception as e:
                 logging.exception(e)
+                logger_request_debug.exception(e)
                 return_str = json.dumps({"code": 401, "msg": str(e)})
                 break
             finally:

--
Gitblit v1.8.0