g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-11-01 16:13:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加 rpc写入 多写日志

Browse Source
This commit is contained in:
Diego
2025-07-31 12:52:40 +08:00
parent 7575264ede
commit e14d39a459
7 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.9.91</PluginVersion>
<ProPluginVersion>10.9.91</ProPluginVersion>
<DefaultVersion>10.9.95</DefaultVersion>
<PluginVersion>10.9.92</PluginVersion>
<ProPluginVersion>10.9.92</ProPluginVersion>
<DefaultVersion>10.9.96</DefaultVersion>
<AuthenticationVersion>2.9.29</AuthenticationVersion>
<SourceGeneratorVersion>10.9.29</SourceGeneratorVersion>
<NET8Version>8.0.18</NET8Version>

2
src/Foundation/ThingsGateway.CSScript/ThingsGateway.CSScript.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CS-Script" Version="4.10.0" />
<PackageReference Include="CS-Script" Version="4.10.1" />
</ItemGroup>
<ItemGroup>

2
src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
View File

@@ -188,8 +188,6 @@ public abstract class CollectFoundationBase : CollectBase
{
try
{
if (LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Debug)
LogMessage?.Debug(string.Format("{0} - Writing [{1} - {2} - {3}]", DeviceName, writeInfo.Key.RegisterAddress, writeInfo.Value, writeInfo.Key.DataType));
// 调用协议的写入方法，将写入信息中的数据写入到对应的寄存器地址，并获取操作结果
var result = await FoundationDevice.WriteJTokenAsync(writeInfo.Key.RegisterAddress, writeInfo.Value, writeInfo.Key.DataType, cancellationToken).ConfigureAwait(false);

2
src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.property.cs
View File

@@ -21,7 +21,7 @@ public partial class VariableRuntime : Variable, IVariable, IDisposable
{
[AutoGenerateColumn(Visible = false)]
public bool ValueInited { get; set; }
public bool ValueInited { get => _valueInited; set => _valueInited = value; }
#region 属性
/// <summary>

3
src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs
View File

@@ -167,7 +167,8 @@ public class OpcDaMaster : CollectBase
));
await Check(writeInfoLists, results, cancellationToken).ConfigureAwait(false);
if (LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Debug)
LogMessage?.Debug(string.Format("Write result: {0} - {1}", DeviceName, results.Select(a => $"{a.Key} - {a.Key.Length} - {(a.Value.IsSuccess ? "Success" : a.Value.ErrorMessage)}").ToSystemTextJsonString(false)));
return new(results);
}
public override async Task AfterVariablesChangedAsync(CancellationToken cancellationToken)

3
src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs
View File

@@ -287,7 +287,8 @@ public class OpcUaMaster : CollectBase
}));
await Check(writeInfoLists, results, cancellationToken).ConfigureAwait(false);
if (LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Debug)
LogMessage?.Debug(string.Format("Write result: {0} - {1}", DeviceName, results.Select(a => $"{a.Key} - {a.Key.Length} - {(a.Value.IsSuccess ? "Success" : a.Value.ErrorMessage)}").ToSystemTextJsonString(false)));
return new(results);
}

7
src/Plugin/ThingsGateway.Plugin.SiemensS7/SiemensS7Master/SiemensS7Master.cs
View File

@@ -15,6 +15,7 @@ using System.Collections.Concurrent;
using ThingsGateway.Debug;
using ThingsGateway.Foundation.SiemensS7;
using ThingsGateway.Gateway.Application;
using ThingsGateway.NewLife.Json.Extension;
using TouchSocket.Core;
using TouchSocket.Sockets;
@@ -133,6 +134,9 @@ public class SiemensS7Master : CollectFoundationBase
operResults.TryAdd(writeInfo.Key.Name, r1);
}
}
}
// 使用并发方式遍历写入信息列表，并进行异步写入操作
@@ -153,7 +157,8 @@ public class SiemensS7Master : CollectFoundationBase
}).ConfigureAwait(false);
await Check(writeInfoLists, operResults, cancellationToken).ConfigureAwait(false);
if (LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Debug)
LogMessage?.Debug(string.Format("Write result: {0} - {1}", DeviceName, operResults.Select(a => $"{a.Key} - {a.Key.Length} - {(a.Value.IsSuccess ? "Success" : a.Value.ErrorMessage)}").ToSystemTextJsonString(false)));
// 返回包含操作结果的字典
return new Dictionary<string, OperResult>(operResults);
}