尝试提高页面打开速度
This commit is contained in:
parent
9206daea40
commit
3c3dcfcfad
@ -41,20 +41,24 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
|
|||||||
.GetTreeSelectListItems(Wtm, x => x.DeviceName);
|
.GetTreeSelectListItems(Wtm, x => x.DeviceName);
|
||||||
|
|
||||||
var deviceService = Wtm.ServiceProvider.GetService(typeof(DeviceService)) as DeviceService;
|
var deviceService = Wtm.ServiceProvider.GetService(typeof(DeviceService)) as DeviceService;
|
||||||
foreach (var device in AllDevices)
|
Parallel.ForEach(AllDevices, device =>
|
||||||
{
|
{
|
||||||
foreach (var item in device.Children)
|
Parallel.ForEach(device.Children, item =>
|
||||||
{
|
{
|
||||||
var deviceThread = deviceService.DeviceThreads.Where(x => x.Device.ID.ToString() == (string)item.Value).FirstOrDefault();
|
var deviceThread = deviceService.DeviceThreads.FirstOrDefault(x => x.Device.ID.ToString() == (string)item.Value);
|
||||||
if (deviceThread != null)
|
if (deviceThread != null)
|
||||||
item.Icon = deviceThread.Device.AutoStart ? (deviceThread.Driver.IsConnected ? "layui-icon layui-icon-link" : "layui-icon layui-icon-unlink") : "layui-icon layui-icon-pause";
|
item.Icon = deviceThread.Device.AutoStart
|
||||||
|
? (deviceThread.Driver.IsConnected
|
||||||
|
? "layui-icon layui-icon-link"
|
||||||
|
: "layui-icon layui-icon-unlink")
|
||||||
|
: "layui-icon layui-icon-pause";
|
||||||
|
|
||||||
item.Text = " " + item.Text;
|
item.Text = " " + item.Text;
|
||||||
item.Expended = true;
|
item.Expended = true;
|
||||||
item.Selected = item.Value.ToString() == IoTBackgroundService.VariableSelectDeviceId.ToString();
|
item.Selected = item.Value.ToString() == IoTBackgroundService.VariableSelectDeviceId.ToString();
|
||||||
|
|
||||||
}
|
});
|
||||||
}
|
});
|
||||||
DevicesTree = GetLayuiTree(AllDevices);
|
DevicesTree = GetLayuiTree(AllDevices);
|
||||||
base.InitListVM();
|
base.InitListVM();
|
||||||
}
|
}
|
||||||
@ -99,7 +103,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
|
|||||||
public override void AfterDoSearcher()
|
public override void AfterDoSearcher()
|
||||||
{
|
{
|
||||||
var deviceService = Wtm.ServiceProvider.GetService(typeof(DeviceService)) as DeviceService;
|
var deviceService = Wtm.ServiceProvider.GetService(typeof(DeviceService)) as DeviceService;
|
||||||
foreach (var item in EntityList)
|
Parallel.ForEach(EntityList, item =>
|
||||||
{
|
{
|
||||||
var dapThread = deviceService!.DeviceThreads.FirstOrDefault(x => x.Device.ID == item.DeviceId);
|
var dapThread = deviceService!.DeviceThreads.FirstOrDefault(x => x.Device.ID == item.DeviceId);
|
||||||
var variable = dapThread?.Device?.DeviceVariables?.FirstOrDefault(x => x.ID == item.ID);
|
var variable = dapThread?.Device?.DeviceVariables?.FirstOrDefault(x => x.ID == item.ID);
|
||||||
@ -111,7 +115,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
|
|||||||
item.StatusType = variable.StatusType;
|
item.StatusType = variable.StatusType;
|
||||||
item.Timestamp = variable.Timestamp;
|
item.Timestamp = variable.Timestamp;
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
public override IOrderedQueryable<DeviceVariable_View> GetSearchQuery()
|
public override IOrderedQueryable<DeviceVariable_View> GetSearchQuery()
|
||||||
|
Loading…
Reference in New Issue
Block a user