g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-11-04 17:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复浏览大量节点空间时，BrowseNext方法参数releaseContinuationPoints改为false

Browse Source
This commit is contained in:
Kimdiego2098
2023-08-28 17:44:02 +08:00
parent 2b84bde367
commit 1e1f27c8a5
3 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/FormUtils.cs
View File

@@ -14,6 +14,7 @@ using Opc.Ua;
using Opc.Ua.Client;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -150,6 +151,26 @@ public class FormUtils
return null;
}
}
/// <summary>
/// Create the continuation point collection from the browse result
/// collection for the BrowseNext service.
/// </summary>
/// <param name="browseResultCollection">The browse result collection to use.</param>
/// <returns>The collection of continuation points for the BrowseNext service.</returns>
private static ByteStringCollection PrepareBrowseNext(BrowseResultCollection browseResultCollection)
{
var continuationPoints = new ByteStringCollection();
foreach (var browseResult in browseResultCollection)
{
if (browseResult.ContinuationPoint != null)
{
continuationPoints.Add(browseResult.ContinuationPoint);
}
}
return continuationPoints;
}
/// <summary>
/// 浏览地址空间
/// </summary>
@@ -180,10 +201,17 @@ public class FormUtils
ClientBase.ValidateResponse(results, nodesToBrowse);
ClientBase.ValidateDiagnosticInfos(diagnosticInfos, nodesToBrowse);
ByteStringCollection continuationPoints = new();
var continuationPoints = PrepareBrowseNext(result.Results);
for (int ii = 0; ii < nodesToBrowse.Count; ii++)
{
// check if all references have been fetched.
if (results[ii].References.Count == 0)
{
continue;
}
// check for error.
if (StatusCode.IsBad(results[ii].StatusCode))
{
@@ -198,31 +226,20 @@ public class FormUtils
continue;
}
// check if all references have been fetched.
if (results[ii].References.Count == 0)
{
continue;
}
// save results.
references.AddRange(results[ii].References);
// check for continuation point.
if (results[ii].ContinuationPoint != null)
{
continuationPoints.Add(results[ii].ContinuationPoint);
}
}
// process continuation points.
ByteStringCollection revisedContiuationPoints = new();
while (continuationPoints.Count > 0)
while (continuationPoints.Any())
{
// continue browse operation.
var nextResult = await session.BrowseNextAsync(
null,
true,
false,
continuationPoints
, token);
results = nextResult.Results;
@@ -232,6 +249,11 @@ public class FormUtils
for (int ii = 0; ii < continuationPoints.Count; ii++)
{
// check if all references have been fetched.
if (results[ii].References.Count == 0)
{
continue;
}
// check for error.
if (StatusCode.IsBad(results[ii].StatusCode))
@@ -239,24 +261,16 @@ public class FormUtils
continue;
}
// check if all references have been fetched.
if (results[ii].References.Count == 0)
{
continue;
}
// save results.
references.AddRange(results[ii].References);
// check for continuation point.
if (results[ii].ContinuationPoint != null)
{
revisedContiuationPoints.Add(results[ii].ContinuationPoint);
}
}
// check if browsing must continue;
revisedContiuationPoints = continuationPoints;
continuationPoints = PrepareBrowseNext(nextResult.Results);
}
// check if unprocessed results exist.

8
framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/ThingsGateway.Foundation.Adapter.OPCUA.xml
View File

@@ -38,6 +38,14 @@
The references found. Null if an error occurred.
</returns>
</member>
<member name="M:ThingsGateway.Foundation.Adapter.OPCUA.FormUtils.PrepareBrowseNext(Opc.Ua.BrowseResultCollection)">
<summary>
Create the continuation point collection from the browse result
collection for the BrowseNext service.
</summary>
<param name="browseResultCollection">The browse result collection to use.</param>
<returns>The collection of continuation points for the BrowseNext service.</returns>
</member>
<member name="M:ThingsGateway.Foundation.Adapter.OPCUA.FormUtils.BrowseAsync(Opc.Ua.Client.ISession,Opc.Ua.BrowseDescriptionCollection,System.Boolean,System.Threading.CancellationToken)">
<summary>
浏览地址空间

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

@@ -236,9 +236,9 @@ public partial class ImportVariable
if (data != null && data.Count > 0)
{
if (isAll)
child.Nodes = await PopulateBranchAsync((NodeId)target.NodeId);
else
child.Nodes = new();
child.Nodes = await PopulateBranchAsync((NodeId)target.NodeId);
else
child.Nodes = new();
}
else
{