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

修复了导入变量的问题

Browse Source
This commit is contained in:
David P.G
2025-09-05 13:24:03 +08:00
parent 831f342b2c
commit 16bd8f79ee
5 changed files with 103 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DMS.Application/Interfaces/IVariableAppService.cs
View File

@@ -12,6 +12,16 @@ public interface IVariableAppService
/// </summary>
Task<VariableDto> GetVariableByIdAsync(int id);
/// <summary>
/// 异步根据OPC UA NodeId获取变量DTO。
/// </summary>
Task<VariableDto?> GetVariableByOpcUaNodeIdAsync(string opcUaNodeId);
/// <summary>
/// 异步根据OPC UA NodeId列表获取变量DTO列表。
/// </summary>
Task<List<VariableDto>> GetVariableByOpcUaNodeIdsAsync(List<string> opcUaNodeIds);
/// <summary>
/// 异步获取所有变量DTO列表。
/// </summary>

22
DMS.Application/Services/VariableAppService.cs
View File

@@ -39,6 +39,28 @@ public class VariableAppService : IVariableAppService
return _mapper.Map<VariableDto>(variable);
}
/// <summary>
/// 异步根据OPC UA NodeId获取变量数据传输对象。
/// </summary>
/// <param name="opcUaNodeId">OPC UA NodeId。</param>
/// <returns>变量数据传输对象。</returns>
public async Task<VariableDto?> GetVariableByOpcUaNodeIdAsync(string opcUaNodeId)
{
var variable = await _repoManager.Variables.GetByOpcUaNodeIdAsync(opcUaNodeId);
return variable == null ? null : _mapper.Map<VariableDto>(variable);
}
/// <summary>
/// 异步根据OPC UA NodeId列表获取变量数据传输对象列表。
/// </summary>
/// <param name="opcUaNodeIds">OPC UA NodeId列表。</param>
/// <returns>变量数据传输对象列表。</returns>
public async Task<List<VariableDto>> GetVariableByOpcUaNodeIdsAsync(List<string> opcUaNodeIds)
{
var variables = await _repoManager.Variables.GetByOpcUaNodeIdsAsync(opcUaNodeIds);
return _mapper.Map<List<VariableDto>>(variables);
}
/// <summary>
/// 异步获取所有变量数据传输对象列表。
/// </summary>

14
DMS.Core/Interfaces/Repositories/IVariableRepository.cs
View File

@@ -5,6 +5,18 @@ namespace DMS.Core.Interfaces.Repositories
{
public interface IVariableRepository:IBaseRepository<Variable>
{
/// <summary>
/// 异步根据OPC UA NodeId获取单个变量实体。
/// </summary>
/// <param name="opcUaNodeId">OPC UA NodeId。</param>
/// <returns>找到的变量实体，如果不存在则返回null。</returns>
Task<Variable?> GetByOpcUaNodeIdAsync(string opcUaNodeId);
/// <summary>
/// 异步根据OPC UA NodeId列表获取变量实体列表。
/// </summary>
/// <param name="opcUaNodeIds">OPC UA NodeId列表。</param>
/// <returns>找到的变量实体列表。</returns>
Task<List<Variable>> GetByOpcUaNodeIdsAsync(List<string> opcUaNodeIds);
}
}

26
DMS.Infrastructure/Repositories/VariableRepository.cs
View File

@@ -208,4 +208,30 @@ public class VariableRepository : BaseRepository<DbVariable>, IVariableRepositor
var dbEntities = _mapper.Map<List<DbVariable>>(entities);
return base.AddBatchAsync(dbEntities);
}
/// <summary>
/// 异步根据OPC UA NodeId获取单个变量实体。
/// </summary>
/// <param name="opcUaNodeId">OPC UA NodeId。</param>
/// <returns>找到的变量实体，如果不存在则返回null。</returns>
public async Task<Variable?> GetByOpcUaNodeIdAsync(string opcUaNodeId)
{
var dbVariable = await Db.Queryable<DbVariable>()
.Where(v => v.OpcUaNodeId == opcUaNodeId)
.FirstAsync();
return dbVariable == null ? null : _mapper.Map<Variable>(dbVariable);
}
/// <summary>
/// 异步根据OPC UA NodeId列表获取变量实体列表。
/// </summary>
/// <param name="opcUaNodeIds">OPC UA NodeId列表。</param>
/// <returns>找到的变量实体列表。</returns>
public async Task<List<Variable>> GetByOpcUaNodeIdsAsync(List<string> opcUaNodeIds)
{
var dbVariables = await Db.Queryable<DbVariable>()
.Where(v => opcUaNodeIds.Contains(v.OpcUaNodeId))
.ToListAsync();
return _mapper.Map<List<Variable>>(dbVariables);
}
}

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

@@ -158,7 +158,6 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
/// <summary>
/// 编辑选定的变量数据。
/// 此命令通常绑定到UI中的“编辑”按钮或双击事件。
@@ -177,7 +176,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 显示编辑变量数据的对话框，并传入当前选中的变量数据
VariableDialogViewModel variableDialogViewModel = App.Current.Services.GetRequiredService<VariableDialogViewModel>();
VariableDialogViewModel variableDialogViewModel
= App.Current.Services.GetRequiredService<VariableDialogViewModel>();
variableDialogViewModel.Title = "编辑变量";
variableDialogViewModel.PrimaryButText = "保存修改";
variableDialogViewModel.IsAddModel = false;
@@ -288,6 +288,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
_notificationService.ShowError("当前变量表的Device对象为空，请检查。");
return;
}
// 检查OPC UA Endpoint URL是否已设置
string opcUaEndpointUrl = CurrentVariableTable.Device.OpcUaServerUrl;
if (string.IsNullOrEmpty(opcUaEndpointUrl))
@@ -297,7 +298,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 显示OPC UA导入对话框，让用户选择要导入的变量
ImportOpcUaDialogViewModel importOpcUaDialogViewModel = App.Current.Services.GetRequiredService<ImportOpcUaDialogViewModel>();
ImportOpcUaDialogViewModel importOpcUaDialogViewModel
= App.Current.Services.GetRequiredService<ImportOpcUaDialogViewModel>();
importOpcUaDialogViewModel.EndpointUrl = opcUaEndpointUrl; // 设置Endpoint URL
var importedVariables = await _dialogService.ShowDialogAsync(importOpcUaDialogViewModel);
if (importedVariables == null || !importedVariables.Any())
@@ -320,7 +322,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
{
// 拼接要删除的变量名称，用于确认提示
var existNames = string.Join("、", existList.Select(v => v.Name));
var confirmDialogViewModel = new ConfirmDialogViewModel("存在已经添加的变量", $"变量名称:{existNames}，已经存在，是否跳过继续添加其他的变量。取消则不添加任何变量", "继续");
var confirmDialogViewModel
= new ConfirmDialogViewModel("存在已经添加的变量", $"变量名称:{existNames}，已经存在，是否跳过继续添加其他的变量。取消则不添加任何变量", "继续");
var res = await _dialogService.ShowDialogAsync(confirmDialogViewModel);
if (!res) return;
// 从导入列表中删除已经存在的变量
@@ -333,7 +336,10 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
var isSuccess = await _variableAppService.BatchImportVariablesAsync(importedVariableDtos);
if (isSuccess)
{
_variableItemList.AddRange(_mapper.Map<List<VariableItemViewModel>>(importedVariableDtos));
var addVariableDtos = await _variableAppService.GetVariableByOpcUaNodeIdsAsync(
importedVariableDtos.Select(v => v.OpcUaNodeId)
.ToList());
_variableItemList.AddRange(_mapper.Map<List<VariableItemViewModel>>(addVariableDtos));
_notificationService.ShowSuccess($"从OPC UA服务器导入变量成功，共导入变量：{importedVariableDtos.Count}个");
}
else
@@ -365,7 +371,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
try
{
// 显示添加变量数据的对话框
VariableDialogViewModel variableDialogViewModel = App.Current.Services.GetRequiredService<VariableDialogViewModel>();
VariableDialogViewModel variableDialogViewModel
= App.Current.Services.GetRequiredService<VariableDialogViewModel>();
VariableItemViewModel variableItem = new VariableItemViewModel();
variableItem.Protocol = CurrentVariableTable.Protocol;
variableDialogViewModel.Title = "添加变量";
@@ -385,7 +392,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
// // 添加变量数据到数据库
var addVariable = await _variableAppService.CreateVariableAsync(_mapper.Map<VariableDto>(variableItemViewModel));
var addVariable
= await _variableAppService.CreateVariableAsync(_mapper.Map<VariableDto>(variableItemViewModel));
_mapper.Map(addVariable, variableItemViewModel);
// // 更新当前页面显示的数据：将新变量添加到集合中
_variableItemList.Add(variableItemViewModel);
@@ -411,7 +419,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
{
try
{
List<VariableItemViewModel> variablesToDelete = SelectedVariables.Cast<VariableItemViewModel>().ToList();
List<VariableItemViewModel> variablesToDelete = SelectedVariables.Cast<VariableItemViewModel>()
.ToList();
// 检查是否有变量被选中
if (variablesToDelete == null || !variablesToDelete.Any())
{
@@ -423,14 +432,16 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
var names = string.Join("、", variablesToDelete.Select(v => v.Name));
// 显示确认删除对话框
ConfirmDialogViewModel confirmDialogViewModel = new ConfirmDialogViewModel("删除变量", $"确认要删除变量：{names},删除后不可恢复，确认要删除吗？", "删除变量");
ConfirmDialogViewModel confirmDialogViewModel
= new ConfirmDialogViewModel("删除变量", $"确认要删除变量：{names},删除后不可恢复，确认要删除吗？", "删除变量");
var isDel = await _dialogService.ShowDialogAsync(confirmDialogViewModel);
if (!isDel)
return; // 如果用户取消删除，则返回
// 从数据库中删除变量数据
var result = await _variableAppService.DeleteVariablesAsync(variablesToDelete.Select(v => v.Id).ToList());
var result = await _variableAppService.DeleteVariablesAsync(variablesToDelete.Select(v => v.Id)
.ToList());
if (result)
{
foreach (var variable in variablesToDelete)
@@ -438,6 +449,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
_variableItemList.Remove(variable);
_dataServices.DeleteVariable(variable.Id);
}
// 显示成功通知
_notificationService.ShowSuccess($"成功删除 {variablesToDelete.Count} 个变量");
}
@@ -470,10 +482,12 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 获取选中的变量列表
var validVariables = SelectedVariables.Cast<VariableItemViewModel>().ToList();
var validVariables = SelectedVariables.Cast<VariableItemViewModel>()
.ToList();
// 显示轮询频率选择对话框，并传入第一个变量的当前轮询频率作为默认值
PollLevelDialogViewModel viewModel = new PollLevelDialogViewModel(validVariables.First().PollLevel);
PollLevelDialogViewModel viewModel = new PollLevelDialogViewModel(validVariables.First()
.PollLevel);
var newPollLevelType = await _dialogService.ShowDialogAsync(viewModel);
if (newPollLevelType.HasValue)
{
@@ -487,7 +501,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var result = await _variableAppService.UpdateVariablesAsync(variableDtos);
if (result > 0)
{
// 显示成功通知
@@ -654,10 +668,12 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 获取选中的变量列表
var validVariables = SelectedVariables.Cast<VariableItemViewModel>().ToList();
var validVariables = SelectedVariables.Cast<VariableItemViewModel>()
.ToList();
// 显示启用状态选择对话框，并传入第一个变量的当前启用状态作为默认值
IsActiveDialogViewModel viewModel = new IsActiveDialogViewModel(validVariables.First().IsActive);
IsActiveDialogViewModel viewModel = new IsActiveDialogViewModel(validVariables.First()
.IsActive);
var newIsActive = await _dialogService.ShowDialogAsync(viewModel);
if (newIsActive.HasValue)
{
@@ -671,7 +687,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var result = await _variableAppService.UpdateVariablesAsync(variableDtos);
if (result > 0)
{
// 显示成功通知