ciro_xu/iotgateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复热更新bug

Browse Source
This commit is contained in:
iioter 2022-05-09 23:57:01 +08:00
parent 344511e2b1
commit 21dfb6f737
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IoTGateway.ViewModel/BasicData/UpdateDevices.cs
View File

@ -46,7 +46,7 @@ namespace IoTGateway.ViewModel.BasicData
if (FC.ContainsKey("Entity.DeviceId")) if (FC.ContainsKey("Entity.DeviceId"))
{ {
StringValues id = (StringValues)FC["Entity.DeviceId"]; StringValues id = (StringValues)FC["Entity.DeviceId"];
var device = DC.Set<Device>().AsNoTracking().Include(x => x.Parent).Where(x => x.ID == Guid.Parse(id)).Include(x => x.DeviceVariables).Include(x => x.Driver).SingleOrDefault(); var device = DC.Set<Device>().AsNoTracking().Include(x => x.Parent).Where(x => x.ID == Guid.Parse(id)).Include(x => x.DeviceVariables).Include(x => x.Driver).Include(x => x.DeviceConfigs).SingleOrDefault();
if (!devices.Where(x => x.ID == device.ID).Any()) if (!devices.Where(x => x.ID == device.ID).Any())
devices.Add(device); devices.Add(device);
} }
@ -58,7 +58,7 @@ namespace IoTGateway.ViewModel.BasicData
var deviceVariable = DC.Set<DeviceVariable>().Where(x => x.ID == varId).SingleOrDefault(); var deviceVariable = DC.Set<DeviceVariable>().Where(x => x.ID == varId).SingleOrDefault();
if (deviceVariable != null) if (deviceVariable != null)
{ {
var device = DC.Set<Device>().AsNoTracking().Include(x => x.Parent).Where(x => x.ID == deviceVariable.DeviceId).Include(x=>x.DeviceVariables).Include(x => x.Driver).SingleOrDefault(); var device = DC.Set<Device>().AsNoTracking().Include(x => x.Parent).Where(x => x.ID == deviceVariable.DeviceId).Include(x=>x.DeviceVariables).Include(x => x.Driver).Include(x => x.DeviceConfigs).SingleOrDefault();
if (!devices.Where(x => x.ID == device.ID).Any()) if (!devices.Where(x => x.ID == device.ID).Any())
devices.Add(device); devices.Add(device);
} }
@ -69,7 +69,7 @@ namespace IoTGateway.ViewModel.BasicData
var deviceConfig = DC.Set<DeviceConfig>().AsNoTracking().Where(x => x.ID == deviceConfigId).SingleOrDefault(); var deviceConfig = DC.Set<DeviceConfig>().AsNoTracking().Where(x => x.ID == deviceConfigId).SingleOrDefault();
if (deviceConfig != null) if (deviceConfig != null)
{ {
var device = DC.Set<Device>().AsNoTracking().Where(x => x.ID == deviceConfig.DeviceId).Include(x => x.Parent).Include(x => x.DeviceVariables).Include(x => x.Driver).SingleOrDefault(); var device = DC.Set<Device>().AsNoTracking().Where(x => x.ID == deviceConfig.DeviceId).Include(x => x.Parent).Include(x => x.DeviceVariables).Include(x => x.Driver).Include(x => x.DeviceConfigs).SingleOrDefault();
if (!devices.Where(x => x.ID == device.ID).Any()) if (!devices.Where(x => x.ID == device.ID).Any())
devices.Add(device); devices.Add(device);
} }