From ca7115c423192a93d4ab9a408400e91f29168766 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 17 May 2022 13:00:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Binance.TradeRobot.Business.xml | 3 +- .../Spot/D21OrderPublishBusiness.cs | 5 +- .../Business/RobotBusiness.cs | 2 +- .../Binance.TradeRobot.Model.xml | 12 ++--- .../Dto/Response/Robot/RobotResponse.cs | 47 +++++++++++-------- 5 files changed, 39 insertions(+), 30 deletions(-) diff --git a/Binance.TradeRobot.Business/Binance.TradeRobot.Business.xml b/Binance.TradeRobot.Business/Binance.TradeRobot.Business.xml index 389bcf3..1d25885 100644 --- a/Binance.TradeRobot.Business/Binance.TradeRobot.Business.xml +++ b/Binance.TradeRobot.Business/Binance.TradeRobot.Business.xml @@ -51,10 +51,11 @@ 交易所账号Id - + 获取动2.1策略机器人列表 + 机器人状态 信号周期 交易对 diff --git a/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs b/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs index e59e805..93eb185 100644 --- a/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs +++ b/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs @@ -14,11 +14,10 @@ namespace Binance.TradeRobot.Business internal class D21OrderPublishBusiness : BaseSpotOrderPublishBusiness, ISpotOrderPublishBusiness { public Enums.TradePolicy TradePolicy => Enums.TradePolicy.D21; - private RobotBusiness robotBusiness; - public D21OrderPublishBusiness(IFreeSql fsql, NLogManager logManager, IIdGenerator idGenerator, IMemoryCache memoryCache, DingBusiness dingBusiness, RobotBusiness robotBusiness) : base(fsql, logManager, idGenerator, memoryCache, dingBusiness) + public D21OrderPublishBusiness(IFreeSql fsql, NLogManager logManager, IIdGenerator idGenerator, IMemoryCache memoryCache, DingBusiness dingBusiness) : base(fsql, logManager, idGenerator, memoryCache, dingBusiness) { - this.robotBusiness = robotBusiness; + } diff --git a/Binance.TradeRobot.Business/Business/RobotBusiness.cs b/Binance.TradeRobot.Business/Business/RobotBusiness.cs index 7b13439..76eb4ca 100644 --- a/Binance.TradeRobot.Business/Business/RobotBusiness.cs +++ b/Binance.TradeRobot.Business/Business/RobotBusiness.cs @@ -207,7 +207,7 @@ namespace Binance.TradeRobot.Business /// 是否加载近期交易利润,默认true /// 是否加载机器人绑定的APIKey,默认false /// - public IList GetD21PolicyRobotList(long? robotId, + public IList GetD21PolicyRobotList(long? robotId = null, Enums.RobotState? robotState = null, Enums.SignalPeriod? signalPeriod = null, string symbol = "", diff --git a/Binance.TradeRobot.Model/Binance.TradeRobot.Model.xml b/Binance.TradeRobot.Model/Binance.TradeRobot.Model.xml index 73faa89..6ccf878 100644 --- a/Binance.TradeRobot.Model/Binance.TradeRobot.Model.xml +++ b/Binance.TradeRobot.Model/Binance.TradeRobot.Model.xml @@ -739,12 +739,6 @@ 运行时长(s) - - - 订单推送监听实例Key - 币安逐仓杠杆需要单独的运行实例 - - 订单推送日志Key @@ -760,6 +754,12 @@ 机器人绑定的交易所APIKey对象 + + + 订单推送监听实例Key + 币安逐仓杠杆需要单独的运行实例 + + 资金变更用户名 diff --git a/Binance.TradeRobot.Model/Dto/Response/Robot/RobotResponse.cs b/Binance.TradeRobot.Model/Dto/Response/Robot/RobotResponse.cs index a989bd3..4c702ea 100644 --- a/Binance.TradeRobot.Model/Dto/Response/Robot/RobotResponse.cs +++ b/Binance.TradeRobot.Model/Dto/Response/Robot/RobotResponse.cs @@ -5,6 +5,11 @@ namespace Binance.TradeRobot.Model.Dto { public class RobotResponse { + public RobotResponse() + { + + } + public long Id { get; set; } public DateTime CreateTime { get; set; } public Enums.TradePolicy TradePolicy { get; set; } @@ -22,25 +27,6 @@ namespace Binance.TradeRobot.Model.Dto public Enums.Exchange ExchangeId { get; set; } - public virtual string ExecuteKey { get { return $"Execute-{ExchangeId}-{TradePolicy}-{Symbol}"; } } - - public virtual string KLineKey { get { return $"KLine-{ExchangeId}-{BusinessType}-{Symbol}"; } } - - /// - /// 订单推送监听实例Key - /// 币安逐仓杠杆需要单独的运行实例 - /// - public virtual string OrderPublishKey - { - get - { - string key = $"{BusinessType}-{ExchangeAPIKey.AccountId}"; //币安现货,币安合约,同一个账户内不区分websocket实例 - if (ExchangeId == Enums.Exchange.Binance && BusinessType == Enums.BusinessType.IsolateMargin) - key = $"{BusinessType}-{ExchangeAPIKey.AccountId}-{Symbol}"; //币安逐仓杠杆，同一个账户内的每个交易对需要区分websocket实例 - return $"OrderPublish-{ExchangeId}-{key}"; - } - } - /// /// 订单推送日志Key /// @@ -63,5 +49,28 @@ namespace Binance.TradeRobot.Model.Dto /// 机器人绑定的交易所APIKey对象 /// public SimpleExchangeAPIKeyResponse ExchangeAPIKey { get; set; } + + public string ExecuteKey { get { return $"Execute-{ExchangeId}-{TradePolicy}-{Symbol}"; } } + + public string KLineKey { get { return $"KLine-{ExchangeId}-{BusinessType}-{Symbol}"; } } + + /// + /// 订单推送监听实例Key + /// 币安逐仓杠杆需要单独的运行实例 + /// + public string OrderPublishKey + { + get + { + if (State == Enums.RobotState.Runing && ExchangeAPIKey != null) + { + string key = $"{BusinessType}-{ExchangeAPIKey.AccountId}"; //币安现货,币安合约,同一个账户内不区分websocket实例 + if (ExchangeId == Enums.Exchange.Binance && BusinessType == Enums.BusinessType.IsolateMargin) + key = $"{BusinessType}-{ExchangeAPIKey.AccountId}-{Symbol}"; //币安逐仓杠杆，同一个账户内的每个交易对需要区分websocket实例 + return $"OrderPublish-{ExchangeId}-{key}"; + } + return string.Empty; + } + } } }