g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-20 18:51:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复设备通讯变量点位

Browse Source
This commit is contained in:
Diego
2024-12-26 15:38:19 +08:00
parent 44d00e9da3
commit 4bcf8c1f78
1 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/Gateway/ThingsGateway.Gateway.Application/Plugin/Collect/CollectBase.cs
View File

@@ -177,70 +177,77 @@ public abstract class CollectBase : DriverBase
/// <returns></returns>
protected override async ValueTask ProtectedExecuteAsync(CancellationToken cancellationToken)
{
ReadResultCount readResultCount = new();
if (cancellationToken.IsCancellationRequested)
return;
if (await TestOnline(cancellationToken).ConfigureAwait(false))
return;
if (CollectProperties.ConcurrentCount > 1)
try
{
// 并行处理每个变量读取
await CurrentDevice.VariableSourceReads.ParallelForEachAsync(async (variableSourceRead, cancellationToken) =>
ReadResultCount readResultCount = new();
if (cancellationToken.IsCancellationRequested)
return;
if (await TestOnline(cancellationToken).ConfigureAwait(false))
return;
if (CollectProperties.ConcurrentCount > 1)
{
if (cancellationToken.IsCancellationRequested)
return;
if (await ReadVariableSource(readResultCount, variableSourceRead, cancellationToken, false).ConfigureAwait(false))
return;
// 并行处理每个变量读取
await CurrentDevice.VariableSourceReads.ParallelForEachAsync(async (variableSourceRead, cancellationToken) =>
{
if (cancellationToken.IsCancellationRequested)
return;
if (await ReadVariableSource(readResultCount, variableSourceRead, cancellationToken, false).ConfigureAwait(false))
return;
}
, CollectProperties.ConcurrentCount, cancellationToken).ConfigureAwait(false);
}
else
{
for (int i = 0; i < CurrentDevice.VariableSourceReads.Count; i++)
{
if (cancellationToken.IsCancellationRequested)
return;
// 每10包延迟一次
if (await ReadVariableSource(readResultCount, CurrentDevice.VariableSourceReads[i], cancellationToken, i % 10 == 9).ConfigureAwait(false))
return;
}
}
if (CollectProperties.ConcurrentCount > 1)
{
// 并行处理每个方法调用
await CurrentDevice.ReadVariableMethods.ParallelForEachAsync(async (readVariableMethods, cancellationToken) =>
{
if (cancellationToken.IsCancellationRequested)
return;
if (await ReadVariableMed(readResultCount, readVariableMethods, cancellationToken, false).ConfigureAwait(false))
return;
}
, CollectProperties.ConcurrentCount, cancellationToken).ConfigureAwait(false);
}
else
{
for (int i = 0; i < CurrentDevice.VariableSourceReads.Count; i++)
{
if (cancellationToken.IsCancellationRequested)
return;
// 每10包延迟一次
if (await ReadVariableSource(readResultCount, CurrentDevice.VariableSourceReads[i], cancellationToken, i % 10 == 9).ConfigureAwait(false))
return;
}
}
if (CollectProperties.ConcurrentCount > 1)
{
// 并行处理每个方法调用
await CurrentDevice.ReadVariableMethods.ParallelForEachAsync(async (readVariableMethods, cancellationToken) =>
else
{
if (cancellationToken.IsCancellationRequested)
return;
if (await ReadVariableMed(readResultCount, readVariableMethods, cancellationToken, false).ConfigureAwait(false))
return;
for (int i = 0; i < CurrentDevice.ReadVariableMethods.Count; i++)
{
if (cancellationToken.IsCancellationRequested)
return;
// 每10包延迟一次
if (await ReadVariableMed(readResultCount, CurrentDevice.ReadVariableMethods[i], cancellationToken, i % 10 == 9).ConfigureAwait(false))
return;
}
}
, CollectProperties.ConcurrentCount, cancellationToken).ConfigureAwait(false);
}
else
{
for (int i = 0; i < CurrentDevice.ReadVariableMethods.Count; i++)
// 如果所有方法和变量读取都成功，则清零错误计数器
if (readResultCount.deviceMethodsVariableFailedNum == 0 && readResultCount.deviceSourceVariableFailedNum == 0 && (readResultCount.deviceMethodsVariableSuccessNum != 0 || readResultCount.deviceSourceVariableSuccessNum != 0))
{
if (cancellationToken.IsCancellationRequested)
return;
// 每10包延迟一次
if (await ReadVariableMed(readResultCount, CurrentDevice.ReadVariableMethods[i], cancellationToken, i % 10 == 9).ConfigureAwait(false))
return;
//只有成功读取一次，失败次数都会清零
CurrentDevice.SetDeviceStatus(TimerX.Now, 0);
}
}
// 如果所有方法和变量读取都成功，则清零错误计数器
if (readResultCount.deviceMethodsVariableFailedNum == 0 && readResultCount.deviceSourceVariableFailedNum == 0 && (readResultCount.deviceMethodsVariableSuccessNum != 0 || readResultCount.deviceSourceVariableSuccessNum != 0))
}
finally
{
//只有成功读取一次，失败次数都会清零
CurrentDevice.SetDeviceStatus(TimerX.Now, 0);
ScriptVariableRun(cancellationToken);
}
ScriptVariableRun(cancellationToken);
#region 执行方法
async ValueTask<bool> ReadVariableMed(ReadResultCount readResultCount, VariableMethod readVariableMethods, CancellationToken cancellationToken, bool delay = true)