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

refactor:完成重构设备的添加，删除，更新。

Browse Source
This commit is contained in:
David P.G
2025-10-22 14:06:16 +08:00
parent e995ec7207
commit 54d040b45f
76 changed files with 1028 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,18 +25,18 @@ public partial class VariableDialogViewModel : DialogViewModelBase<VariableItem>
[ObservableProperty]
private bool _hasError;
private readonly IWPFDataService _wpfDataService;
private readonly IWpfDataService _dataStorageService;
private readonly IViewCenterService _wpfDataService;
private readonly IViewDataService _viewDataService;
private readonly IVariableAppService _variableAppService;
private readonly IMapper _mapper;
public VariableDialogViewModel(IWPFDataService wpfDataService,IWpfDataService dataStorageService, IVariableAppService variableAppService, IMapper mapper)
public VariableDialogViewModel(IViewCenterService wpfDataService,IViewDataService dataStorageService, IVariableAppService variableAppService, IMapper mapper)
{
Variable = new VariableItem();
_wpfDataService = wpfDataService;
_dataStorageService = dataStorageService;
_viewDataService = dataStorageService;
this._variableAppService = variableAppService;
this._mapper = mapper;
}
@@ -83,7 +83,7 @@ public partial class VariableDialogViewModel : DialogViewModelBase<VariableItem>
return false;
}
//检查变量是否存在
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();
var existVariables = _viewDataService.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();
VariableItem existVariable = null;
if (IsAddModel)
{