GithubStar/ThingsGateway
1
0
Fork 0
mirror of https://github.com/ThingsGateway/ThingsGateway.git synced 2026-10-26 02:17:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新OPCUAClient，订阅模式适配 分组

Browse Source
This commit is contained in:
Kimdiego2098
2023-10-31 10:55:50 +08:00
parent 1063c930b5
commit d0c05685f7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/Foundation/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs
+7 -2
View File
@@ -47,7 +47,7 @@ public class OPCUAClient : IDisposable
/// <summary>
/// 当前保存的变量名称列表
/// </summary>
public List<string> Variables = new();
public List<List<string>> Variables = new();
/// <summary>
/// 当前的变量名称/OPC变量节点
@@ -584,7 +584,12 @@ public class OPCUAClient : IDisposable
//如果是订阅模式，连接时添加订阅组
if (OPCNode.ActiveSubscribe)
await AddSubscriptionAsync(Guid.NewGuid().ToString(), Variables.ToArray(), OPCNode.LoadType);
{
foreach (var item in Variables)
{
await AddSubscriptionAsync(Guid.NewGuid().ToString(), item.ToArray(), OPCNode.LoadType);
}
}
return m_session;
}
framework/Plugin/ThingsGateway.Plugin.OPCUA/OPCUAClient/OPCUAClient.cs
+3 -2
View File
@@ -78,8 +78,9 @@ public class OPCUAClient : CollectBase
public override List<DeviceVariableSourceRead> LoadSourceRead(List<DeviceVariableRunTime> deviceVariables)
{
_deviceVariables = deviceVariables;
_plc.Variables.AddRange(deviceVariables.Select(a => a.VariableAddress).ToList());
var dataLists = deviceVariables.ChunkTrivialBetter(driverPropertys.GroupSize);
List<List<DeviceVariableRunTime>> dataLists = deviceVariables.ChunkTrivialBetter(driverPropertys.GroupSize);
_plc.Variables = new();
_plc.Variables.AddRange(dataLists.Select(a => a.Select(a => a.VariableAddress).ToList()).ToList());
var dataResult = new List<DeviceVariableSourceRead>();
foreach (var variable in dataLists)
{