From 751183dcd74207a50834cacc575f0dfccb41658c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 06 六月 2023 18:13:05 +0800
Subject: [PATCH] 交易优化，看盘接口完善
---
server.py | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/server.py b/server.py
index 34cd254..04241cd 100644
--- a/server.py
+++ b/server.py
@@ -32,12 +32,12 @@
import ths_util
import tool
from output import code_info_output
-from third_data import hot_block_data_process, block_info, kpl_api, kpl_util
-from third_data.code_plate_key_manager import TargetCodePlateKeyManager
+from third_data import hot_block_data_process, block_info, kpl_api
+from third_data.code_plate_key_manager import CodesHisReasonAndBlocksManager
from third_data.kpl_data_manager import KPLCodeLimitUpReasonManager, KPLLimitUpDataRecordManager
from ths import l2_listen_pos_health_manager
from trade import trade_gui, trade_data_manager, trade_manager, l2_trade_util, deal_big_money_manager, \
- first_code_score_manager, current_price_process_manager
+ first_code_score_manager, current_price_process_manager, trade_juejin
import l2_code_operate
from code_data_util import ZYLTGBUtil
import l2.transaction_progress
@@ -77,7 +77,7 @@
latest_oringin_data = {}
last_l2_listen_health_time = {}
__KPLCodeLimitUpReasonManager = KPLCodeLimitUpReasonManager()
- __TargetCodePlateKeyManager = TargetCodePlateKeyManager()
+ __CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
def setup(self):
super().setup() # 鍙互涓嶈皟鐢ㄧ埗绫荤殑setup()鏂规硶锛岀埗绫荤殑setup鏂规硶浠�涔堥兘娌″仛
@@ -225,10 +225,10 @@
code_list.append(data["code"])
# 鑾峰彇鍩烘湰淇℃伅
code_datas = juejin.JueJinManager.get_gp_latest_info(code_list)
- if is_add:
- gpcode_manager.add_gp_list(code_datas)
- else:
- gpcode_manager.set_gp_list(code_datas)
+ # if is_add:
+ # gpcode_manager.add_gp_list(code_datas)
+ # else:
+ # gpcode_manager.set_gp_list(code_datas)
if not is_add:
# 鍚屾鍚岃姳椤虹洰鏍囦唬鐮�
@@ -299,15 +299,15 @@
# 鏉垮潡鍏抽敭瀛楀噯澶�
for code in codes:
- if self.__TargetCodePlateKeyManager.get_history_limit_up_reason(code) is None:
- self.__TargetCodePlateKeyManager.set_history_limit_up_reason(code,
- KPLLimitUpDataRecordManager.get_latest_blocks_set(
- code))
- if self.__TargetCodePlateKeyManager.get_blocks(code) is None:
+ if not self.__CodesPlateKeysManager.get_history_limit_up_reason(code) is None:
+ self.__CodesPlateKeysManager.set_history_limit_up_reason(code,
+ KPLLimitUpDataRecordManager.get_latest_blocks_set(
+ code))
+ if self.__CodesPlateKeysManager.get_blocks(code) is None:
try:
results = kpl_api.getStockIDPlate(code)
bs = [r[1] for r in results]
- self.__TargetCodePlateKeyManager.set_blocks(code, bs)
+ self.__CodesPlateKeysManager.set_blocks(code, bs)
except Exception as e:
logging.exception(e)
pass
@@ -340,7 +340,7 @@
volumes_data)
gpcode_manager.FirstCodeManager.add_record(codes)
if new_add_codes:
- gpcode_manager.set_first_gp_codes_with_data(juejin.JueJinManager.get_gp_latest_info(codes))
+ gpcode_manager.set_first_gp_codes_with_data(juejin.JueJinManager.get_gp_latest_info(codes,fields="symbol,sec_name,sec_type,sec_level"))
# 鍔犲叆棣栨澘鍘嗗彶璁板綍
logger_first_code_record.info("鏂板棣栨澘锛歿}", new_add_codes)
@@ -914,7 +914,7 @@
def send_msg(client_id, data):
_ip = client_manager.getActiveClientIP(client_id)
- print("ip", client_id, _ip)
+ # print("ip", client_id, _ip)
if _ip is None or len(_ip) <= 0:
raise Exception("瀹㈡埛绔疘P涓虹┖")
socketClient = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -934,7 +934,7 @@
while True:
clients = authority.get_l2_clients()
for client in clients:
- print("蹇冭烦", client)
+ # print("蹇冭烦", client)
try:
send_msg(client, {"action": "test"})
except:
@@ -987,11 +987,23 @@
l2_listen_pos_health_manager.init_all(client_infos)
-if __name__ == "__main__1":
- cid, pid = gpcode_manager.get_listen_code_pos("000070")
- print(cid, pid)
-
if __name__ == "__main__":
+ datas =trade_juejin.get_execution_reports()
+ # 涓婁紶鏁版嵁
+ fdatas = []
+ for d in datas:
+ fdatas.append(
+ {"code": d[0], "money": d[4], "num": d[2], "price": d[3], "time": d[7], "trade_num": d[5],
+ "type": d[1] - 1})
+ print(fdatas)
+ if fdatas:
+ try:
+ trade_manager.process_trade_success_data(fdatas)
+ except Exception as e:
+ logging.exception(e)
+ trade_manager.save_trade_success_data(fdatas)
+
+if __name__ == "__main__1":
codes = gpcode_manager.get_first_gp_codes()
for code in codes:
try:
--
Gitblit v1.8.0