xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将设备列表，变量表列表，变量列表从ObservableCollection更换为字典类型的ObservableDictionary

Browse Source
This commit is contained in:
David P.G
2025-09-16 13:05:37 +08:00
parent ffa24f861e
commit 3102938f92
11 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DMS.WPF/Interfaces/IDataStorageService.cs
View File

@@ -1,5 +1,7 @@
using System.Collections.Concurrent;
using System.Collections.ObjectModel;
using DMS.WPF.ViewModels.Items;
using ObservableCollections;
namespace DMS.WPF.Interfaces;
@@ -8,17 +10,17 @@ public interface IDataStorageService
/// <summary>
/// 设备列表。
/// </summary>
ObservableCollection<DeviceItemViewModel> Devices { get; set; }
ObservableDictionary<int, DeviceItemViewModel> Devices { get; set; }
/// <summary>
/// 设备列表。
/// </summary>
ObservableCollection<VariableTableItemViewModel> VariableTables { get; set; }
ObservableDictionary<int, VariableTableItemViewModel> VariableTables { get; set; }
/// <summary>
/// 变量数据列表。
/// </summary>
ObservableCollection<VariableItemViewModel> Variables { get; set; }
ObservableDictionary<int, VariableItemViewModel> Variables { get; set; }
/// <summary>
/// MQTT服务器列表。

4
DMS.WPF/Services/DataEventService.cs
View File

@@ -70,8 +70,8 @@ public class DataEventService : IDataEventService
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
// 查找并更新对应的变量
var variableToUpdate = _dataStorageService.Variables.FirstOrDefault(v => v.Id == e.VariableId);
if (variableToUpdate != null)
if (_dataStorageService.Variables.TryGetValue(e.VariableId,out var variableToUpdate))
{
variableToUpdate.DataValue = e.NewValue;
variableToUpdate.DisplayValue = e.NewValue;

13
DMS.WPF/Services/DataStorageService.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.ObjectModel;
using DMS.WPF.Interfaces;
using DMS.WPF.ViewModels.Items;
using ObservableCollections;
namespace DMS.WPF.Services;
@@ -11,17 +12,17 @@ public class DataStorageService : IDataStorageService
/// <summary>
/// 设备列表。
/// </summary>
public ObservableCollection<DeviceItemViewModel> Devices { get; set; }
public ObservableDictionary<int,DeviceItemViewModel> Devices { get; set; }
/// <summary>
/// 设备列表。
/// </summary>
public ObservableCollection<VariableTableItemViewModel> VariableTables { get; set; }
public new ObservableDictionary<int,VariableTableItemViewModel> VariableTables { get; set; }
/// <summary>
/// 变量数据列表。
/// </summary>
public ObservableCollection<VariableItemViewModel> Variables { get; set; }
public ObservableDictionary<int,VariableItemViewModel> Variables { get; set; }
/// <summary>
@@ -46,9 +47,9 @@ public class DataStorageService : IDataStorageService
public DataStorageService()
{
Devices=new ObservableCollection<DeviceItemViewModel>();
VariableTables = new ObservableCollection<VariableTableItemViewModel>();
Variables=new ObservableCollection<VariableItemViewModel>();
Devices=new ObservableDictionary<int,DeviceItemViewModel>();
VariableTables = new ObservableDictionary<int,VariableTableItemViewModel>();
Variables=new ObservableDictionary<int,VariableItemViewModel>();
MqttServers=new ObservableCollection<MqttServerItemViewModel>();
Menus=new ObservableCollection<MenuItemViewModel>();
MenuTrees=new ObservableCollection<MenuItemViewModel>();

11
DMS.WPF/Services/DeviceDataService.cs
View File

@@ -52,8 +52,8 @@ public class DeviceDataService : IDeviceDataService
{
_uiDispatcher.Invoke(() =>
{
var device = _dataStorageService.Devices.FirstOrDefault(d => d.Id == e.DeviceId);
if (device != null)
if (_dataStorageService.Devices.TryGetValue(e.DeviceId,out DeviceItemViewModel device))
{
device.IsRunning = e.NewStatus;
@@ -76,7 +76,7 @@ public class DeviceDataService : IDeviceDataService
{
foreach (var deviceDto in _appDataStorageService.Devices.Values)
{
_dataStorageService.Devices.Add(_mapper.Map<DeviceItemViewModel>(deviceDto));
_dataStorageService.Devices.Add(deviceDto.Id,_mapper.Map<DeviceItemViewModel>(deviceDto));
}
}
@@ -95,7 +95,7 @@ public class DeviceDataService : IDeviceDataService
if (_dataStorageService != null && addDto != null && addDto.Device != null)
{
//更新当前界面
_dataStorageService.Devices.Add(_mapper.Map<DeviceItemViewModel>(addDto.Device));
_dataStorageService.Devices.Add(addDto.Device.Id,_mapper.Map<DeviceItemViewModel>(addDto.Device));
}
// 添加null检查
@@ -163,9 +163,8 @@ public class DeviceDataService : IDeviceDataService
_appDataCenterService.DeviceManagementService.RemoveDeviceFromMemory(device.Id);
// 删除设备
_dataStorageService.Devices.Remove(device);
return true;
return _dataStorageService.Devices.Remove(device.Id);
}
/// <summary>

22
DMS.WPF/Services/VariableDataService.cs
View File

@@ -38,9 +38,9 @@ public class VariableDataService : IVariableDataService
{
foreach (var variableTable in _dataStorageService.VariableTables)
{
foreach (var variable in variableTable.Variables)
foreach (var variable in variableTable.Value.Variables)
{
_dataStorageService.Variables.Add(variable);
_dataStorageService.Variables.Add(variable.Id,variable);
}
}
}
@@ -130,13 +130,13 @@ public class VariableDataService : IVariableDataService
// 删除与当前变量表关联的所有变量
foreach (var variable in variableTable.Variables)
{
_dataStorageService.Variables.Remove(variable);
_dataStorageService.Variables.Remove(variable.Id);
}
_appDataCenterService.VariableTableManagementService.RemoveVariableTableFromMemory(variableTable.Id);
// 删除变量表
_dataStorageService.VariableTables.Remove(variableTable);
_dataStorageService.VariableTables.Remove(variableTable.Id);
variableTable.Device.VariableTables.Remove(variableTable);
return true;
}
@@ -151,7 +151,7 @@ public class VariableDataService : IVariableDataService
return;
}
_dataStorageService.Variables.Add(variableItem);
_dataStorageService.Variables.Add(variableItem.Id,variableItem);
}
/// <summary>
@@ -159,16 +159,16 @@ public class VariableDataService : IVariableDataService
/// </summary>
public void DeleteVariable(int id)
{
var variableItem = _dataStorageService.Variables.FirstOrDefault(v => v.Id == id);
if (variableItem == null)
if (!_dataStorageService.Variables.TryGetValue(id,out var variableItem))
{
return;
}
var variableTable = _dataStorageService.VariableTables.FirstOrDefault(vt => vt.Id == variableItem.VariableTableId);
if (_dataStorageService.VariableTables.TryGetValue(variableItem.VariableTableId, out var variableTable))
{
variableTable.Variables.Remove(variableItem);
}
variableTable.Variables.Remove(variableItem);
_dataStorageService.Variables.Remove(variableItem);
_dataStorageService.Variables.Remove(variableItem.Id);
}
}

8
DMS.WPF/Services/VariableTableDataService.cs
View File

@@ -34,9 +34,9 @@ public class VariableTableDataService : IVariableTableDataService
{
foreach (var device in _dataStorageService.Devices)
{
foreach (var variableTable in device.VariableTables)
foreach (var variableTable in device.Value.VariableTables)
{
_dataStorageService.VariableTables.Add(variableTable);
_dataStorageService.VariableTables.Add(variableTable.Id,variableTable);
}
}
}
@@ -117,7 +117,7 @@ public class VariableTableDataService : IVariableTableDataService
// 删除与当前变量表关联的所有变量
foreach (var variable in variableTable.Variables)
{
_dataStorageService.Variables.Remove(variable);
_dataStorageService.Variables.Remove(variable.Id);
}
_appDataCenterService.VariableTableManagementService.RemoveVariableTableFromMemory(variableTable.Id);
@@ -126,7 +126,7 @@ public class VariableTableDataService : IVariableTableDataService
=_dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
_menuDataService.DeleteMenuItem(variableTableMenu);
// 删除变量表
_dataStorageService.VariableTables.Remove(variableTable);
_dataStorageService.VariableTables.Remove(variableTable.Id);
variableTable.Device.VariableTables.Remove(variableTable);
return true;
}

3
DMS.WPF/ViewModels/DeviceDetailViewModel.cs
View File

@@ -159,8 +159,7 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
public async Task OnNavigatedToAsync(MenuItemViewModel menu)
{
var device = _dataStorageService.Devices.FirstOrDefault(d => d.Id == menu.TargetId);
if (device != null)
if (_dataStorageService.Devices.TryGetValue(menu.TargetId,out var device))
{
CurrentDevice = device;
}

10
DMS.WPF/ViewModels/DevicesViewModel.cs
View File

@@ -11,6 +11,7 @@ using DMS.WPF.Services;
using DMS.WPF.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Items;
using iNKORE.UI.WPF.Modern.Common.IconKeys;
using ObservableCollections;
namespace DMS.WPF.ViewModels;
@@ -31,7 +32,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
/// 设备列表。
/// </summary>
[ObservableProperty]
private ObservableCollection<DeviceItemViewModel> _devices;
private INotifyCollectionChangedSynchronizedViewList<DeviceItemViewModel> _devices;
/// <summary>
@@ -52,7 +53,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
/// <param name="wpfDataService">主数据服务。</param>
/// <param name="deviceAppService">设备应用服务。</param>
/// <param name="notificationService">通知服务。</param>
public DevicesViewModel(IMapper mapper,IDataStorageService dataStorageService,
public DevicesViewModel(IMapper mapper, IDataStorageService dataStorageService,
IDialogService dialogService, INavigationService navigationService,
IWPFDataService wpfDataService, IDeviceAppService deviceAppService,
INotificationService notificationService)
@@ -64,7 +65,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
_wpfDataService = wpfDataService;
_deviceAppService = deviceAppService;
_notificationService = notificationService;
Devices = _dataStorageService.Devices;
Devices = _dataStorageService.Devices.ToNotifyCollectionChanged(x => x.Value);
}
@@ -239,15 +240,12 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
public async Task OnNavigatedToAsync(MenuItemViewModel menu)
{
}
private void OnDeviceIsActiveChanged(object? sender, bool isActive)
{
if (sender is DeviceItemViewModel deviceItemViewModel)
{
}
}
}

3
DMS.WPF/ViewModels/Dialogs/VariableDialogViewModel.cs
View File

@@ -83,7 +83,7 @@ public partial class VariableDialogViewModel : DialogViewModelBase<VariableItemV
return false;
}
//检查变量是否存在
var existVariables = _dataStorageService.Variables.Where(v => v.Name == Variable.Name || (v.Protocol == ProtocolType.S7 && v.S7Address == Variable.S7Address) || (v.Protocol == ProtocolType.OpcUa && v.OpcUaNodeId == Variable.OpcUaNodeId)).ToList();
var existVariables = _dataStorageService.Variables.Where(v => v.Value.Name == Variable.Name || (v.Value.Protocol == ProtocolType.S7 && v.Value.S7Address == Variable.S7Address) || (v.Value.Protocol == ProtocolType.OpcUa && v.Value.OpcUaNodeId == Variable.OpcUaNodeId)).Select(v=>v.Value).ToList();
VariableItemViewModel existVariable = null;
if (IsAddModel)
{
@@ -92,6 +92,7 @@ public partial class VariableDialogViewModel : DialogViewModelBase<VariableItemV
else
{
existVariable = existVariables.FirstOrDefault(v => v.Id != Variable.Id);
}
if (existVariable != null)

28
DMS.WPF/ViewModels/VariableHistoryViewModel.cs
View File

@@ -138,20 +138,20 @@ partial class VariableHistoryViewModel : ViewModelBase, INavigatable
if (!string.IsNullOrWhiteSpace(SearchText))
{
// 根据搜索文本过滤建议列表
var filteredVariables = _dataStorageService.Variables
.Where(v =>
v.Name?.Contains(
SearchText, StringComparison.OrdinalIgnoreCase) ==
true)
.Select(v => v.Name)
.Take(10)
.ToList();
foreach (var variable in filteredVariables)
{
_suggestedVariables.Add(variable);
}
// // 根据搜索文本过滤建议列表
// var filteredVariables = _dataStorageService.Variables
// .Where(v =>
// v.Name?.Contains(
// SearchText, StringComparison.OrdinalIgnoreCase) ==
// true)
// .Select(v => v.Name)
// .Take(10)
// .ToList();
//
// foreach (var variable in filteredVariables)
// {
// _suggestedVariables.Add(variable);
// }
}
}

4
DMS.WPF/ViewModels/VariableTableViewModel.cs
View File

@@ -806,9 +806,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
public async Task OnNavigatedToAsync(MenuItemViewModel menu)
{
var varTable =_dataStorageService.VariableTables.FirstOrDefault(v => v.Id == menu.TargetId);
if (varTable != null)
if (_dataStorageService.VariableTables.TryGetValue(menu.TargetId,out var varTable))
{
CurrentVariableTable = varTable;
// 根据变量表的协议类型设置对应的布尔属性