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

1，重新梳理了代码，将使用多线程，并实现了批量读取变量

Browse Source 
2，添加OpcUa更新方式的修改对话框
3，修复了一些已知的Bug
4，删除了不必要的函数
This commit is contained in:
David P.G
2025-07-13 16:22:07 +08:00
parent 82634f46c0
commit 6f16a1c4e4
22 changed files with 877 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ViewModels/DevicesViewModel.cs
View File

@@ -52,13 +52,20 @@ public partial class DevicesViewModel : ViewModelBase
_dialogService = dialogService;
_dataServices = dataServices;
MessageHelper.SendLoadMessage(LoadTypes.Devices);
_dataServices.OnDeviceListChanged += (sender, devices) =>
_dataServices.OnDeviceListChanged += (devices) =>
{
Devices = new ObservableCollection<Device>(devices);
};
}
public override void OnLoaded()
{
if (_dataServices.Devices!=null && _dataServices.Devices.Count>0)
{
Devices=new ObservableCollection<Device>(_dataServices.Devices);
}
}
/// <summary>
/// 添加设备命令。
/// </summary>

2
ViewModels/Dialogs/OpcUaImportDialogViewModel.cs
View File

@@ -58,7 +58,7 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
OpcUaNodes.Clear();
SelectedNodeVariables.Clear();
_session = await OpcUaServiceHelper.CreateOpcUaSessionAsync(EndpointUrl);
_session = await ServiceHelper.CreateOpcUaSessionAsync(EndpointUrl);
NotificationHelper.ShowSuccess($"已连接到 OPC UA 服务器: {EndpointUrl}");
IsConnected = true;

18
ViewModels/Dialogs/OpcUaUpdateTypeDialogViewModel.cs Normal file
View File

@@ -0,0 +1,18 @@
using CommunityToolkit.Mvvm.ComponentModel;
using PMSWPF.Enums;
namespace PMSWPF.ViewModels.Dialogs
{
public partial class OpcUaUpdateTypeDialogViewModel : ObservableObject
{
[ObservableProperty]
private OpcUaUpdateType _selectedUpdateType;
public OpcUaUpdateTypeDialogViewModel()
{
// 默认选中第一个
SelectedUpdateType = OpcUaUpdateType.OpcUaPoll;
}
}
}

12
ViewModels/MainViewModel.cs
View File

@@ -1,9 +1,8 @@
using System.Collections.ObjectModel;
using System.Windows; // Add this using directive
using System.Windows;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; // Add this using directive
using CommunityToolkit.Mvvm.Input;
using iNKORE.UI.WPF.Modern.Common.IconKeys;
using iNKORE.UI.WPF.Modern.Controls;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PMSWPF.Data;
@@ -12,6 +11,9 @@ using PMSWPF.Enums;
using PMSWPF.Helper;
using PMSWPF.Models;
using PMSWPF.Services;
using PMSWPF.Views;
// Add this using directive
// Add this using directive
namespace PMSWPF.ViewModels;
@@ -63,7 +65,7 @@ public partial class MainViewModel : ViewModelBase
// 发送消息加载数据
MessageHelper.SendLoadMessage(LoadTypes.All);
// 当菜单加载成功后，在前台显示菜单
dataServices.OnMenuTreeListChanged += (sender, menus) => { Menus = new ObservableCollection<MenuBean>(menus); };
dataServices.OnMenuTreeListChanged += ( menus) => { Menus = new ObservableCollection<MenuBean>(menus); };
}
/// <summary>
@@ -72,7 +74,7 @@ public partial class MainViewModel : ViewModelBase
[RelayCommand]
private void ShowWindow()
{
if (Application.Current.MainWindow is Views.MainView mainWindow)
if (Application.Current.MainWindow is MainView mainWindow)
{
mainWindow.ShowApplication();
}

2
ViewModels/MqttsViewModel.cs
View File

@@ -70,7 +70,7 @@ public partial class MqttsViewModel : ViewModelBase
}
_dataServices.OnMqttListChanged += (sender, mqtts) =>
_dataServices.OnMqttListChanged += ( mqtts) =>
{
Mqtts = new ObservableCollection<Mqtt>(mqtts);
};

60
ViewModels/VariableTableViewModel.cs
View File

@@ -344,6 +344,7 @@ partial class VariableTableViewModel : ViewModelBase
foreach (var variableData in importVarDataList)
{
variableData.CreateTime = DateTime.Now;
variableData.IsActive = true;
variableData.VariableTableId = VariableTable.Id;
}
@@ -538,31 +539,66 @@ partial class VariableTableViewModel : ViewModelBase
/// </summary>
/// <param name="variablesToChange">要修改轮询频率的变量数据列表。</param>
[RelayCommand]
public async Task ChangePollLevel(List<VariableData> variablesToChange)
public async Task ChangePollLevel(IList<object> variablesToChange)
{
var validVariables = variablesToChange?.OfType<VariableData>().ToList();
// 检查是否有变量被选中
if (variablesToChange == null || !variablesToChange.Any())
if (validVariables == null || !validVariables.Any())
{
NotificationHelper.ShowInfo("请选择要修改轮询频率的变量");
return;
}
// 显示轮询频率选择对话框，并传入第一个变量的当前轮询频率作为默认值
var newPollLevelType = await _dialogService.ShowPollLevelDialog(variablesToChange.First()
var newPollLevelType = await _dialogService.ShowPollLevelDialog(validVariables.First()
.PollLevelType);
if (newPollLevelType.HasValue)
{
// 更新所有选定变量的轮询频率和修改状态
foreach (var variable in variablesToChange)
foreach (var variable in validVariables)
{
variable.PollLevelType = newPollLevelType.Value;
variable.IsModified = false; // 标记为未修改，因为已保存到数据库
}
// 批量更新数据库中的变量数据
await _varDataRepository.UpdateAsync(variablesToChange);
await _varDataRepository.UpdateAsync(validVariables);
// 显示成功通知
NotificationHelper.ShowSuccess($"已成功更新 {variablesToChange.Count} 个变量的轮询频率");
NotificationHelper.ShowSuccess($"已成功更新 {validVariables.Count} 个变量的轮询频率");
}
}
/// <summary>
/// 修改选定变量的OPC UA更新方式（轮询或订阅）。
/// </summary>
/// <param name="variablesToChange">要修改更新方式的变量数据列表。</param>
[RelayCommand]
public async Task ModifyOpcUaUpdateType(IList<object> variablesToChange)
{
// 过滤出有效的VariableData对象
var validVariables = variablesToChange?.OfType<VariableData>().ToList();
if (validVariables == null || !validVariables.Any())
{
NotificationHelper.ShowInfo("请选择要修改更新方式的OPC UA变量");
return;
}
// 显示更新方式选择对话框
var newUpdateType = await _dialogService.ShowOpcUaUpdateTypeDialog();
if (newUpdateType.HasValue)
{
// 更新所有选定变量的更新方式
foreach (var variable in validVariables)
{
variable.OpcUaUpdateType = newUpdateType.Value;
}
// 批量更新数据库
await _varDataRepository.UpdateAsync(validVariables);
NotificationHelper.ShowSuccess($"已成功为 {validVariables.Count} 个变量更新OPC UA更新方式。");
}
}
@@ -572,10 +608,12 @@ partial class VariableTableViewModel : ViewModelBase
/// </summary>
/// <param name="variablesToAddMqtt">要添加MQTT服务器的变量数据列表。</param>
[RelayCommand]
public async Task AddMqttServerToVariables(IList<VariableData> variablesToAddMqtt)
public async Task AddMqttServerToVariables(IList<object> variablesToAddMqtt)
{
var validVariables = variablesToAddMqtt?.OfType<VariableData>().ToList();
// 检查是否有变量被选中
if (variablesToAddMqtt == null || !variablesToAddMqtt.Any())
if (validVariables == null || !validVariables.Any())
{
NotificationHelper.ShowInfo("请选择要添加MQTT服务器的变量");
return;
@@ -591,7 +629,7 @@ partial class VariableTableViewModel : ViewModelBase
}
// 遍历所有选定的变量，并为其添加选定的MQTT服务器
foreach (VariableData variable in variablesToAddMqtt)
foreach (VariableData variable in validVariables)
{
// 如果变量的Mqtts集合为空，则初始化它
if (variable.Mqtts == null)
@@ -608,9 +646,9 @@ partial class VariableTableViewModel : ViewModelBase
}
// 批量更新数据库中的变量数据
await _varDataRepository.UpdateAsync(variablesToAddMqtt.ToList());
await _varDataRepository.UpdateAsync(validVariables.ToList());
// 显示成功通知
NotificationHelper.ShowSuccess($"已成功为 {variablesToAddMqtt.Count} 个变量添加MQTT服务器: {selectedMqtt.Name}");
NotificationHelper.ShowSuccess($"已成功为 {validVariables.Count} 个变量添加MQTT服务器: {selectedMqtt.Name}");
}
catch (Exception ex)
{