test/iotgateway
1
0
Fork 0
mirror of https://gitee.com/iioter/iotgateway.git synced 2024-11-29 18:28:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 批量删除变量页面缓存

Browse Source
This commit is contained in:
iioter 2024-07-28 22:05:35 +08:00
parent d4c6d1fec8
commit 1fb8d8fc4a
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableBatchVM.cs
View File

@ -8,6 +8,7 @@ using WalkingTec.Mvvm.Core.Extensions;
using IoTGateway.Model;
using PluginInterface;
using Plugin;
using Microsoft.Extensions.Primitives;
namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
{
@ -21,10 +22,15 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
public override bool DoBatchDelete()
{
//先获取id
var id = UpdateDevices.FC2Guids(FC);
var deviceId = DC.Set<DeviceVariable>().Where(x => id.Contains(x.ID)).Select(x => x.DeviceId).FirstOrDefault();
FC["Entity.DeviceId"] = (StringValues)deviceId.ToString();
var ret = base.DoBatchDelete();
if (ret)
{
var deviceService = Wtm.ServiceProvider.GetService(typeof(DeviceService)) as DeviceService;
UpdateDevices.UpdateVaribale(DC, deviceService, FC);
}
return ret;

40
IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs
View File

@ -123,7 +123,39 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
var variables = dcVariables.Union(threadVariables).AsQueryable();
var query = variables
if (SearcherMode == ListVMSearchModeEnum.Batch)
{
var ids = UpdateDevices.FC2Guids(FC);
return variables.Where(x=> ids.Contains(x.ID)).Select(x => new DeviceVariable_View
{
ID = x.ID,
DeviceId = x.DeviceId,
Name = x.Name,
Index = x.Index,
Description = x.Description,
Method = x.Method,
DeviceAddress = x.DeviceAddress,
DataType = x.DataType,
IsTrigger = x.IsTrigger,
EndianType = x.EndianType,
Expressions = x.Expressions,
IsUpload = x.IsUpload,
ProtectType = x.ProtectType,
DeviceName_view = x.Device.DeviceName,
Alias = x.Alias,
Device = x.Device,
Value = x.Value,
CookedValue = x.CookedValue,
StatusType = x.StatusType,
Timestamp = x.Timestamp,
Message = x.Message,
})
.OrderBy(x => x.Index).ThenBy(x => x.DeviceName_view).ThenBy(x => x.Alias).ThenBy(x => x.Method)
.ThenBy(x => x.DeviceAddress);
}
return variables
.CheckContain(Searcher.Name, x => x.Name)
.CheckContain(Searcher.Alias, x => x.Alias)
.CheckContain(Searcher.Method, x => x.Method)
@ -156,7 +188,11 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
})
.OrderBy(x => x.Index).ThenBy(x => x.DeviceName_view).ThenBy(x => x.Alias).ThenBy(x => x.Method)
.ThenBy(x => x.DeviceAddress);
return query;
}
public override IOrderedQueryable<DeviceVariable_View> GetBatchQuery()
{
return GetSearchQuery();
}
private List<LayuiTreeItem> GetLayuiTree(List<TreeSelectListItem> tree, int level = 0)