g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-29 06:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

opcuaclient浏览地址空间 初始只加载首层节点

Browse Source
This commit is contained in:
Kimdiego2098
2023-08-27 13:06:03 +08:00
parent 62384af2f6
commit 7b197a90d1
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/ImportVariable.razor.cs
View File

@@ -73,6 +73,15 @@ public partial class ImportVariable
public async Task<(CollectDevice, List<DeviceVariable>)> GetImportVariableListAsync() public async Task<(CollectDevice, List<DeviceVariable>)> GetImportVariableListAsync()
{ {
var device = GetImportDevice(); var device = GetImportDevice();
//动态加载子项时，导出内容需要添加手动加载代码
foreach (var node in Selected)
{
List<OPCUATagModel> nodes = await PopulateBranchAsync((NodeId)node.NodeId, true);
if (nodes.Count > 0)
{
Selected.AddRange(nodes.Select(a => a.Tag).Where(a => a != null).ToList());
}
}
var data = (await SelectAsync(Selected, async a => var data = (await SelectAsync(Selected, async a =>
{ {
var nodeClass = (await PLC.ReadNoteAttributeAsync(a.NodeId.ToString(), Attributes.NodeClass)).Content.FirstOrDefault().Value.ToString(); var nodeClass = (await PLC.ReadNoteAttributeAsync(a.NodeId.ToString(), Attributes.NodeClass)).Content.FirstOrDefault().Value.ToString();
@@ -192,14 +201,13 @@ public partial class ImportVariable
ReferenceDescriptionCollection references = await FormUtils.BrowseAsync(PLC.Session, nodesToBrowse, false); ReferenceDescriptionCollection references = await FormUtils.BrowseAsync(PLC.Session, nodesToBrowse, false);
return references; return references;
} }
private async Task PopulateBranchAsync(OPCUATagModel model) private async Task PopulateBranchAsync(OPCUATagModel model)
{ {
var sourceId = (NodeId)model.Tag.NodeId; var sourceId = (NodeId)model.Tag.NodeId;
model.Nodes = await PopulateBranchAsync(sourceId); model.Nodes = await PopulateBranchAsync(sourceId);
} }
private async Task<List<OPCUATagModel>> PopulateBranchAsync(NodeId sourceId) private async Task<List<OPCUATagModel>> PopulateBranchAsync(NodeId sourceId, bool isAll = false)
{ {
if (!PLC.Connected) if (!PLC.Connected)
{ {
@@ -222,22 +230,30 @@ public partial class ImportVariable
Name = Utils.Format("{0}", target), Name = Utils.Format("{0}", target),
Tag = target Tag = target
}; };
if (target.NodeClass != NodeClass.Variable) //if (target.NodeClass != NodeClass.Variable)
{ {
var data = await GetReferenceDescriptionCollectionAsync((NodeId)target.NodeId); var data = await GetReferenceDescriptionCollectionAsync((NodeId)target.NodeId);
if (data != null && data.Count > 0) if (data != null && data.Count > 0)
{ {
child.Nodes = await PopulateBranchAsync((NodeId)target.NodeId); if (isAll)
{
child.Nodes = new();
}
else
{
child.Nodes = await PopulateBranchAsync((NodeId)target.NodeId);
}
} }
else else
{ {
child.Nodes = null; child.Nodes = null;
} }
} }
else //else
{ //{
child.Nodes = null; // child.Nodes = null;
} //}
list.Add(child); list.Add(child);
} }
} }