From 954e42723fab626b33f6dbff9246bd235981fe7a Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 09 十二月 2022 19:22:38 +0800
Subject: [PATCH] 撤单策略初步修改
---
server.py | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/server.py b/server.py
index ab06f51..0a1a589 100644
--- a/server.py
+++ b/server.py
@@ -26,6 +26,7 @@
import ths_industry_util
import ths_util
import tool
+import trade_gui
import trade_manager
import l2_code_operate
from code_data_util import ZYLTGBUtil
@@ -49,7 +50,7 @@
l2_data_error_dict = {}
last_trade_delegate_data = None
buy1_volumn_manager = THSBuy1VolumnManager()
- latest_buy1_volumn_dict={}
+ latest_buy1_volumn_dict = {}
buy1_price_manager = Buy1PriceManager()
def setup(self):
@@ -186,7 +187,6 @@
if limit_up_time_manager.get_limit_up_time(d["code"]) is None:
limit_up_time_manager.save_limit_up_time(d["code"], d["time"])
-
elif type == 3:
# 浜ゆ槗鎴愬姛淇℃伅
dataList = data_process.parseList(_str)
@@ -197,6 +197,7 @@
trade_manager.save_trade_success_data(dataList)
elif type == 5:
+ logger_trade_delegate.debug("鎺ユ敹鍒板鎵樹俊鎭�")
# 浜ゆ槗濮旀墭淇℃伅
dataList = data_process.parseList(_str)
if self.last_trade_delegate_data != _str:
@@ -208,6 +209,8 @@
except Exception as e:
logging.exception(e)
trade_manager.save_trade_delegate_data(dataList)
+ # 鍒锋柊浜ゆ槗鐣岄潰
+ trade_gui.THSGuiTrade().refresh_data()
elif type == 4:
# 琛屼笟浠ｇ爜淇℃伅
@@ -242,8 +245,9 @@
elif type == 50:
data = data_process.parse(_str)["data"]
if data is not None:
+ print(data)
index = data["index"]
- code_name = data["codeName"]
+ code_name = data["codeName"].replace(" ", "")
volumn = data["volumn"]
price = data["price"]
time_ = data["time"]
@@ -253,12 +257,12 @@
code = global_util.name_codes.get(code_name)
if code is not None:
# 璁板綍鏃ュ織
- if self.latest_buy1_volumn_dict.get(code) != "{}-{}".format(volumn,price):
+ if self.latest_buy1_volumn_dict.get(code) != "{}-{}".format(volumn, price):
# 璁板綍鏁版嵁
- logger_buy_1_volumn_record.info("{}-{}",code,data)
- self.latest_buy1_volumn_dict[code] = "{}-{}".format(volumn,price)
+ logger_buy_1_volumn_record.info("{}-{}", code, data)
+ self.latest_buy1_volumn_dict[code] = "{}-{}".format(volumn, price)
# 淇濆瓨涔�1浠锋牸
- self.buy1_price_manager.save(code,price)
+ self.buy1_price_manager.save(code, price)
# 鏍℃鏃堕棿
time_ = tool.compute_buy1_real_time(time_)
# 淇濆瓨鏁版嵁
--
Gitblit v1.8.0