GithubStar/ThingsGateway
1
0
Fork 0
mirror of https://github.com/ThingsGateway/ThingsGateway.git synced 2026-10-23 08:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

冗余设备删除后会导致后台出错

Browse Source
This commit is contained in:
2248356998 qq.com
2023-07-16 11:36:45 +08:00
parent 7807e9bdd0
commit 241d576519
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ThingsGateway.Web.Foundation/Workers/Collect/CollectDeviceWorker.cs
+11 -5
View File
@@ -174,10 +174,16 @@ public class CollectDeviceWorker : BackgroundService
}
else
{
var Redundantdev = (await _collectDeviceService.GetCollectDeviceRuntimeAsync(dev.RedundantDeviceId)).FirstOrDefault();
dev.DevicePropertys = Redundantdev.DevicePropertys;
dev.RedundantEnum = RedundantEnum.Standby;
_logger?.LogInformation(dev.Name + "切换到备用通道");
try
{
var Redundantdev = (await _collectDeviceService.GetCollectDeviceRuntimeAsync(dev.RedundantDeviceId)).FirstOrDefault();
dev.DevicePropertys = Redundantdev.DevicePropertys;
dev.RedundantEnum = RedundantEnum.Standby;
_logger?.LogInformation(dev.Name + "切换到备用通道");
}
catch
{
}
}
}
devCore.Init(dev);
@@ -510,7 +516,7 @@ public class CollectDeviceWorker : BackgroundService
if (devcore.Device.DeviceStatus == DeviceStatusEnum.OffLine)
{
if (devcore.Device.IsRedundant)
if (devcore.Device.IsRedundant && _collectDeviceService.GetCacheList().Any(a => a.Id == devcore.Device.RedundantDeviceId))
{
await UpDeviceRedundantThreadAsync(devcore.Device.Id);
}