test

src/NTMinerDataSchemas/Core/MinerServer/ClientData.cs

@@ -415,8 +415,9 @@ namespace NTMiner.Core.MinerServer {
             this.AESPasswordOn = minerSign.AESPasswordOn;
         }
 
-        public SpeedDto ToSpeedData() {
-            return new SpeedDto {
+        public SpeedData ToSpeedData() {
+            return new SpeedData {
+                SpeedOn = this.MinerActiveOn,
                 AutoRestartKernelTimes = this.AutoRestartKernelTimes,
                 AutoStartDelaySeconds = this.AutoStartDelaySeconds,
                 BootOn = this.BootOn,

src/NTMinerDataSchemas/Report/SpeedData.cs

@@ -1,4 +1,5 @@
-using NTMiner.Core;
+using Newtonsoft.Json;
+using NTMiner.Core;
 using NTMiner.Core.MinerClient;
 using System;
 
@@ -6,12 +7,19 @@ namespace NTMiner.Report {
     public class SpeedData : ISpeedData {
         private readonly SpeedDto _speedDto;
 
-        public SpeedData() {
-            _speedDto = new SpeedDto();
+        [JsonIgnore]
+        public SpeedDto SpeedDto {
+            get {
+                return _speedDto;
+            }
+        }
+
+        public SpeedData() : this(new SpeedDto(), DateTime.Now) {
         }
 
-        public SpeedData(SpeedDto speedDto) {
-            _speedDto = speedDto;
+        public SpeedData(SpeedDto speedDto, DateTime speedOn) {
+            this._speedDto = speedDto;
+            this.SpeedOn = speedOn;
         }
 
         public DateTime SpeedOn { get; set; }

src/NTMinerServer/Core/Redis/ISpeedDataRedis.cs

@@ -5,9 +5,9 @@ using System.Threading.Tasks;
 
 namespace NTMiner.Core.Redis {
     public interface ISpeedDataRedis {
-        Task<List<SpeedDto>> GetAllAsync();
-        Task<SpeedDto> GetByClientIdAsync(Guid clientId);
-        Task SetAsync(SpeedDto speedDto);
+        Task<List<SpeedData>> GetAllAsync();
+        Task<SpeedData> GetByClientIdAsync(Guid clientId);
+        Task SetAsync(SpeedData speedData);
         Task DeleteByClientIdAsync(Guid clientId);
     }
 }

src/NTMinerServer/Core/Redis/Impl/SpeedDataRedis.cs

@@ -13,13 +13,13 @@ namespace NTMiner.Core.Redis.Impl {
             _connection = connection;
         }
 
-        public Task<List<SpeedDto>> GetAllAsync() {
+        public Task<List<SpeedData>> GetAllAsync() {
             var db = _connection.GetDatabase();
             return db.HashGetAllAsync(_redisKeySpeedDataByClientId).ContinueWith(t => {
-                List<SpeedDto> list = new List<SpeedDto>();
+                List<SpeedData> list = new List<SpeedData>();
                 foreach (var item in t.Result) {
                     if (item.Value.HasValue) {
-                        SpeedDto data = VirtualRoot.JsonSerializer.Deserialize<SpeedDto>(item.Value);
+                        SpeedData data = VirtualRoot.JsonSerializer.Deserialize<SpeedData>(item.Value);
                         if (data != null) {
                             list.Add(data);
                         }
@@ -29,14 +29,14 @@ namespace NTMiner.Core.Redis.Impl {
             });
         }
 
-        public Task<SpeedDto> GetByClientIdAsync(Guid clientId) {
+        public Task<SpeedData> GetByClientIdAsync(Guid clientId) {
             if (clientId == Guid.Empty) {
-                return Task.FromResult<SpeedDto>(null);
+                return Task.FromResult<SpeedData>(null);
             }
             var db = _connection.GetDatabase();
             return db.HashGetAsync(_redisKeySpeedDataByClientId, clientId.ToString()).ContinueWith(t => {
                 if (t.Result.HasValue) {
-                    return VirtualRoot.JsonSerializer.Deserialize<SpeedDto>(t.Result);
+                    return VirtualRoot.JsonSerializer.Deserialize<SpeedData>(t.Result);
                 }
                 else {
                     return null;
@@ -44,12 +44,12 @@ namespace NTMiner.Core.Redis.Impl {
             });
         }
 
-        public Task SetAsync(SpeedDto speedDto) {
-            if (speedDto == null || speedDto.ClientId == Guid.Empty) {
+        public Task SetAsync(SpeedData speedData) {
+            if (speedData == null || speedData.ClientId == Guid.Empty) {
                 return TaskEx.CompletedTask;
             }
             var db = _connection.GetDatabase();
-            return db.HashSetAsync(_redisKeySpeedDataByClientId, speedDto.ClientId.ToString(), VirtualRoot.JsonSerializer.Serialize(speedDto));
+            return db.HashSetAsync(_redisKeySpeedDataByClientId, speedData.ClientId.ToString(), VirtualRoot.JsonSerializer.Serialize(speedData));
         }
 
         public Task DeleteByClientIdAsync(Guid clientId) {

src/WebApiServer/Core/Impl/ClientDataSet.cs

@@ -22,11 +22,12 @@ namespace NTMiner.Core.Impl {
                 Write.UserInfo($"从redis加载了 {getMinersTask.Result.Count} 条MinerData，和 {getSpeedsTask.Result.Count} 条SpeedData");
                 var speedDatas = getSpeedsTask.Result;
                 List<ClientData> clientDatas = new List<ClientData>();
+                DateTime speedOn = DateTime.Now.AddMinutes(-3);
                 foreach (var minerData in getMinersTask.Result) {
                     var clientData = ClientData.Create(minerData);
                     clientDatas.Add(clientData);
                     var speedData = speedDatas.FirstOrDefault(a => a.ClientId == minerData.ClientId);
-                    if (speedData != null) {
+                    if (speedData != null && speedData.SpeedOn > speedOn) {
                         clientData.Update(speedData, out bool _);
                     }
                 }
@@ -37,9 +38,10 @@ namespace NTMiner.Core.Impl {
             _speedDataRedis = speedDataRedis;
             VirtualRoot.AddEventPath<Per1MinuteEvent>("周期清理Redis中不活跃的来自挖矿端上报的算力记录", LogEnum.DevConsole, action: message => {
                 DateTime time = message.BornOn.AddSeconds(-130);
-                var toRemoves = _dicByClientId.Where(a => a.Value.MinerActiveOn <= time).Select(a => a.Key).ToArray();
-                foreach (var key in toRemoves) {
-                    _speedDataRedis.DeleteByClientIdAsync(key);
+                var toRemoves = _dicByClientId.Where(a => a.Value.MinerActiveOn != DateTime.MinValue && a.Value.MinerActiveOn <= time).ToArray();
+                foreach (var kv in toRemoves) {
+                    kv.Value.MinerActiveOn = DateTime.MinValue;
+                    _speedDataRedis.DeleteByClientIdAsync(kv.Key);
                 }
             }, this.GetType());
             _mqSender = mqSender;
@@ -56,7 +58,7 @@ namespace NTMiner.Core.Impl {
                     return;
                 }
                 speedDataRedis.GetByClientIdAsync(message.ClientId).ContinueWith(t => {
-                    ReportSpeed(t.Result, message.MinerIp, isFromWsServerNode: true);
+                    ReportSpeed(t.Result.SpeedDto, message.MinerIp, isFromWsServerNode: true);
                 });
             }, this.GetType());
             VirtualRoot.AddEventPath<MinerClientWsOpenedMqMessage>("收到MinerClientWsOpenedMq消息后更新NetActiveOn和IsOnline", LogEnum.None, action: message => {
@@ -125,7 +127,7 @@ namespace NTMiner.Core.Impl {
                 return;
             }
             if (!isFromWsServerNode) {
-                _speedDataRedis.SetAsync(speedDto);
+                _speedDataRedis.SetAsync(new SpeedData(speedDto, DateTime.Now));
             }
             ClientData clientData = GetByClientId(speedDto.ClientId);
             if (clientData == null) {

src/WsServer/MinerClientWsMessageHandler.cs

@@ -53,7 +53,7 @@ namespace NTMiner {
             {WsMessage.Speed,
                 (wsBehavior, loginName, clientId, message) => {
                     if (message.TryGetData(out SpeedDto speedDto)) {
-                        WsRoot.SpeedDataRedis.SetAsync(speedDto).ContinueWith(t => {
+                        WsRoot.SpeedDataRedis.SetAsync(new SpeedData(speedDto, DateTime.Now)).ContinueWith(t => {
                             WsRoot.MinerClientMqSender.SendSpeed(loginName, speedDto.ClientId, wsBehavior.Context.UserEndPoint.ToString());
                         });
                     }