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

refactor: 将VariableMqttAlias改为MqttAlias,将VariableMqttAliasItemViewModel改为MqttAliasItem

Browse Source
This commit is contained in:
David P.G
2025-10-06 17:39:03 +08:00
parent a3af5dd0cc
commit 6cff70cd87
26 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DMS.WPF/DMS.WPF.csproj
View File

@@ -181,12 +181,6 @@
<ItemGroup>
<Folder Include="ViewModels\Items\" />
</ItemGroup>
<ItemGroup>
<None Update="Configurations\nlog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

2
DMS.WPF/Profiles/MappingProfile.cs
View File

@@ -17,7 +17,7 @@ namespace DMS.WPF.Profiles
CreateMap<OpcUaNode, OpcUaNodeItemViewModel>()
.ReverseMap();
CreateMap<VariableItemViewModel, VariableItemViewModel>();
CreateMap<VariableMqttAlias, VariableMqttAliasItemViewModel>().ReverseMap();
CreateMap<MqttAlias, MqttAliasItem>().ReverseMap();
CreateMap<MenuBeanDto, MenuItemViewModel>()

6
DMS.WPF/ViewModels/Dialogs/MqttAliasBatchEditDialogViewModel.cs
View File

@@ -13,10 +13,10 @@ namespace DMS.WPF.ViewModels.Dialogs
/// <summary>
/// MQTT别名批量编辑对话框的视图模型
/// </summary>
public partial class MqttAliasBatchEditDialogViewModel : DialogViewModelBase<List<VariableMqttAliasItemViewModel>>
public partial class MqttAliasBatchEditDialogViewModel : DialogViewModelBase<List<MqttAliasItem>>
{
[ObservableProperty]
private ObservableCollection<VariableMqttAliasItemViewModel> _variableMqttAliases = new();
private ObservableCollection<MqttAliasItem> _variableMqttAliases = new();
[ObservableProperty]
private MqttServerItemViewModel _selectedMqttServer;
@@ -41,7 +41,7 @@ namespace DMS.WPF.ViewModels.Dialogs
// 检查该变量是否已经有针对此MQTT服务器的别名
var existingAlias = variable.MqttAliases?.FirstOrDefault(ma => ma.MqttServerId == SelectedMqttServer.Id);
var variableMqttAlias = new VariableMqttAliasItemViewModel
var variableMqttAlias = new MqttAliasItem
{
VariableId = variable.Id,
MqttServerId = SelectedMqttServer.Id,

2
DMS.WPF/ViewModels/Items/VariableMqttAliasItemViewModel.cs → DMS.WPF/ViewModels/Items/MqttAliasItem.cs
View File

@@ -3,7 +3,7 @@ using DMS.Application.DTOs;
namespace DMS.WPF.ViewModels.Items;
public partial class VariableMqttAliasItemViewModel : ObservableObject
public partial class MqttAliasItem : ObservableObject
{
public int Id { get; set; }

2
DMS.WPF/ViewModels/Items/MqttServerItemViewModel.cs
View File

@@ -62,7 +62,7 @@ public partial class MqttServerItemViewModel : ObservableObject
private string _messageFooter;
[ObservableProperty]
private ObservableCollection<VariableMqttAliasItemViewModel> _variableAliases = new();
private ObservableCollection<MqttAliasItem> _variableAliases = new();
}

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

@@ -105,7 +105,7 @@ public partial class VariableItemViewModel : ObservableObject
/// 一个变量可以有多个MQTT别名。
/// </summary>
[ObservableProperty]
private List<VariableMqttAliasItemViewModel>? _mqttAliases=new List<VariableMqttAliasItemViewModel>();
private List<MqttAliasItem>? _mqttAliases=new List<MqttAliasItem>();
/// <summary>
/// 获取或设置变量的信号类型 (如：AI, DI, AO, DO)。

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

@@ -37,7 +37,7 @@ namespace DMS.WPF.ViewModels
/// 与当前MQTT服务器关联的变量数据集合。
/// </summary>
[ObservableProperty]
private ObservableCollection<VariableMqttAlias> _associatedVariables;
private ObservableCollection<MqttAlias> _associatedVariables;
/// <summary>
@@ -198,7 +198,7 @@ namespace DMS.WPF.ViewModels
/// 修改变量的MQTT发送名称
/// </summary>
[RelayCommand]
private async Task ModifyAlias(VariableMqttAlias variableAlias)
private async Task ModifyAlias(MqttAlias variableAlias)
{
if (variableAlias == null)
{

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

@@ -653,7 +653,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
if (existingVariableMqtt == null)
{
// 如果不存在，则添加新的关联
var variableMqtt = new VariableMqttAliasItemViewModel
var variableMqtt = new MqttAliasItem
{
VariableId = originalVariable.Id,
MqttServerId = selectedMqtt.Id,