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

1 feat: 添加变量导入模板配置和工厂模式实现

Browse Source 
2
    3 -
      在AppSettings中添加VariableImportTemplate配置项，用于设置变量导入的默认参数（IsActive、PollingIn
      terval、IsHistoryEnabled、HistoryDeadband）
    4 - 修改AppSettings.Load()方法，优化配置加载逻辑
    5 -
      实现IVariableItemViewModelFactory和VariableItemViewModelFactory，使用工厂模式创建VariableItemVie
      wModel实例
    6 - 在ImportOpcUaDialogViewModel中使用工厂创建VariableItemViewModel实例，以应用默认配置
    7 -
      在SettingViewModel和SettingView中添加变量导入设置界面和相关属性（VariablePollingInterval、Variab
      leIsActive、VariableIsHistoryEnabled、VariableHistoryDeadband）
    8 - 移除VariableItemViewModel构造函数中的轮询间隔默认值设置，改由工厂模式设置
    9 - 优化SplashViewModel中配置加载逻辑
   10 - 移除MainView.xaml.cs中已注释的代码
   11 - 调整VariableTableView.xaml的UI布局和菜单结构
   12 - 注册IVariableItemViewModelFactory服务

  这些修改主要实现了几个关键功能：
   1. 引入了工厂模式来创建VariableItemViewModel实例，确保所有新创建的变量项都应用默认配置
   2. 添加了变量导入模板设置，用户可以在设置界面自定义导入变量的默认属性
   3. 对相关UI进行了调整和优化
This commit is contained in:
David P.G
2025-10-04 20:46:39 +08:00
parent ec1f94a898
commit d4562e600e
11 changed files with 249 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DMS.WPF/App.xaml.cs
View File

@@ -25,6 +25,7 @@ using DMS.Infrastructure.Services.Mqtt;
using DMS.Infrastructure.Services.OpcUa;
using DMS.Infrastructure.Services.S7;
using DMS.WPF.Converters;
using DMS.WPF.Factories;
using DMS.WPF.Helper;
using DMS.WPF.Interfaces;
using DMS.WPF.Logging;
@@ -346,6 +347,9 @@ public partial class App : System.Windows.Application
services.AddTransient<EmailAccountDialogViewModel>();
services.AddTransient<EmailTemplateDialogViewModel>();
services.AddTransient<TriggerDialogViewModel>(); // 注册 TriggerEditorViewModel
// 注册工厂
services.AddTransient<IVariableItemViewModelFactory, VariableItemViewModelFactory>();
// 注册View视图
services.AddSingleton<SplashWindow>();

55
DMS.WPF/Factories/VariableItemViewModelFactory.cs Normal file
View File

@@ -0,0 +1,55 @@
using DMS.Application.DTOs;
using DMS.WPF.ViewModels.Items;
using DMS.Application.Configurations;
using Microsoft.Extensions.DependencyInjection;
namespace DMS.WPF.Factories
{
/// <summary>
/// VariableItemViewModel工厂类
/// 专门用于构建VariableItemViewModel实例
/// </summary>
public interface IVariableItemViewModelFactory
{
/// <summary>
/// 从VariableDto创建VariableItemViewModel实例
/// </summary>
/// <param name="variableDto">变量数据传输对象</param>
/// <returns>VariableItemViewModel实例</returns>
VariableItemViewModel CreateNewVariableItemViewModel();
}
public class VariableItemViewModelFactory : IVariableItemViewModelFactory
{
private readonly IServiceProvider _serviceProvider;
private readonly AppSettings _appSettings;
public VariableItemViewModelFactory(AppSettings appSettings)
{
_appSettings = appSettings;
}
/// <summary>
/// 从VariableDto创建VariableItemViewModel实例
/// </summary>
/// <param name="variableDto">变量数据传输对象</param>
/// <returns>VariableItemViewModel实例</returns>
public VariableItemViewModel CreateNewVariableItemViewModel()
{
var viewModel = new VariableItemViewModel()
{
IsActive = _appSettings.VariableImportTemplate.IsActive,
IsHistoryEnabled = _appSettings.VariableImportTemplate.IsHistoryEnabled,
HistoryDeadband = _appSettings.VariableImportTemplate.HistoryDeadband,
PollingInterval = _appSettings.VariableImportTemplate.PollingInterval,
};
return viewModel;
}
}
}

30
DMS.WPF/ViewModels/Dialogs/ImportOpcUaDialogViewModel.cs
View File

@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.Input;
using DMS.Core.Enums;
using DMS.Infrastructure.Interfaces.Services;
using DMS.Infrastructure.Models;
using DMS.WPF.Factories;
using DMS.WPF.Interfaces;
using DMS.WPF.Services;
using DMS.WPF.ViewModels.Items;
@@ -79,17 +80,18 @@ public partial class ImportOpcUaDialogViewModel : DialogViewModelBase<List<Varia
/// OPC UA服务接口实例
/// </summary>
private readonly IOpcUaService _opcUaService;
private readonly IVariableItemViewModelFactory _variableItemViewModelFactory;
/// <summary>
/// 对象映射器实例
/// </summary>
private readonly IMapper _mapper;
/// <summary>
/// 取消令牌源，用于取消长时间运行的操作
/// </summary>
private readonly CancellationTokenSource _cancellationTokenSource;
/// <summary>
/// 通知服务实例
/// </summary>
@@ -102,9 +104,11 @@ public partial class ImportOpcUaDialogViewModel : DialogViewModelBase<List<Varia
/// <param name="opcUaService">OPC UA服务接口实例</param>
/// <param name="mapper">对象映射器实例</param>
/// <param name="notificationService">通知服务实例</param>
public ImportOpcUaDialogViewModel(IOpcUaService opcUaService, IMapper mapper, INotificationService notificationService)
public ImportOpcUaDialogViewModel(IOpcUaService opcUaService, IVariableItemViewModelFactory variableItemViewModelFactory,
IMapper mapper, INotificationService notificationService)
{
_opcUaService = opcUaService;
_variableItemViewModelFactory = variableItemViewModelFactory;
_mapper = mapper;
_notificationService = notificationService;
// 初始化根节点
@@ -319,7 +323,7 @@ public partial class ImportOpcUaDialogViewModel : DialogViewModelBase<List<Varia
// 异步浏览节点获取子节点列表
var children = await _opcUaService.BrowseNode(_mapper.Map<OpcUaNode>(node));
// 再次检查是否有取消请求
_cancellationTokenSource.Token.ThrowIfCancellationRequested();
@@ -332,15 +336,15 @@ public partial class ImportOpcUaDialogViewModel : DialogViewModelBase<List<Varia
// 判断节点类型是否为变量
if (child.NodeClass == NodeClass.Variable)
{
var variableItem = _variableItemViewModelFactory.CreateNewVariableItemViewModel();
variableItem.Name = child.DisplayName;
variableItem.OpcUaNodeId = child.NodeId.ToString();
variableItem.Protocol = ProtocolType.OpcUa;
variableItem.DataType = child.DataType;
// 创建并添加变量项到变量列表
OpcUaNodeVariables.Add(new VariableItemViewModel
{
Name = child.DisplayName, // 变量名称
OpcUaNodeId = child.NodeId.ToString(), // OPC UA节点ID
Protocol = ProtocolType.OpcUa, // 协议类型
DataType = child.DataType, // C#数据类型
IsActive = true // 默认激活状态
});
OpcUaNodeVariables.Add(variableItem);
}
// 如果是递归模式且节点不是变量，则递归浏览子节点
else if (isRecursive)

3
DMS.WPF/ViewModels/Items/VariableItemViewModel.cs
View File

@@ -122,9 +122,6 @@ public partial class VariableItemViewModel : ObservableObject
public VariableItemViewModel()
{
// 使用默认值，实际的默认值应该从外部传入或通过其他方式设置
// 保持构造函数轻量级，不加载配置文件
_pollingInterval = App.Current.Services.GetRequiredService<AppSettings>().DefaultPollingInterval; // 默认值，可通过外部设置覆盖
}

52
DMS.WPF/ViewModels/SettingViewModel.cs
View File

@@ -135,19 +135,63 @@ public partial class SettingViewModel : ViewModelBase
}
}
public int DefaultPollingInterval
public int VariablePollingInterval
{
get => _settings.DefaultPollingInterval;
get => _settings.VariableImportTemplate.PollingInterval;
set
{
if (_settings.DefaultPollingInterval != value)
if (_settings.VariableImportTemplate.PollingInterval != value)
{
_settings.DefaultPollingInterval = value;
_settings.VariableImportTemplate.PollingInterval = value;
OnPropertyChanged();
_settings.Save();
}
}
}
public bool VariableIsActive
{
get => _settings.VariableImportTemplate.IsActive;
set
{
if (_settings.VariableImportTemplate.IsActive != value)
{
_settings.VariableImportTemplate.IsActive = value;
OnPropertyChanged();
_settings.Save();
}
}
}
public bool VariableIsHistoryEnabled
{
get => _settings.VariableImportTemplate.IsHistoryEnabled;
set
{
if (_settings.VariableImportTemplate.IsHistoryEnabled != value)
{
_settings.VariableImportTemplate.IsHistoryEnabled = value;
OnPropertyChanged();
_settings.Save();
}
}
}
public double VariableHistoryDeadband
{
get => _settings.VariableImportTemplate.HistoryDeadband;
set
{
if (_settings.VariableImportTemplate.HistoryDeadband != value)
{
_settings.VariableImportTemplate.HistoryDeadband = value;
OnPropertyChanged();
_settings.Save();
}
}
}
[RelayCommand]
private async Task TestConnection()

5
DMS.WPF/ViewModels/SplashViewModel.cs
View File

@@ -52,10 +52,7 @@ public partial class SplashViewModel : ObservableObject
try
{
LoadingMessage = "正在加载系统配置...";
if (_appSettings.Load() == null)
{
//程序第一次启动
}
_appSettings.Load();
_logger.LogInformation("正在初始化数据库...");
LoadingMessage = "正在初始化数据库...";

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

@@ -11,7 +11,6 @@ using DMS.Core.Events;
using DMS.Core.Models;
using DMS.WPF.Interfaces;
using DMS.WPF.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Items;
using Microsoft.Extensions.DependencyInjection;
using ObservableCollections;
@@ -329,6 +328,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
return; // 用户取消或没有选择任何变量
}
// 将导入的变量转换为DTO并设置必要的属性
var importedVariableDtos = _mapper.Map<List<VariableDto>>(importedVariables);
foreach (var variableDto in importedVariableDtos)

11
DMS.WPF/Views/MainView.xaml.cs
View File

@@ -31,17 +31,6 @@ public partial class MainView : Window
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
// var settings = Config.AppSettings.Load();
// if (settings.MinimizeToTrayOnClose)
// {
// // Hide the window instead of closing it
// e.Cancel = true;
// Hide();
// }
// else
// {
// Application.Current.Shutdown();
// }
}
public void ShowApplication()

19
DMS.WPF/Views/SettingView.xaml
View File

@@ -84,10 +84,25 @@
</ui:SettingsExpander>
<ui:SettingsExpander>
<ui:SettingsExpander Description="设置变量默认导入的状态" Header="变量导入设置">
<ui:SettingsExpander.HeaderIcon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ScreenTime}" />
<ui:FontIcon FontFamily="{StaticResource MdFontIcons}" Glyph="&#xF02FA;" />
</ui:SettingsExpander.HeaderIcon>
<ui:SettingsExpander.Items>
<ui:SettingsCard Description="默认变量读取的间隔时间" Header="轮询时间">
<TextBox MinWidth="200" Text="{Binding VariablePollingInterval}" />
</ui:SettingsCard>
<ui:SettingsCard Description="默认变量是否启用" Header="是否启用">
<CheckBox MinWidth="200" IsChecked="{Binding VariableIsActive}" />
</ui:SettingsCard>
<ui:SettingsCard Description="默认变量是否开启历史记录" Header="是否保存">
<CheckBox MinWidth="200" IsChecked="{Binding VariableIsHistoryEnabled}" />
</ui:SettingsCard>
<ui:SettingsCard Description="默认变量历史记录变化返回，正负超过设定的范围才保存" Header="保存范围">
<TextBox MinWidth="200" Text="{Binding VariableHistoryDeadband}" />
</ui:SettingsCard>
</ui:SettingsExpander.Items>
</ui:SettingsExpander>

153
DMS.WPF/Views/VariableTableView.xaml
View File

@@ -41,85 +41,86 @@
<DockPanel>
<ikw:SimpleStackPanel DockPanel.Dock="Top" Margin="10" >
<Grid >
<ikw:SimpleStackPanel Margin="10" DockPanel.Dock="Top">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- 返回设备详情按钮 -->
<Button Grid.Column="0"
Command="{Binding NavigateToDeviceDetailCommand}"
Style="{StaticResource ButtonDefault}"
ToolTip="返回设备详情"
Margin="0,0,10,0">
<!-- 返回设备详情按钮 -->
<Button
Grid.Column="0"
Margin="0,0,10,0"
Command="{Binding NavigateToDeviceDetailCommand}"
Style="{StaticResource ButtonDefault}"
ToolTip="返回设备详情">
<Button.Content>
<StackPanel Orientation="Horizontal">
<ui:FontIcon
Icon="{x:Static ui:SegoeFluentIcons.ArrowLeft8}" />
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ArrowLeft8}" />
</StackPanel>
</Button.Content>
</Button>
<!-- 操作菜单 -->
<controls:CommandBar Grid.Column="1"
<controls:CommandBar
x:Name="PrimaryCommandBar"
Grid.Column="1"
DefaultLabelPosition="Right"
IsOpen="False">
<ui:AppBarButton Command="{Binding AddVariableCommand}" Label="添加变量">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding AddVariableCommand}" Label="添加变量">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding UpdateVariableCommand}" Label="编辑变量">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding UpdateVariableCommand}" Label="编辑变量">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding DeleteVariableCommand}" Label="删除变量">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding DeleteVariableCommand}" Label="删除变量">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton
Command="{Binding ImprotFromTiaVarTableCommand}"
Label="从TIA变量表导入"
Visibility="{Binding IsS7ProtocolSelected, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Import}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton
Command="{Binding ImportFromOpcUaServerCommand}"
Label="从OPC UA服务器导入"
Visibility="{Binding IsOpcUaProtocolSelected, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Import}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton x:Name="ShareButton" Label="Share">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Share}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:CommandBar.SecondaryCommands>
<ui:AppBarButton
x:Name="SettingsButton"
Icon="Setting"
Label="Settings" />
</ui:CommandBar.SecondaryCommands>
Command="{Binding ImprotFromTiaVarTableCommand}"
Label="从TIA变量表导入"
Visibility="{Binding IsS7ProtocolSelected, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Import}" />
</ui:AppBarButton.Icon>
</controls:CommandBar>
</Grid>
</ui:AppBarButton>
<ui:AppBarButton
Command="{Binding ImportFromOpcUaServerCommand}"
Label="从OPC UA服务器导入"
Visibility="{Binding IsOpcUaProtocolSelected, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Import}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton x:Name="ShareButton" Label="Share">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Share}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:CommandBar.SecondaryCommands>
<ui:AppBarButton
x:Name="SettingsButton"
Icon="Setting"
Label="Settings" />
</ui:CommandBar.SecondaryCommands>
</controls:CommandBar>
</Grid>
<!-- 变量表的名称描述等信息 -->
<ikw:SimpleStackPanel
Margin="5"
@@ -148,7 +149,7 @@
Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
</ikw:SimpleStackPanel>
</ikw:SimpleStackPanel>
<DataGrid
x:Name="BasicGridView"
@@ -206,9 +207,7 @@
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Command="{Binding ModifyConversionFormulaCommand}"
Header="修改数值转换公式">
<MenuItem Command="{Binding ModifyConversionFormulaCommand}" Header="修改数值转换公式">
<MenuItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</MenuItem.Icon>
@@ -235,7 +234,7 @@
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Command="{Binding ChangeHistorySettingsCommand}"
CommandParameter="{Binding PlacementTarget.SelectedItems, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
@@ -244,18 +243,14 @@
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Command="{Binding ChangeAlarmSettingsCommand}"
Header="修改报警设置">
<MenuItem Command="{Binding ChangeAlarmSettingsCommand}" Header="修改报警设置">
<MenuItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Command="{Binding ToHistoryCommand}"
Header="查看历史记录">
<MenuItem Command="{Binding ToHistoryCommand}" Header="查看历史记录">
<MenuItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.History}" />
</MenuItem.Icon>
@@ -319,7 +314,7 @@
</DataGridTemplateColumn.CellEditingTemplate>
</DataGridTemplateColumn>
<DataGridCheckBoxColumn Binding="{Binding IsActive}" Header="启用" />
<DataGridTemplateColumn Header="轮询间隔(毫秒)" SortMemberPath="PollingInterval">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
@@ -346,13 +341,13 @@
Header="更新时间"
IsReadOnly="True" />
<DataGridTextColumn Binding="{Binding ConversionFormula}" Header="转换规则" />
<DataGridCheckBoxColumn Binding="{Binding IsHistoryEnabled}" Header="保存" />
<DataGridTextColumn Binding="{Binding HistoryDeadband}" Header="保存范围" />
<DataGridCheckBoxColumn Binding="{Binding IsAlarmEnabled}" Header="报警" />
<DataGridTextColumn Binding="{Binding AlarmMinValue}" Header="报警最小值" />
<DataGridTextColumn Binding="{Binding AlarmMaxValue}" Header="报警最大值" />
</DataGrid.Columns>
</DataGrid.Columns>
</DataGrid>
</DockPanel>