2.1.0.1

framework/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>2.0.9.2</Version>
+		<Version>2.1.0.1</Version>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>

framework/ThingsGateway.Admin.Application/Aop/OperDispatchProxy.cs

@@ -18,6 +18,7 @@ using System.Reflection;
 using System.Text;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 using UAParser;
 

framework/ThingsGateway.Admin.Application/Helper/PermissionUtil.cs

@@ -20,6 +20,7 @@ using System.Globalization;
 using System.Reflection;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 using Yitter.IdGenerator;
 

framework/ThingsGateway.Admin.Application/Helper/SeedDataUtil.cs

@@ -13,6 +13,8 @@
 using System.Text;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

framework/ThingsGateway.Admin.Application/System/Services/Button/ButtonService.cs

@@ -16,6 +16,7 @@ using Furion.FriendlyException;
 using Mapster;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Application;
 

framework/ThingsGateway.Admin.Application/System/Services/Role/RoleService.cs

@@ -17,6 +17,7 @@ using Furion.FriendlyException;
 using Mapster;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 using Yitter.IdGenerator;
 

framework/ThingsGateway.Admin.Application/System/Services/User/SysUserService.cs

@@ -19,6 +19,7 @@ using Mapster;
 using SqlSugar;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Application;
 

framework/ThingsGateway.Admin.Application/System/Services/UserCenter/UserCenterService.cs

@@ -17,6 +17,7 @@ using Furion.FriendlyException;
 using Mapster;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Application;
 

framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs

@@ -17,6 +17,7 @@ using Masa.Blazor;
 using Microsoft.AspNetCore.Components;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Blazor.Core;
 /// <summary>

framework/ThingsGateway.Admin.Blazor.Core/UserResoures/UserResoures.cs

@@ -20,6 +20,7 @@ using Microsoft.AspNetCore.Http;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Blazor.Core;
 

framework/ThingsGateway.Admin.Blazor/Shared/Login.razor.cs

@@ -21,6 +21,7 @@ using Microsoft.Extensions.Hosting;
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Blazor.Core;
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Blazor;
 

framework/ThingsGateway.Admin.Core/Extension/JsonExtensions.cs

@@ -12,7 +12,7 @@
 
 using Furion.DependencyInjection;
 
-namespace ThingsGateway.Admin.Core;
+namespace ThingsGateway.Admin.Core.JsonExtensions;
 
 /// <summary>
 /// 对象拓展

framework/ThingsGateway.Admin.Core/Extension/ListExtensions.cs

@@ -18,6 +18,8 @@ using System.Collections;
 using System.Data;
 using System.Reflection;
 
+using ThingsGateway.Admin.Core.JsonExtensions;
+
 namespace ThingsGateway.Admin.Core;
 
 /// <summary>

framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj

@@ -9,10 +9,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.40" />
-		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.40" />
-		<PackageReference Include="Furion.Pure" Version="4.8.8.40" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.99" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.41" />
+		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.41" />
+		<PackageReference Include="Furion.Pure" Version="4.8.8.41" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.102" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 		<PackageReference Include="MiniExcel" Version="1.31.2" />

framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.xml

@@ -850,19 +850,19 @@
             <param name="this"></param>
             <param name="values"></param>
         </member>
-        <member name="T:ThingsGateway.Admin.Core.JsonExtensions">
+        <member name="T:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions">
             <summary>
             对象拓展
             </summary>
         </member>
-        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.ToJsonString(System.Object)">
+        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions.ToJsonString(System.Object)">
             <summary>
             转换为Json
             </summary>
             <param name="item"></param>
             <returns></returns>
         </member>
-        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.ToJsonWithT``1(System.String)">
+        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions.ToJsonWithT``1(System.String)">
             <summary>
             从字符串到json
             </summary>

framework/ThingsGateway.ApiController/Controllers/RpcControler.cs

@@ -89,13 +89,8 @@ public class RpcControler : IDynamicApiController
     [Description("写入变量")]
     public async Task<Dictionary<string, OperResult>> WriteDeviceMethods(Dictionary<string, string> objs)
     {
-        Dictionary<string, OperResult> operResultDict = new();
-        foreach (KeyValuePair<string, string> obj in objs)
-        {
-            var result = await RpcCore.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}", obj);
-            operResultDict.Add(obj.Key, result);
-        }
-        return operResultDict;
+        var result = await RpcCore.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}", objs);
+        return result;
     }
 }
 

framework/ThingsGateway.Application/Converter/StringToEncodingConverter.cs

@@ -80,7 +80,7 @@ public class StringToEncodingConverter : IConverter<string>
     {
         try
         {
-            source = target.ToJson();
+            source = target.ToJsonString();
             return true;
         }
         catch (Exception)

framework/ThingsGateway.Application/Extensions/CSharpScriptEngineExtension.cs

@@ -21,7 +21,7 @@ using Newtonsoft.Json.Converters;
 using System.Dynamic;
 using System.Text;
 
-using TouchSocket.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Application;
 /// <summary>
@@ -76,7 +76,7 @@ public class CSharpScriptEngine : ISingleton
         var expConverter = new ExpandoObjectConverter();
         dynamic obj = JsonConvert.DeserializeObject<List<ExpandoObject>>(input, expConverter);
         object result = runscript(obj);
-        var json = result.ToJson();
+        var json = result.ToJsonString();
         return json;
     }
 
@@ -116,7 +116,7 @@ public class CSharpScriptEngine : ISingleton
         var expConverter = new ExpandoObjectConverter();
         dynamic obj = JsonConvert.DeserializeObject<ExpandoObject>(input, expConverter);
         object result = runscript(obj);
-        var json = result.ToJson();
+        var json = result.ToJsonString();
         return json;
     }
 
@@ -136,7 +136,7 @@ public static class CSharpScriptEngineExtension
     /// </summary>
     public static string GetSciptListValue<T>(this T datas, string script) where T : class
     {
-        var inPut = datas.ToJson();
+        var inPut = datas.ToJsonString();
         if (!string.IsNullOrEmpty(script))
         {
             //执行脚本，获取新实体
@@ -154,7 +154,7 @@ public static class CSharpScriptEngineExtension
     /// </summary>
     public static string GetSciptValue<T>(this T datas, string script) where T : class
     {
-        var inPut = datas.ToJson();
+        var inPut = datas.ToJsonString();
         if (!string.IsNullOrEmpty(script))
         {
             //执行脚本，获取新实体

framework/ThingsGateway.Application/Model/DeviceVariableRunTime.cs

@@ -82,18 +82,15 @@ public class DeviceVariableRunTime : DeviceVariable
     /// </summary>
     /// <param name="value"></param>
     /// <param name="dateTime"></param>
-    public OperResult SetValue(object value, DateTime dateTime = default)
+    /// <param name="isOnline"></param>
+    public OperResult SetValue(object value, DateTime dateTime = default,bool isOnline=true)
     {
         try
         {
+            IsOnline = isOnline;
 
-            if (value != null)
+            if (!IsOnline)
             {
-                IsOnline = true;
-            }
-            else
-            {
-                IsOnline = false;
                 RawValue = value;
                 Set(value);
                 return OperResult.CreateSuccessResult();

framework/ThingsGateway.Application/Plugin/CollectBase.cs

@@ -36,6 +36,10 @@ public abstract class CollectBase : DriverBase
     /// </summary>
     /// <returns></returns>
     public abstract bool IsSupportRequest { get; }
+    /// <summary>
+    /// 一般底层驱动，也有可能为null
+    /// </summary>
+    protected abstract IReadWriteDevice PLC { get; }
 
     /// <summary>
     /// 数据转换器
@@ -98,9 +102,9 @@ public abstract class CollectBase : DriverBase
                         StopBits = config.StopBits,
                     };
                     FoundataionConfig.SetValue(SerialConfigExtension.SerialProperty, data);
-                    var serialClient = new SerialClient();
-                    (serialClient).Setup(FoundataionConfig);
-                    return OperResult.CreateSuccessResult((object)serialClient);
+                    var serialSession = new SerialsSession();
+                    (serialSession).Setup(FoundataionConfig);
+                    return OperResult.CreateSuccessResult((object)serialSession);
                 case ShareChannelEnum.TcpClientEx:
                     FoundataionConfig.SetRemoteIPHost(new IPHost($"{config.IP}:{config.Port}"));
                     var tcpClient = new TcpClientEx();
@@ -153,7 +157,7 @@ public abstract class CollectBase : DriverBase
             {
                 deviceVariableSourceRead.DeviceVariables.ForEach(it =>
                 {
-                    var operResult = it.SetValue(null);
+                    var operResult = it.SetValue(null,isOnline:false);
                     if (!operResult.IsSuccess)
                     {
                         _logger.LogWarning("变量值更新失败：" + operResult.Message);
@@ -177,10 +181,22 @@ public abstract class CollectBase : DriverBase
     }
 
     /// <summary>
-    /// 写入变量值
+    /// 批量写入变量值,需返回变量名称/结果
     /// </summary>
     /// <returns></returns>
-    public abstract Task<OperResult> WriteValueAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token);
+    public virtual async Task<Dictionary<string, OperResult>> WriteValuesAsync(Dictionary<DeviceVariableRunTime, JToken> writeInfoLists, CancellationToken token)
+    {
+        if (PLC == null)
+            throw new("未初始化成功");
+        Dictionary<string, OperResult> operResults = new();
+        foreach (var writeInfo in writeInfoLists)
+        {
+            var result = await PLC.WriteAsync(writeInfo.Key.VariableAddress, writeInfo.Key.DataType, writeInfo.Value.ToString(), token);
+            await Task.Delay(10, token); //防止密集写入
+            operResults.Add(writeInfo.Key.Name, result);
+        }
+        return operResults;
+    }
 
     /// <summary>
     /// 初始化

framework/ThingsGateway.Application/Rpc/RpcSingletonService.cs

@@ -19,6 +19,7 @@ using Newtonsoft.Json.Linq;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Admin.Core.JsonExtensions;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Extension.ConcurrentQueue;
 
@@ -48,92 +49,172 @@ public class RpcSingletonService : ISingleton
     /// 反向RPC入口方法
     /// </summary>
     /// <param name="sourceDes">触发该方法的源说明</param>
-    /// <param name="item">指定键为变量名称，值为附带方法参数或写入值</param>
+    /// <param name="items">指定键为变量名称，值为附带方法参数或写入值</param>
     /// <param name="isBlazor">如果是true，不检查<see cref="MemoryVariable.RpcWriteEnable"/>字段</param>
     /// <param name="token"><see cref="CancellationToken"/> 取消源</param>
     /// <returns></returns>
-    public async Task<OperResult> InvokeDeviceMethodAsync(string sourceDes, KeyValuePair<string, string> item, bool isBlazor = false, CancellationToken token = default)
+    public async Task<Dictionary<string, OperResult>> InvokeDeviceMethodAsync(string sourceDes, Dictionary<string, string> items, bool isBlazor = false, CancellationToken token = default)
     {
-        //避免并发过高，这里延时10ms
-        await Task.Delay(10, token);
-        OperResult data = new();
-        var tag = _globalDeviceData.AllVariables.FirstOrDefault(it => it.Name == item.Key);
-        if (tag == null) return new OperResult("不存在变量:" + item.Key);
-        if (tag.ProtectTypeEnum == ProtectTypeEnum.ReadOnly) return new OperResult("只读变量");
-        if (!tag.RpcWriteEnable && !isBlazor) return new OperResult("不允许远程写入");
-
-        if (tag.IsMemoryVariable == true)
+        Dictionary<CollectDeviceCore, Dictionary<DeviceVariableRunTime, JToken>> WriteVariables = new();
+        Dictionary<CollectDeviceCore, Dictionary<DeviceVariableRunTime, string>> WriteMethods = new();
+        Dictionary<string, OperResult> results = new();
+        foreach (var item in items)
         {
-            return tag.SetValue(item.Value);
-        }
-        var dev = _collectDeviceHostService.CollectDeviceCores.FirstOrDefault(it => it.Device.Id == tag.DeviceId);
-        if (dev == null) return new OperResult("系统错误，不存在对应采集设备，请稍候重试");
-        if (dev.Device.DeviceStatus == DeviceStatusEnum.OffLine) return new OperResult("设备已离线");
-        if (dev.Device.DeviceStatus == DeviceStatusEnum.Pause) return new OperResult("设备已暂停");
-        if (string.IsNullOrEmpty(tag.OtherMethod))
-        {
-            //写入变量
-            JToken tagValue;
-            try
-            {
-                tagValue = JToken.Parse(item.Value);
-            }
-            catch (Exception)
-            {
-                tagValue = JToken.Parse("\"" + item.Value + "\"");
-            }
 
-            data = await dev.InVokeWriteAsync(tag, tagValue, token);
-            _logQueues.Enqueue(
-                new RpcLog()
+            OperResult data = new();
+            var tag = _globalDeviceData.AllVariables.FirstOrDefault(it => it.Name == item.Key);
+            if (tag == null)
+                results.Add(item.Key, new("不存在变量:" + item.Key));
+            if (tag.ProtectTypeEnum == ProtectTypeEnum.ReadOnly)
+                results.Add(item.Key, new("只读变量:" + item.Key));
+            if (!tag.RpcWriteEnable && !isBlazor)
+                results.Add(item.Key, new("不允许远程写入:" + item.Key));
+
+            if (tag.IsMemoryVariable == true)
+            {
+                results.Add(item.Key, tag.SetValue(item.Value));
+            }
+            var dev = _collectDeviceHostService.CollectDeviceCores.FirstOrDefault(it => it.Device.Id == tag.DeviceId);
+            if (dev == null)
+                results.Add(item.Key, new OperResult("系统错误，不存在对应采集设备，请稍候重试"));
+            if (dev.Device.DeviceStatus == DeviceStatusEnum.OffLine)
+                results.Add(item.Key, new OperResult("设备已离线"));
+            if (dev.Device.DeviceStatus == DeviceStatusEnum.Pause)
+                results.Add(item.Key, new OperResult("设备已暂停"));
+
+            if (!results.ContainsKey(item.Key))
+            {
+                if (string.IsNullOrEmpty(tag.OtherMethod))
                 {
-                    LogTime = SysDateTimeExtensions.CurrentDateTime,
-                    OperateMessage = data.Exception,
-                    IsSuccess = data.IsSuccess,
-                    OperateMethod = WriteVariable,
-                    OperateObject = tag.Name,
-                    OperateSource = sourceDes,
-                    ParamJson = item.Value,
-                    ResultJson = data.Message
+                    //写入变量
+                    JToken tagValue;
+                    try
+                    {
+                        tagValue = JToken.Parse(item.Value);
+                    }
+                    catch (Exception)
+                    {
+                        tagValue = JToken.Parse("\"" + item.Value + "\"");
+                    }
+                    if (WriteVariables.ContainsKey(dev))
+                    {
+
+                        WriteVariables[dev].Add(tag, tagValue);
+
+                    }
+                    else
+                    {
+                        WriteVariables.Add(dev, new());
+                        WriteVariables[dev].Add(tag, tagValue);
+                    }
+                }
+                else
+                {
+                    if (WriteMethods.ContainsKey(dev))
+                    {
+
+                        WriteMethods[dev].Add(tag, item.Value);
+
+                    }
+                    else
+                    {
+                        WriteVariables.Add(dev, new());
+                        WriteVariables[dev].Add(tag, item.Value);
+                    }
                 }
-                );
-            if (!data.IsSuccess)
-            {
-                _logger.LogWarning($"写入变量[{tag.Name}]失败：{data.Message}");
             }
         }
-        else
+
+        foreach (var item in WriteVariables)
         {
-            //执行变量附带的方法
-            var method = dev.DeviceVariableMethodSources.FirstOrDefault(it => it.DeviceVariable == tag);
             try
             {
-                data = await dev.InvokeMethodAsync(method, false, item.Value, token);
+                var result = await item.Key.InVokeWriteAsync(item.Value, token);
+                foreach (var resultItem in result)
+                {
+                    string operObj;
+                    string parJson;
+                    if (resultItem.Key.IsNullOrEmpty())
+                    {
+                        operObj = items.Select(x => x.Key).ToJsonString();
+                        parJson = items.Select(x => x.Value).ToJsonString();
+                    }
+                    else
+                    {
+                        operObj = resultItem.Key;
+                        parJson = items[resultItem.Key];
+
+                    }
+                    _logQueues.Enqueue(
+          new RpcLog()
+          {
+              LogTime = SysDateTimeExtensions.CurrentDateTime,
+              OperateMessage = resultItem.Value.Exception,
+              IsSuccess = resultItem.Value.IsSuccess,
+              OperateMethod = WriteVariable,
+              OperateObject = operObj,
+              OperateSource = sourceDes,
+              ParamJson = parJson,
+              ResultJson = resultItem.Value.Message
+          }
+          );
+                    if (!resultItem.Value.IsSuccess)
+                    {
+                        _logger.LogWarning($"写入变量[{resultItem.Key}]失败：{resultItem.Value.Message}");
+                    }
+                }
+
+                results.AddRange(result);
             }
             catch (Exception ex)
             {
-                data = new OperResult<string>(ex);
-            }
-            _logQueues.Enqueue(
-new RpcLog()
-{
-    LogTime = SysDateTimeExtensions.CurrentDateTime,
-    OperateMessage = data.Exception,
-    IsSuccess = data.IsSuccess,
-    OperateMethod = tag.OtherMethod,
-    OperateObject = tag.Name,
-    OperateSource = sourceDes,
-    ParamJson = item.Value?.ToString(),
-    ResultJson = data.Message
-}
-);
-            if (!data.IsSuccess)
-            {
-                _logger.LogWarning($"执行变量[{tag.Name}]方法[{tag.OtherMethod}]失败：{data.Message}");
+                _logger.LogWarning($"写入变量异常：{ex.Message + Environment.NewLine + ex.StackTrace}");
             }
         }
-        return data;
+        foreach (var item in WriteMethods)
+        {
+            foreach (var writeMethod in item.Value)
+            {
+
+                //执行变量附带的方法
+                var method = item.Key.DeviceVariableMethodSources.FirstOrDefault(it => it.DeviceVariable == writeMethod.Key);
+                OperResult<string> result;
+                try
+                {
+                    result = await item.Key.InvokeMethodAsync(method, false, writeMethod.Value, token);
+                    results.Add(writeMethod.Key.Name, result);
+                }
+                catch (Exception ex)
+                {
+                    result = new OperResult<string>(ex);
+                    results.Add(writeMethod.Key.Name, result);
+                }
+                _logQueues.Enqueue(
+    new RpcLog()
+    {
+        LogTime = SysDateTimeExtensions.CurrentDateTime,
+        OperateMessage = result.Exception,
+        IsSuccess = result.IsSuccess,
+        OperateMethod = writeMethod.Key.OtherMethod,
+        OperateObject = writeMethod.Key.Name,
+        OperateSource = sourceDes,
+        ParamJson = writeMethod.Value?.ToString(),
+        ResultJson = result.Message
     }
+    );
+                if (!result.IsSuccess)
+                {
+                    _logger.LogWarning($"执行变量[{writeMethod.Key.Name}]方法[{writeMethod.Key.OtherMethod}]失败：{result.Message}");
+                }
+
+
+            }
+
+        }
+        return results;
+    }
+
+
 
     private async Task RpcLogInsertAsync()
     {

framework/ThingsGateway.Application/SeedData/Json/driver_plugin.json

@@ -319,6 +319,39 @@
       "UpdateUserId": null,
       "SortCode": 0,
       "ExtJson": null
+    },
+
+    {
+      "Id": 442505,
+      "FileName": "ThingsGateway.DLT645",
+      "AssembleName": "DLT645_2007",
+      "DriverTypeEnum": "Collect",
+      "FilePath": "Plugins/ThingsGateway.DLT645/ThingsGateway.DLT645.dll",
+      "CreateTime": "2023/8/6 18:22:33",
+      "CreateUser": "superAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": 0,
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 442506,
+      "FileName": "ThingsGateway.DLT645",
+      "AssembleName": "DLT645_2007OverTcp",
+      "DriverTypeEnum": "Collect",
+      "FilePath": "Plugins/ThingsGateway.DLT645/ThingsGateway.DLT645.dll",
+      "CreateTime": "2023/8/6 18:22:33",
+      "CreateUser": "superAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": 0,
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
     }
   ]
 }

framework/ThingsGateway.Application/ThingsGateway.Application.csproj

@@ -37,7 +37,7 @@
 		<PackageReference Include="Hardware.Info" Version="11.1.1.1" />
 		<PackageReference Include="CS-Script" Version="4.8.1" />
 		<!--CS-Script与Furion冲突，直接安装覆盖版本-->
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
 	</ItemGroup>
 
 	<ItemGroup>

framework/ThingsGateway.Application/ThingsGateway.Application.xml

@@ -1601,12 +1601,13 @@
             最近一次值
             </summary>
         </member>
-        <member name="M:ThingsGateway.Application.DeviceVariableRunTime.SetValue(System.Object,System.DateTime)">
+        <member name="M:ThingsGateway.Application.DeviceVariableRunTime.SetValue(System.Object,System.DateTime,System.Boolean)">
             <summary>
             设置变量值与时间，设置为null时只更改质量戳状态
             </summary>
             <param name="value"></param>
             <param name="dateTime"></param>
+            <param name="isOnline"></param>
         </member>
         <member name="P:ThingsGateway.Application.DeviceVariableRunTime.ChangeTime">
             <summary>
@@ -1855,6 +1856,11 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="P:ThingsGateway.Application.CollectBase.PLC">
+            <summary>
+            一般底层驱动，也有可能为null
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Application.CollectBase.ThingsGatewayBitConverter">
             <summary>
             数据转换器
@@ -1906,9 +1912,9 @@
             采集驱动读取
             </summary>
         </member>
-        <member name="M:ThingsGateway.Application.CollectBase.WriteValueAsync(ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
+        <member name="M:ThingsGateway.Application.CollectBase.WriteValuesAsync(System.Collections.Generic.Dictionary{ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken},System.Threading.CancellationToken)">
             <summary>
-            写入变量值
+            批量写入变量值,需返回变量名称/结果
             </summary>
             <returns></returns>
         </member>
@@ -2242,12 +2248,12 @@
         <member name="M:ThingsGateway.Application.RpcSingletonService.#ctor(Microsoft.Extensions.Logging.ILogger{ThingsGateway.Application.RpcSingletonService})">
             <inheritdoc cref="T:ThingsGateway.Application.RpcSingletonService"/>
         </member>
-        <member name="M:ThingsGateway.Application.RpcSingletonService.InvokeDeviceMethodAsync(System.String,System.Collections.Generic.KeyValuePair{System.String,System.String},System.Boolean,System.Threading.CancellationToken)">
+        <member name="M:ThingsGateway.Application.RpcSingletonService.InvokeDeviceMethodAsync(System.String,System.Collections.Generic.Dictionary{System.String,System.String},System.Boolean,System.Threading.CancellationToken)">
             <summary>
             反向RPC入口方法
             </summary>
             <param name="sourceDes">触发该方法的源说明</param>
-            <param name="item">指定键为变量名称，值为附带方法参数或写入值</param>
+            <param name="items">指定键为变量名称，值为附带方法参数或写入值</param>
             <param name="isBlazor">如果是true，不检查<see cref="P:ThingsGateway.Application.MemoryVariable.RpcWriteEnable"/>字段</param>
             <param name="token"><see cref="T:System.Threading.CancellationToken"/> 取消源</param>
             <returns></returns>
@@ -3505,7 +3511,7 @@
             执行特殊方法
             </summary>
         </member>
-        <member name="M:ThingsGateway.Application.CollectDeviceCore.InVokeWriteAsync(ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
+        <member name="M:ThingsGateway.Application.CollectDeviceCore.InVokeWriteAsync(System.Collections.Generic.Dictionary{ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken},System.Threading.CancellationToken)">
             <summary>
             执行变量写入
             </summary>

framework/ThingsGateway.Application/Workers/Alarm/AlarmWorker.cs

@@ -595,7 +595,7 @@ public class AlarmWorker : BackgroundService
                             var cacheData = await CacheDb.GetCacheData();
                             if (cacheData.Count > 0)
                             {
-                                var data = cacheData.SelectMany(a => a.CacheStr.FromJson<List<HistoryAlarm>>()).ToList();
+                                var data = cacheData.SelectMany(a => a.CacheStr.FromJsonString<List<HistoryAlarm>>()).ToList();
                                 try
                                 {
                                     var count = await sqlSugarClient.Insertable(data).ExecuteCommandAsync(stoppingToken.Token);
@@ -633,7 +633,7 @@ public class AlarmWorker : BackgroundService
                                     var cacheDatas = list.ChunkTrivialBetter(500);
                                     foreach (var a in cacheDatas)
                                     {
-                                        await CacheDb.AddCacheData("", a.ToJson(), 50000);
+                                        await CacheDb.AddCacheData("", a.ToJsonString(), 50000);
                                     }
                                 }
 

framework/ThingsGateway.Application/Workers/Collect/CollectDeviceCore.cs

@@ -393,7 +393,7 @@ public class CollectDeviceCore
                         var read = await InvokeMethodAsync(deviceVariableMethodRead, token);
                         if (read.IsSuccess)
                         {
-                            _logger?.LogTrace(_device.Name + "执行方法[" + deviceVariableMethodRead.MethodInfo.Name + "] 成功" + read.Content.ToJson());
+                            _logger?.LogTrace(_device.Name + "执行方法[" + deviceVariableMethodRead.MethodInfo.Name + "] 成功" + read.Content.ToJsonString());
                             deviceMethodsVariableSuccessNum += 1;
                         }
                         else
@@ -433,11 +433,11 @@ public class CollectDeviceCore
                 if (_driver.IsConnected())
                 {
                     //更新设备活动时间
-                    Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime, 0);
+                    Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime, errorCount: 0);
                 }
                 else
                 {
-                    Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime, 999);
+                    Device.SetDeviceStatus(errorCount: 999);
                 }
             }
 
@@ -677,9 +677,9 @@ public class CollectDeviceCore
                     }
                     else
                     {
-                        if (isRead)
+                        if (isRead&& !result.IsSuccess)
                         {
-                            var operResult = deviceVariableMethodSource.DeviceVariable.SetValue(null);
+                            var operResult = deviceVariableMethodSource.DeviceVariable.SetValue(null,isOnline: false);
                             if (!operResult.IsSuccess)
                             {
                                 _logger?.LogWarning(operResult.Message, ToString());
@@ -712,46 +712,46 @@ public class CollectDeviceCore
     /// 执行变量写入
     /// </summary>
     /// <returns></returns>
-    internal async Task<OperResult> InVokeWriteAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token)
+    internal async Task<Dictionary<string, OperResult>> InVokeWriteAsync(Dictionary<DeviceVariableRunTime, JToken> writeInfoLists, CancellationToken token)
     {
         try
         {
             await easyLock.WaitAsync();
             if (IsShareChannel) _driver.InitDataAdapter();
+            Dictionary<string, OperResult> results = new();
+            foreach (var deviceVariable in writeInfoLists.Keys)
+            {
+                if (!string.IsNullOrEmpty(deviceVariable.WriteExpressions))
+                {
+                    var jToken = writeInfoLists[deviceVariable];
+                    object rawdata;
+                    if (jToken is JValue jValue)
+                    {
+                        rawdata = jValue.Value;
+                    }
+                    else
+                    {
+                        rawdata = jToken.ToString();
+                    }
+                    object data;
+                    try
+                    {
+                        data = deviceVariable.WriteExpressions.GetExpressionsResult(rawdata);
+                        writeInfoLists[deviceVariable] = JToken.FromObject(data);
+                    }
+                    catch (Exception ex)
+                    {
+                        results.Add(deviceVariable.Name, new OperResult(deviceVariable.Name + " 转换写入表达式失败：" + ex.Message));
+                    }
+                }
 
-            if (!string.IsNullOrEmpty(deviceVariable.WriteExpressions))
-            {
-                var jToken = value;
-                object rawdata;
-                if (jToken is JValue jValue)
-                {
-                    rawdata = jValue.Value;
-                }
-                else
-                {
-                    rawdata = jToken.ToString();
-                }
-                object data;
-                try
-                {
-                    data = deviceVariable.WriteExpressions.GetExpressionsResult(rawdata);
-                    var result = await _driver.WriteValueAsync(deviceVariable, JToken.FromObject(data), token);
-                    return result;
-                }
-                catch (Exception ex)
-                {
-                    return new OperResult(deviceVariable.Name + " 转换写入表达式失败：" + ex.Message);
-                }
             }
-            else
-            {
-                var result = await _driver.WriteValueAsync(deviceVariable, value, token);
-                return result;
-            }
-        }
-        catch (Exception ex)
-        {
-            return (new OperResult(ex));
+            var result = await _driver.WriteValuesAsync(writeInfoLists.
+                Where(a => !results.Any(b => b.Key == a.Key.Name)).
+               ToDictionary(item => item.Key, item => item.Value),
+                token);
+
+            return result;
         }
         finally
         {
@@ -759,6 +759,8 @@ public class CollectDeviceCore
         }
     }
 
+
+
     /// <summary>
     /// 执行轮询特殊方法,并设置变量值
     /// </summary>

framework/ThingsGateway.Application/Workers/HistoryValue/HistoryValueWorker.cs

@@ -224,7 +224,7 @@ public class HistoryValueWorker : BackgroundService
 
                             //缓存值
                             var cacheData = await CacheDb.GetCacheData();
-                            var data = cacheData.SelectMany(a => a.CacheStr.FromJson<List<HistoryValue>>()).ToList();
+                            var data = cacheData.SelectMany(a => a.CacheStr.FromJsonString<List<HistoryValue>>()).ToList();
                             try
                             {
                                 var count = await sqlSugarClient.Insertable(data).ExecuteCommandAsync(stoppingToken.Token);
@@ -257,7 +257,7 @@ public class HistoryValueWorker : BackgroundService
                                     var cacheDatas = collecthis.ChunkTrivialBetter(500);
                                     foreach (var a in cacheDatas)
                                     {
-                                        await CacheDb.AddCacheData("", a.ToJson(), 50000);
+                                        await CacheDb.AddCacheData("", a.ToJsonString(), 50000);
                                     }
                                 }
                             }
@@ -284,7 +284,7 @@ public class HistoryValueWorker : BackgroundService
                                     var cacheDatas = changehis.ChunkTrivialBetter(500);
                                     foreach (var a in cacheDatas)
                                     {
-                                        await CacheDb.AddCacheData("", a.ToJson(), 50000);
+                                        await CacheDb.AddCacheData("", a.ToJsonString(), 50000);
                                     }
                                 }
                             }

framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor

@@ -33,7 +33,7 @@
             <TcpClientPage @ref=TcpClientPage></TcpClientPage>
             break;
         case ChannelEnum.SerialPort:
-            <SerialClientPage @ref=SerialClientPage></SerialClientPage>
+            <SerialSessionPage @ref=SerialSessionPage></SerialSessionPage>
             break;
         case ChannelEnum.UdpSession:
             <UdpSessionPage @ref=UdpSessionPage></UdpSessionPage>

framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor.cs

@@ -38,9 +38,9 @@ public enum ChannelEnum
 public partial class DefalutDebugDriverPage : DriverDebugUIBase
 {
     /// <summary>
-    /// SerialClientPage
+    /// SerialSessionPage
     /// </summary>
-    public SerialClientPage SerialClientPage;
+    public SerialSessionPage SerialSessionPage;
     /// <summary>
     /// TcpClientPage
     /// </summary>
@@ -79,7 +79,7 @@ public partial class DefalutDebugDriverPage : DriverDebugUIBase
     {
         Plc?.SafeDispose();
         TcpClientPage?.SafeDispose();
-        SerialClientPage?.SafeDispose();
+        SerialSessionPage?.SafeDispose();
         TcpServerPage?.SafeDispose();
         UdpSessionPage?.SafeDispose();
         base.Dispose();
@@ -94,8 +94,8 @@ public partial class DefalutDebugDriverPage : DriverDebugUIBase
         {
             if (TcpClientPage != null)
                 TcpClientPage.LogAction = LogOut;
-            if (SerialClientPage != null)
-                SerialClientPage.LogAction = LogOut;
+            if (SerialSessionPage != null)
+                SerialSessionPage.LogAction = LogOut;
             if (TcpServerPage != null)
                 TcpServerPage.LogAction = LogOut;
             if (UdpSessionPage != null)

framework/ThingsGateway.Blazor/DebugPage/SerialSessionPage.razor.cs

@@ -17,7 +17,7 @@ using TouchSocket.Core;
 namespace ThingsGateway.Blazor;
 
 /// <inheritdoc/>
-public partial class SerialClientPage
+public partial class SerialSessionPage
 {
     /// <summary>
     /// 日志输出
@@ -28,18 +28,18 @@ public partial class SerialClientPage
 
     private readonly SerialProperty serialProperty = new();
 
-    private SerialClient SerialClient { get; set; } = new();
+    private SerialsSession SerialsSession { get; set; } = new();
 
     /// <inheritdoc/>
     public void Dispose()
     {
-        SerialClient.SafeDispose();
+        SerialsSession.SafeDispose();
     }
     /// <summary>
     /// 获取对象
     /// </summary>
     /// <returns></returns>
-    public SerialClient GetSerialClient()
+    public SerialsSession GetSerialSession()
     {
         config?.Dispose();
         config = new TouchSocketConfig();
@@ -48,15 +48,15 @@ public partial class SerialClientPage
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
         config.SetSerialProperty(serialProperty);
         //载入配置
-        SerialClient.Setup(config);
-        return SerialClient;
+        SerialsSession.Setup(config);
+        return SerialsSession;
     }
     private async Task ConnectAsync()
     {
         try
         {
-            SerialClient.Close();
-            await GetSerialClient().ConnectAsync();
+            SerialsSession.Close();
+            await GetSerialSession().ConnectAsync();
         }
         catch (Exception ex)
         {
@@ -68,7 +68,7 @@ public partial class SerialClientPage
     {
         try
         {
-            SerialClient.Close();
+            SerialsSession.Close();
         }
         catch (Exception ex)
         {
@@ -82,8 +82,8 @@ public partial class SerialClientPage
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-        SerialClient = new SerialClient();
-        SerialClient.Setup(config);
+        SerialsSession = new SerialsSession();
+        SerialsSession.Setup(config);
         base.OnInitialized();
     }
 

framework/ThingsGateway.Blazor/Page/DeviceVariableRunTimePage.razor.cs

@@ -149,10 +149,18 @@ public partial class DeviceVariableRunTimePage
     private EventCallback<string> WriteValueAsync;
     private async Task OnWriteValueAsync(DeviceVariableRunTime tag, string value)
     {
-        var data = await RpcCore?.InvokeDeviceMethodAsync($"BLAZOR-{UserResoures.CurrentUser.Account}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}", new KeyValuePair<string, string>(tag.Name, value), true);
-        if (!data.IsSuccess)
+        var data = await RpcCore?.InvokeDeviceMethodAsync($"BLAZOR-{UserResoures.CurrentUser.Account}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}",
+
+            new Dictionary<string, string>()
+            {
+
+                { tag.Name, value}
+            }
+
+            , true);
+        if (data.Count > 0 && !data.FirstOrDefault().Value.IsSuccess)
         {
-            throw new(data.Message);
+            throw new(data.FirstOrDefault().Value.Message);
         }
     }
     private async Task WriteAsync(DeviceVariableRunTime collectVariableRunTime)

framework/ThingsGateway.Blazor/ThingsGateway.Blazor.xml

@@ -67,9 +67,9 @@
         <member name="T:ThingsGateway.Blazor.DefalutDebugDriverPage">
             <inheritdoc/>
         </member>
-        <member name="F:ThingsGateway.Blazor.DefalutDebugDriverPage.SerialClientPage">
+        <member name="F:ThingsGateway.Blazor.DefalutDebugDriverPage.SerialSessionPage">
             <summary>
-            SerialClientPage
+            SerialSessionPage
             </summary>
         </member>
         <member name="F:ThingsGateway.Blazor.DefalutDebugDriverPage.TcpClientPage">
@@ -116,24 +116,24 @@
             </summary>
             <param name="firstRender"></param>
         </member>
-        <member name="T:ThingsGateway.Blazor.SerialClientPage">
+        <member name="T:ThingsGateway.Blazor.SerialSessionPage">
             <inheritdoc/>
         </member>
-        <member name="F:ThingsGateway.Blazor.SerialClientPage.LogAction">
+        <member name="F:ThingsGateway.Blazor.SerialSessionPage.LogAction">
             <summary>
             日志输出
             </summary>
         </member>
-        <member name="M:ThingsGateway.Blazor.SerialClientPage.Dispose">
+        <member name="M:ThingsGateway.Blazor.SerialSessionPage.Dispose">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Blazor.SerialClientPage.GetSerialClient">
+        <member name="M:ThingsGateway.Blazor.SerialSessionPage.GetSerialSession">
             <summary>
             获取对象
             </summary>
             <returns></returns>
         </member>
-        <member name="M:ThingsGateway.Blazor.SerialClientPage.OnInitialized">
+        <member name="M:ThingsGateway.Blazor.SerialSessionPage.OnInitialized">
             <inheritdoc/>
         </member>
         <member name="T:ThingsGateway.Blazor.TcpClientPage">

framework/ThingsGateway.Foundation/BaseReadWrite/ReadWriteDevicesSerialBase.cs

@@ -22,47 +22,47 @@ public abstract class ReadWriteDevicesSerialBase : ReadWriteDevicesClientBase
     /// <summary>
     /// WaitingClientEx
     /// </summary>
-    public virtual IWaitingClient<SerialClient> WaitingClientEx { get; }
+    public virtual IWaitingClient<SerialsSession> WaitingClientEx { get; }
     /// <summary>
     /// <inheritdoc cref="ReadWriteDevicesSerialBase"/>
     /// </summary>
-    /// <param name="serialClient"></param>
-    public ReadWriteDevicesSerialBase(SerialClient serialClient)
+    /// <param name="serialSession"></param>
+    public ReadWriteDevicesSerialBase(SerialsSession serialSession)
     {
-        SerialClient = serialClient;
-        WaitingClientEx = SerialClient.GetWaitingClientEx(new() { BreakTrigger = true });
+        SerialsSession = serialSession;
+        WaitingClientEx = SerialsSession.GetWaitingClientEx(new() { BreakTrigger = true });
 
-        SerialClient.Connecting -= Connecting;
-        SerialClient.Connected -= Connected;
-        SerialClient.Disconnecting -= Disconnecting;
-        SerialClient.Disconnected -= Disconnected;
-        SerialClient.Connecting += Connecting;
-        SerialClient.Connected += Connected;
-        SerialClient.Disconnecting += Disconnecting;
-        SerialClient.Disconnected += Disconnected;
-        Logger = SerialClient.Logger;
+        SerialsSession.Connecting -= Connecting;
+        SerialsSession.Connected -= Connected;
+        SerialsSession.Disconnecting -= Disconnecting;
+        SerialsSession.Disconnected -= Disconnected;
+        SerialsSession.Connecting += Connecting;
+        SerialsSession.Connected += Connected;
+        SerialsSession.Disconnecting += Disconnecting;
+        SerialsSession.Disconnected += Disconnected;
+        Logger = SerialsSession.Logger;
     }
     /// <summary>
     /// 串口管理对象
     /// </summary>
-    public SerialClient SerialClient { get; }
+    public SerialsSession SerialsSession { get; }
 
     /// <inheritdoc/>
     public override void Connect(CancellationToken token)
     {
-        SerialClient.Connect();
+        SerialsSession.Connect();
     }
 
     /// <inheritdoc/>
     public override Task ConnectAsync(CancellationToken token)
     {
-        return SerialClient.ConnectAsync();
+        return SerialsSession.ConnectAsync();
     }
 
     /// <inheritdoc/>
     public override void Disconnect()
     {
-        SerialClient.Close();
+        SerialsSession.Close();
     }
 
     /// <inheritdoc/>
@@ -71,7 +71,7 @@ public abstract class ReadWriteDevicesSerialBase : ReadWriteDevicesClientBase
         try
         {
             waitingOptions ??= new WaitingOptions { ThrowBreakException = true, AdapterFilter = AdapterFilter.NoneAll };
-            ResponsedData result = SerialClient.GetWaitingClientEx(waitingOptions).SendThenResponse(data, TimeOut, token);
+            ResponsedData result = SerialsSession.GetWaitingClientEx(waitingOptions).SendThenResponse(data, TimeOut, token);
             return OperResult.CreateSuccessResult(result.Data);
         }
         catch (Exception ex)
@@ -86,7 +86,7 @@ public abstract class ReadWriteDevicesSerialBase : ReadWriteDevicesClientBase
         try
         {
             waitingOptions ??= new WaitingOptions { ThrowBreakException = true, AdapterFilter = AdapterFilter.NoneAll };
-            ResponsedData result = await SerialClient.GetWaitingClientEx(waitingOptions).SendThenResponseAsync(data, TimeOut, token);
+            ResponsedData result = await SerialsSession.GetWaitingClientEx(waitingOptions).SendThenResponseAsync(data, TimeOut, token);
             return OperResult.CreateSuccessResult(result.Data);
         }
         catch (Exception ex)
@@ -98,37 +98,37 @@ public abstract class ReadWriteDevicesSerialBase : ReadWriteDevicesClientBase
     /// <inheritdoc/>
     public override string ToString()
     {
-        return SerialClient.SerialProperty.ToString();
+        return SerialsSession.SerialProperty.ToString();
     }
 
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)
     {
-        SerialClient.Connecting -= Connecting;
-        SerialClient.Connected -= Connected;
-        SerialClient.Disconnecting -= Disconnecting;
-        SerialClient.Disconnected -= Disconnected;
-        SerialClient.Close();
-        SerialClient.SafeDispose();
+        SerialsSession.Connecting -= Connecting;
+        SerialsSession.Connected -= Connected;
+        SerialsSession.Disconnecting -= Disconnecting;
+        SerialsSession.Disconnected -= Disconnected;
+        SerialsSession.Close();
+        SerialsSession.SafeDispose();
         base.Dispose(disposing);
     }
-    private void Connected(ISerialClient client, ConnectedEventArgs e)
+    private void Connected(ISerialSession client, ConnectedEventArgs e)
     {
         Logger?.Debug(client.SerialProperty.ToString() + "连接成功");
     }
 
-    private void Connecting(ISerialClient client, SerialConnectingEventArgs e)
+    private void Connecting(ISerialSession client, SerialConnectingEventArgs e)
     {
         Logger?.Debug(client.SerialProperty.ToString() + "正在连接");
         SetDataAdapter();
     }
 
-    private void Disconnected(ISerialClientBase client, DisconnectEventArgs e)
+    private void Disconnected(ISerialSessionBase client, DisconnectEventArgs e)
     {
         Logger?.Debug(client.SerialProperty.ToString() + "断开连接-" + e.Message);
     }
 
-    private void Disconnecting(ISerialClientBase client, DisconnectEventArgs e)
+    private void Disconnecting(ISerialSessionBase client, DisconnectEventArgs e)
     {
         Logger?.Debug(client.SerialProperty.ToString() + "正在主动断开连接-" + e.Message);
     }

framework/ThingsGateway.Foundation/Common/TcpClientEx.cs

@@ -26,8 +26,6 @@ using System.Net.Security;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
 
-using ThingsGateway.Foundation;
-
 using TouchSocket.Resources;
 
 namespace ThingsGateway.Foundation;
@@ -65,18 +63,14 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     /// </summary>
     public TcpClientBaseEx()
     {
-        this.Protocol = Protocol.TCP;
+        this.Protocol = Protocol.Tcp;
     }
 
     #region 变量
-
     private DelaySender m_delaySender;
-    private bool m_useDelaySender;
     private Stream m_workStream;
     private int m_bufferRate = 1;
     private volatile bool m_online;
-    private Socket m_mainSocket;
-
     #endregion 变量
 
     #region 事件
@@ -233,13 +227,13 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     public TouchSocketConfig Config { get; private set; }
 
     /// <inheritdoc/>
-    public TcpDataHandlingAdapter DataHandlingAdapter { get; private set; }
+    public SingleStreamDataHandlingAdapter DataHandlingAdapter { get; private set; }
 
     /// <inheritdoc/>
     public string IP { get; private set; }
 
     /// <inheritdoc/>
-    public Socket MainSocket { get => this.m_mainSocket; }
+    public Socket MainSocket { get; private set; }
 
     /// <inheritdoc/>
     public bool Online { get => this.m_online; }
@@ -269,7 +263,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     public bool IsClient => true;
 
     #endregion 属性
-
+    private EasyLock EasyLock { get; set; } = new();
     #region 断开操作
 
     /// <inheritdoc/>
@@ -277,7 +271,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     {
         try
         {
-            privateEasyLock.Wait();
+            EasyLock.Wait();
             if (this.m_online)
             {
                 this.PrivateOnDisconnecting(new DisconnectEventArgs(true, msg));
@@ -294,7 +288,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
         }
         finally
         {
-            privateEasyLock.Release();
+            EasyLock.Release();
         }
     }
 
@@ -302,7 +296,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     {
         try
         {
-            privateEasyLock.Wait();
+            EasyLock.Wait();
             if (this.m_online)
             {
                 this.m_online = false;
@@ -315,7 +309,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
         }
         finally
         {
-            privateEasyLock.Release();
+            EasyLock.Release();
         }
     }
 
@@ -330,7 +324,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
             try
             {
 
-                privateEasyLock.Wait();
+                EasyLock.Wait();
                 if (this.m_online)
                 {
                     this.m_online = false;
@@ -347,10 +341,10 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
             }
             finally
             {
-                privateEasyLock.Release();
+                EasyLock.Release();
             }
         }
-        privateEasyLock.SafeDispose();
+        EasyLock.SafeDispose();
 
         base.Dispose(disposing);
     }
@@ -358,7 +352,6 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     #endregion 断开操作
 
     #region Connect
-    private EasyLock privateEasyLock { get; set; } = new();
     /// <summary>
     /// 建立Tcp的连接。
     /// </summary>
@@ -371,7 +364,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     {
         try
         {
-            privateEasyLock.Wait();
+            EasyLock.Wait();
             if (this.m_online)
             {
                 return;
@@ -382,13 +375,12 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
             }
             if (this.Config == null)
             {
-                throw new ArgumentNullException("配置文件不能为空。");
+                throw new ArgumentNullException(nameof(this.Config), "配置文件不能为空。");
             }
-            var iPHost = this.Config.GetValue(TouchSocketConfigExtension.RemoteIPHostProperty) ?? throw new ArgumentNullException("iPHost不能为空。");
+            var iPHost = this.Config.GetValue(TouchSocketConfigExtension.RemoteIPHostProperty) ?? throw new ArgumentNullException(nameof(IPHost), "iPHost不能为空。");
             this.MainSocket.SafeDispose();
             var socket = this.CreateSocket(iPHost);
-            var args = new ConnectingEventArgs(this.MainSocket);
-            this.PrivateOnConnecting(args);
+            this.PrivateOnConnecting(new ConnectingEventArgs(socket));
             if (timeout == 5000)
             {
                 socket.Connect(iPHost.Host, iPHost.Port);
@@ -406,15 +398,6 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
                     throw new TimeoutException();
                 }
             }
-            if (this.Config.GetValue(TouchSocketConfigExtension.DelaySenderProperty) is DelaySenderOption senderOption)
-            {
-                this.m_useDelaySender = true;
-                this.m_delaySender.SafeDispose();
-                this.m_delaySender = new DelaySender(this.MainSocket, senderOption.QueueLength, this.OnDelaySenderError)
-                {
-                    DelayLength = senderOption.DelayLength
-                };
-            }
             this.m_online = true;
             this.SetSocket(socket);
             this.BeginReceive();
@@ -422,24 +405,24 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
         }
         finally
         {
-            privateEasyLock.Release();
+            EasyLock.Release();
         }
     }
 
     /// <summary>
     /// 建立Tcp的连接。
     /// </summary>
-    /// <param name="timeOut"></param>
+    /// <param name="timeout"></param>
     /// <param name="token"></param>
     /// <exception cref="ObjectDisposedException"></exception>
     /// <exception cref="ArgumentNullException"></exception>
     /// <exception cref="Exception"></exception>
     /// <exception cref="TimeoutException"></exception>
-    public async Task TcpConnectAsync(int timeOut, CancellationToken token = default)
+    public async Task TcpConnectAsync(int timeout, CancellationToken token = default)
     {
         try
         {
-            await privateEasyLock.WaitAsync();
+            await EasyLock.WaitAsync();
             if (this.m_online)
             {
                 return;
@@ -459,7 +442,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
             this.PrivateOnConnecting(args);
 
 #if (NET6_0_OR_GREATER)
-            using CancellationTokenSource cancellationTokenSource = new(timeOut);
+            using CancellationTokenSource cancellationTokenSource = new(timeout);
             using CancellationTokenSource stoppingToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationTokenSource.Token, token);
             try
             {
@@ -477,7 +460,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
             using CancellationTokenSource cancellationTokenSource = new();
             using CancellationTokenSource stoppingToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationTokenSource.Token, token);
             var task = Task.Factory.FromAsync(socket.BeginConnect(iPHost.EndPoint, null, null), socket.EndConnect);
-            var result = await Task.WhenAny(task, Task.Delay(timeOut, stoppingToken.Token));
+            var result = await Task.WhenAny(task, Task.Delay(timeout, stoppingToken.Token));
             if (result == task)
             {
                 cancellationTokenSource.Cancel();
@@ -502,20 +485,11 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
         }
         finally
         {
-            privateEasyLock.Release();
+            EasyLock.Release();
         }
 
         void success(Socket socket)
         {
-            if (this.Config.GetValue(TouchSocketConfigExtension.DelaySenderProperty) is DelaySenderOption senderOption)
-            {
-                this.m_useDelaySender = true;
-                this.m_delaySender.SafeDispose();
-                this.m_delaySender = new DelaySender(this.MainSocket, senderOption.QueueLength, this.OnDelaySenderError)
-                {
-                    DelayLength = senderOption.DelayLength
-                };
-            }
             this.m_online = true;
             this.SetSocket(socket);
             this.BeginReceive();
@@ -523,20 +497,19 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
         }
     }
 
-
     /// <inheritdoc/>
     public virtual ITcpClient Connect(int timeout = 5000)
     {
         this.TcpConnect(timeout);
         return this;
     }
+
     /// <inheritdoc/>
-    public virtual async Task<ITcpClient> ConnectAsync(int timeOut = 5000)
+    public async Task<ITcpClient> ConnectAsync(int timeout = 5000)
     {
-        await TcpConnectAsync(timeOut);
+        await TcpConnectAsync(timeout);
         return this;
     }
-
     #endregion
 
     /// <inheritdoc/>
@@ -548,7 +521,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     }
 
     /// <inheritdoc/>
-    public virtual void SetDataHandlingAdapter(TcpDataHandlingAdapter adapter)
+    public virtual void SetDataHandlingAdapter(SingleStreamDataHandlingAdapter adapter)
     {
         if (!this.CanSetDataHandlingAdapter)
         {
@@ -703,7 +676,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
     /// 设置适配器，该方法不会检验<see cref="CanSetDataHandlingAdapter"/>的值。
     /// </summary>
     /// <param name="adapter"></param>
-    protected void SetAdapter(TcpDataHandlingAdapter adapter)
+    protected void SetAdapter(SingleStreamDataHandlingAdapter adapter)
     {
         this.ThrowIfDisposed();
         if (adapter is null)
@@ -749,7 +722,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
         }
         else
         {
-            if (this.ReceiveType == ReceiveType.Auto)
+            if (this.ReceiveType == ReceiveType.Iocp)
             {
                 var eventArgs = new SocketAsyncEventArgs();
                 eventArgs.Completed += this.EventArgs_Completed;
@@ -762,6 +735,39 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
                     this.ProcessReceived(eventArgs);
                 }
             }
+            else if (this.ReceiveType == ReceiveType.Bio)
+            {
+                new Thread(BeginBio)
+                {
+                    IsBackground = true
+                }
+                .Start();
+            }
+        }
+    }
+
+    private void BeginBio()
+    {
+        while (true)
+        {
+            var byteBlock = new ByteBlock(this.BufferLength);
+            try
+            {
+                var r = this.MainSocket.Receive(byteBlock.Buffer);
+                if (r == 0)
+                {
+                    this.BreakOut("远程终端主动关闭");
+                    return;
+                }
+
+                byteBlock.SetLength(r);
+                this.HandleBuffer(byteBlock);
+            }
+            catch (Exception ex)
+            {
+                this.BreakOut(ex.Message);
+                return;
+            }
         }
     }
 
@@ -802,32 +808,46 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
 
     private Socket CreateSocket(IPHost iPHost)
     {
-        var socket = new Socket(iPHost.EndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp)
+        Socket socket;
+        if (iPHost.HostNameType == UriHostNameType.Dns)
+        {
+            socket = new Socket(SocketType.Stream, ProtocolType.Tcp)
+            {
+                ReceiveBufferSize = this.BufferLength,
+                SendBufferSize = this.BufferLength,
+                SendTimeout = this.Config.GetValue(TouchSocketConfigExtension.SendTimeoutProperty)
+            };
+        }
+        else
+        {
+            socket = new Socket(iPHost.EndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp)
+            {
+                ReceiveBufferSize = this.BufferLength,
+                SendBufferSize = this.BufferLength,
+                SendTimeout = this.Config.GetValue(TouchSocketConfigExtension.SendTimeoutProperty)
+            };
+        }
+        if (this.Config.GetValue(TouchSocketConfigExtension.KeepAliveValueProperty) is KeepAliveValue keepAliveValue)
         {
-            ReceiveBufferSize = this.BufferLength,
-            SendBufferSize = this.BufferLength,
-            SendTimeout = this.Config.GetValue(TouchSocketConfigExtension.SendTimeoutProperty)
-        };
-
 #if NET45_OR_GREATER
-        var keepAliveValue = this.Config.GetValue(TouchSocketConfigExtension.KeepAliveValueProperty);
-        if (keepAliveValue.Enable)
-        {
+
             socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
             socket.IOControl(IOControlCode.KeepAliveValues, keepAliveValue.KeepAliveTime, null);
-        }
 #else
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            var keepAliveValue = Config.GetValue(TouchSocketConfigExtension.KeepAliveValueProperty);
-            if (keepAliveValue.Enable)
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
                 socket.IOControl(IOControlCode.KeepAliveValues, keepAliveValue.KeepAliveTime, null);
             }
-        }
 #endif
-        socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, this.Config.GetValue<bool>(TouchSocketConfigExtension.NoDelayProperty));
+        }
+
+        var noDelay = this.Config.GetValue(TouchSocketConfigExtension.NoDelayProperty);
+        if (noDelay != null)
+        {
+            socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, noDelay);
+        }
+
         if (this.Config.GetValue(TouchSocketConfigExtension.BindIPHostProperty) != null)
         {
             if (this.Config.GetValue(TouchSocketConfigExtension.ReuseAddressProperty))
@@ -961,14 +981,12 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
             {
                 length += item.Count;
             }
-            using (var byteBlock = new ByteBlock(length))
+            using var byteBlock = new ByteBlock(length);
+            foreach (var item in transferBytes)
             {
-                foreach (var item in transferBytes)
-                {
-                    byteBlock.Write(item.Array, item.Offset, item.Count);
-                }
-                this.DataHandlingAdapter.SendInput(byteBlock.Buffer, 0, byteBlock.Len);
+                byteBlock.Write(item.Array, item.Offset, item.Count);
             }
+            this.DataHandlingAdapter.SendInput(byteBlock.Buffer, 0, byteBlock.Len);
         }
     }
 
@@ -1048,9 +1066,9 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
             }
             else
             {
-                if (this.m_useDelaySender && length < TouchSocketUtility.BigDataBoundary)
+                if (this.m_delaySender != null && length < m_delaySender.DelayLength)
                 {
-                    this.m_delaySender.Send(new QueueDataBytes(buffer, offset, length));
+                    this.m_delaySender.Send(QueueDataBytes.CreateNew(buffer, offset, length));
                 }
                 else
                 {
@@ -1092,7 +1110,12 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
 
         this.IP = socket.RemoteEndPoint.GetIP();
         this.Port = socket.RemoteEndPoint.GetPort();
-        this.m_mainSocket = socket;
+        this.MainSocket = socket;
+        var delaySenderOption = this.Config.GetValue(TouchSocketConfigExtension.DelaySenderProperty);
+        if (delaySenderOption != null)
+        {
+            this.m_delaySender = new DelaySender(socket, delaySenderOption, this.OnDelaySenderError);
+        }
     }
 
     private void ProcessReceived(SocketAsyncEventArgs e)

framework/ThingsGateway.Foundation/Common/WaitingClientEx.cs

@@ -70,7 +70,7 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
         this.m_breaked = true;
         this.Cancel();
     }
-    private void OnSerialClientDisconnected(ISerialClientBase client, DisconnectEventArgs e)
+    private void OnSerialSessionDisconnected(ISerialSessionBase client, DisconnectEventArgs e)
     {
         this.m_breaked = true;
         this.Cancel();
@@ -129,9 +129,9 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected += this.OnDisconnected;
             }
-            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialSessionBase serialSession)
             {
-                serialClient.Disconnected += this.OnSerialClientDisconnected;
+                serialSession.Disconnected += this.OnSerialSessionDisconnected;
             }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {
@@ -190,9 +190,9 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected -= this.OnDisconnected;
             }
-            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialSessionBase serialSession)
             {
-                serialClient.Disconnected -= this.OnSerialClientDisconnected;
+                serialSession.Disconnected -= this.OnSerialSessionDisconnected;
             }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {
@@ -232,9 +232,9 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected += this.OnDisconnected;
             }
-            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialSessionBase serialSession)
             {
-                serialClient.Disconnected += this.OnSerialClientDisconnected;
+                serialSession.Disconnected += this.OnSerialSessionDisconnected;
             }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {
@@ -293,9 +293,9 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected -= this.OnDisconnected;
             }
-            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialSessionBase serialSession)
             {
-                serialClient.Disconnected -= this.OnSerialClientDisconnected;
+                serialSession.Disconnected -= this.OnSerialSessionDisconnected;
             }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {

framework/ThingsGateway.Foundation/Extensions/StringExtensions.cs

@@ -46,19 +46,6 @@ public static class StringExtensions
     }
 
 
-    /// <summary>
-    /// 将16进制的字符转换为int32。
-    /// </summary>
-    /// <param name="hexString"></param>
-    /// <returns></returns>
-    public static int ByHexStringToInt32(this string hexString)
-    {
-        if (string.IsNullOrEmpty(hexString))
-        {
-            return default;
-        }
-        return int.Parse(hexString, System.Globalization.NumberStyles.HexNumber);
-    }
     /// <summary>
     /// <inheritdoc cref="Path.Combine(string[])"/>
     /// 并把\\转为/

framework/ThingsGateway.Foundation/Helper/ByteTransformUtil.cs

@@ -82,7 +82,7 @@ public class ByteTransformUtil
     /// </summary>
     public static IThingsGatewayBitConverter GetTransByAddress(ref string address, IThingsGatewayBitConverter defaultTransform)
     {
-        var hasCache = _cache.TryGetValue(address + defaultTransform.ToJson(), out IThingsGatewayBitConverter thingsGatewayBitConverter);
+        var hasCache = _cache.TryGetValue(address + defaultTransform.ToJsonString(), out IThingsGatewayBitConverter thingsGatewayBitConverter);
         if (hasCache)
         {
             return thingsGatewayBitConverter;
@@ -187,7 +187,7 @@ public class ByteTransformUtil
             {
                 converter.StringLength = length.Value;
             }
-            _cache.SetCache(address + defaultTransform.ToJson(), converter);
+            _cache.SetCache(address + defaultTransform.ToJsonString(), converter);
             return converter;
         }
 

framework/ThingsGateway.Foundation/SerialPort/Interface/ISerialSession.cs

@@ -13,32 +13,31 @@
 namespace ThingsGateway.Foundation.Serial;
 
 /// <summary>
-/// <inheritdoc cref="ISerialClientBase"/>
+/// <inheritdoc cref="ISerialSessionBase"/>
 /// </summary>
-public interface ISerialClient : ISerialClientBase, IClientSender, IPluginObject
+public interface ISerialSession : ISerialSessionBase, IClientSender, IPluginObject
 {
     /// <summary>
-    /// 成功连接到服务器
+    /// 成功打开串口
     /// </summary>
-    ConnectedEventHandler<ISerialClient> Connected { get; set; }
+    ConnectedEventHandler<ISerialSession> Connected { get; set; }
 
     /// <summary>
-    /// 准备连接的时候
+    /// 准备连接串口的时候
     /// </summary>
-    SerialConnectingEventHandler<ISerialClient> Connecting { get; set; }
+    SerialConnectingEventHandler<ISerialSession> Connecting { get; set; }
 
     /// <summary>
     /// 连接串口
     /// </summary>
-    /// <exception cref="TimeoutException"></exception>
     /// <exception cref="Exception"></exception>
-    ISerialClient Connect(int timeout = 5000);
+    ISerialSession Connect();
 
     /// <summary>
     /// 配置服务器
     /// </summary>
     /// <param name="config"></param>
     /// <exception cref="Exception"></exception>
-    ISerialClient Setup(TouchSocketConfig config);
+    ISerialSession Setup(TouchSocketConfig config);
 
 }

framework/ThingsGateway.Foundation/SerialPort/Interface/ISerialSessionBase.cs

@@ -17,7 +17,7 @@ namespace ThingsGateway.Foundation.Serial;
 /// <summary>
 /// 串口连接接口。
 /// </summary>
-public interface ISerialClientBase : IClient, ISender, IDefaultSender, IPluginObject, IRequsetInfoSender
+public interface ISerialSessionBase : IClient, ISender, IDefaultSender, IPluginObject, IRequsetInfoSender
 {
     /// <summary>
     /// 是否允许自由调用<see cref="SetDataHandlingAdapter"/>进行赋值。
@@ -32,24 +32,19 @@ public interface ISerialClientBase : IClient, ISender, IDefaultSender, IPluginOb
     /// <summary>
     /// 数据处理适配器
     /// </summary>
-    TcpDataHandlingAdapter DataHandlingAdapter { get; }
+    SingleStreamDataHandlingAdapter DataHandlingAdapter { get; }
 
     /// <summary>
     /// 断开连接
     /// </summary>
-    DisconnectEventHandler<ISerialClientBase> Disconnected { get; set; }
+    DisconnectEventHandler<ISerialSessionBase> Disconnected { get; set; }
 
     /// <summary>
     /// 即将断开连接(仅主动断开时有效)。
     /// <para>
     /// </para>
     /// </summary>
-    DisconnectEventHandler<ISerialClientBase> Disconnecting { get; set; }
-
-    /// <summary>
-    /// 表示是否为客户端。
-    /// </summary>
-    bool IsClient { get; }
+    DisconnectEventHandler<ISerialSessionBase> Disconnecting { get; set; }
 
     /// <summary>
     /// 主通信器
@@ -77,5 +72,5 @@ public interface ISerialClientBase : IClient, ISender, IDefaultSender, IPluginOb
     /// 设置数据处理适配器
     /// </summary>
     /// <param name="adapter"></param>
-    void SetDataHandlingAdapter(TcpDataHandlingAdapter adapter);
+    void SetDataHandlingAdapter(SingleStreamDataHandlingAdapter adapter);
 }

framework/ThingsGateway.Foundation/SerialPort/SerialPort/SerialDelaySender.cs

@@ -9,7 +9,18 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion
-
+//------------------------------------------------------------------------------
+//  此代码版权（除特别声明或在XREF结尾的命名空间的代码）归作者本人若汝棋茗所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议，若本仓库没有设置，则按MIT开源协议授权
+//  CSDN博客：https://blog.csdn.net/qq_40374647
+//  哔哩哔哩视频：https://space.bilibili.com/94253567
+//  Gitee源代码仓库：https://gitee.com/RRQM_Home
+//  Github源代码仓库：https://github.com/RRQM
+//  API首页：http://rrqm_home.gitee.io/touchsocket/
+//  交流QQ群：234762506
+//  感谢您的下载和使用
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 using System.IO.Ports;
 
 namespace ThingsGateway.Foundation.Serial;
@@ -28,18 +39,22 @@ public sealed class SerialDelaySender : DisposableObject
     /// <summary>
     /// 延迟发送器
     /// </summary>
-    public SerialDelaySender(SerialPort serialPort, int queueLength, Action<Exception> onError)
+    /// <param name="serialPort"></param>
+    /// <param name="onError"></param>
+    /// <param name="delaySenderOption"></param>
+    public SerialDelaySender(SerialPort serialPort, DelaySenderOption delaySenderOption, Action<Exception> onError)
     {
+        this.DelayLength = delaySenderOption.DelayLength;
         this.m_serial = serialPort;
         this.m_onError = onError;
-        this.m_queueDatas = new IntelligentDataQueue<QueueDataBytes>(queueLength);
+        this.m_queueDatas = new IntelligentDataQueue<QueueDataBytes>(delaySenderOption.QueueLength);
         this.m_lockSlim = new ReaderWriterLockSlim();
     }
 
     /// <summary>
-    /// 延迟包最大尺寸，默认1024*512字节。
+    /// 延迟包最大尺寸。
     /// </summary>
-    public int DelayLength { get; set; } = 1024 * 512;
+    public int DelayLength { get; private set; }
 
     /// <summary>
     /// 是否处于发送状态

framework/ThingsGateway.Foundation/SerialPort/SerialPort/SerialSession.cs

@@ -10,19 +10,31 @@
 //------------------------------------------------------------------------------
 #endregion
 
+//------------------------------------------------------------------------------
+//  此代码版权（除特别声明或在XREF结尾的命名空间的代码）归作者本人若汝棋茗所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议，若本仓库没有设置，则按MIT开源协议授权
+//  CSDN博客：https://blog.csdn.net/qq_40374647
+//  哔哩哔哩视频：https://space.bilibili.com/94253567
+//  Gitee源代码仓库：https://gitee.com/RRQM_Home
+//  Github源代码仓库：https://github.com/RRQM
+//  API首页：http://rrqm_home.gitee.io/touchsocket/
+//  交流QQ群：234762506
+//  感谢您的下载和使用
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 using System.IO.Ports;
 
 using TouchSocket.Resources;
 
 namespace ThingsGateway.Foundation.Serial;
 
-/// <inheritdoc cref="SerialClientBase"/>
-public class SerialClient : SerialClientBase
+/// <inheritdoc cref="SerialSessionBase"/>
+public class SerialsSession : SerialSessionBase
 {
     /// <summary>
     /// 接收到数据
     /// </summary>
-    public ReceivedEventHandler<SerialClient> Received { get; set; }
+    public ReceivedEventHandler<SerialsSession> Received { get; set; }
 
     /// <summary>
     /// 接收数据
@@ -39,38 +51,46 @@ public class SerialClient : SerialClientBase
 /// <summary>
 /// 串口管理
 /// </summary>
-public class SerialClientBase : BaseSerial, ISerialClient
+public class SerialSessionBase : BaseSerial, ISerialSession
 {
-    static readonly Protocol SerialPort = new("SerialPort");
+    static readonly Protocol SerialPort = new("SerialSession");
     /// <summary>
     /// 构造函数
     /// </summary>
-    public SerialClientBase()
+    public SerialSessionBase()
     {
         this.Protocol = SerialPort;
     }
 
     #region 变量
-
-    private int m_bufferRate = 1;
     private SerialDelaySender m_delaySender;
-    private SerialPort m_mainSerialPort;
+    private int m_bufferRate = 1;
     private volatile bool m_online;
-    private bool m_useDelaySender;
     #endregion 变量
 
     #region 事件
 
     /// <inheritdoc/>
-    public ConnectedEventHandler<ISerialClient> Connected { get; set; }
+    public ConnectedEventHandler<ISerialSession> Connected { get; set; }
     /// <inheritdoc/>
-    public SerialConnectingEventHandler<ISerialClient> Connecting { get; set; }
+    public SerialConnectingEventHandler<ISerialSession> Connecting { get; set; }
 
     /// <inheritdoc/>
-    public DisconnectEventHandler<ISerialClientBase> Disconnected { get; set; }
+    public DisconnectEventHandler<ISerialSessionBase> Disconnected { get; set; }
 
     /// <inheritdoc/>
-    public DisconnectEventHandler<ISerialClientBase> Disconnecting { get; set; }
+    public DisconnectEventHandler<ISerialSessionBase> Disconnecting { get; set; }
+
+    private void PrivateOnConnected(object o)
+    {
+        var e = (ConnectedEventArgs)o;
+        this.OnConnected(e);
+        if (e.Handled)
+        {
+            return;
+        }
+        this.PluginsManager.Raise(nameof(ITcpConnectedPlugin.OnTcpConnected), this, e);
+    }
 
     /// <summary>
     /// 已经建立Tcp连接
@@ -88,6 +108,23 @@ public class SerialClientBase : BaseSerial, ISerialClient
         }
     }
 
+    private void PrivateOnConnecting(SerialConnectingEventArgs e)
+    {
+        this.LastReceivedTime = DateTime.Now;
+        this.LastSendTime = DateTime.Now;
+        if (this.CanSetDataHandlingAdapter)
+        {
+            this.SetDataHandlingAdapter(this.Config.GetValue(TouchSocketConfigExtension.TcpDataHandlingAdapterProperty).Invoke());
+        }
+
+        this.OnConnecting(e);
+        if (e.Handled)
+        {
+            return;
+        }
+        this.PluginsManager.Raise(nameof(ITcpConnectingPlugin.OnTcpConnecting), this, e);
+    }
+
     /// <summary>
     /// 准备连接的时候，此时已初始化Socket，但是并未建立Tcp连接
     /// </summary>
@@ -104,6 +141,16 @@ public class SerialClientBase : BaseSerial, ISerialClient
         }
     }
 
+    private void PrivateOnDisconnected(DisconnectEventArgs e)
+    {
+        this.OnDisconnected(e);
+        if (e.Handled)
+        {
+            return;
+        }
+        this.PluginsManager.Raise(nameof(ITcpDisconnectedPlugin.OnTcpDisconnected), this, e);
+    }
+
     /// <summary>
     /// 断开连接。在客户端未设置连接状态时，不会触发
     /// </summary>
@@ -120,6 +167,16 @@ public class SerialClientBase : BaseSerial, ISerialClient
         }
     }
 
+    private void PrivateOnDisconnecting(DisconnectEventArgs e)
+    {
+        this.OnDisconnecting(e);
+        if (e.Handled)
+        {
+            return;
+        }
+        this.PluginsManager.Raise(nameof(ITcpDisconnectingPlugin.OnTcpDisconnecting), this, e);
+    }
+
     /// <summary>
     /// 即将断开连接(仅主动断开时有效)。
     /// <para>
@@ -139,97 +196,61 @@ public class SerialClientBase : BaseSerial, ISerialClient
         }
     }
 
-    private void PrivateOnConnected(object o)
-    {
-        var e = (ConnectedEventArgs)o;
-        this.OnConnected(e);
-        if (e.Handled)
-        {
-            return;
-        }
-        this.PluginsManager.Raise(nameof(ITcpConnectedPlugin.OnTcpConnected), this, e);
-    }
-    private void PrivateOnConnecting(SerialConnectingEventArgs e)
-    {
-        this.LastReceivedTime = DateTime.Now;
-        this.LastSendTime = DateTime.Now;
-        if (this.CanSetDataHandlingAdapter)
-        {
-            this.SetDataHandlingAdapter(this.Config.GetValue(TouchSocketConfigExtension.TcpDataHandlingAdapterProperty).Invoke());
-        }
-
-        this.OnConnecting(e);
-        if (e.Handled)
-        {
-            return;
-        }
-        this.PluginsManager.Raise(nameof(ITcpConnectingPlugin.OnTcpConnecting), this, e);
-    }
-    private void PrivateOnDisconnected(DisconnectEventArgs e)
-    {
-        this.OnDisconnected(e);
-        if (e.Handled)
-        {
-            return;
-        }
-        this.PluginsManager.Raise(nameof(ITcpDisconnectedPlugin.OnTcpDisconnected), this, e);
-    }
-    private void PrivateOnDisconnecting(DisconnectEventArgs e)
-    {
-        this.OnDisconnecting(e);
-        if (e.Handled)
-        {
-            return;
-        }
-        this.PluginsManager.Raise(nameof(ITcpDisconnectingPlugin.OnTcpDisconnecting), this, e);
-    }
     #endregion 事件
 
     #region 属性
 
-    /// <inheritdoc/>
-    public bool CanSend => this.m_online;
-
-    /// <inheritdoc/>
-    public virtual bool CanSetDataHandlingAdapter => true;
-
-    /// <inheritdoc/>
-    public TouchSocketConfig Config { get; private set; }
-
-    /// <inheritdoc/>
-    public IContainer Container { get; private set; }
-
-    /// <inheritdoc/>
-    public TcpDataHandlingAdapter DataHandlingAdapter { get; private set; }
-
-    /// <inheritdoc/>
-    public bool IsClient => true;
-
     /// <inheritdoc/>
     public DateTime LastReceivedTime { get; private set; }
 
     /// <inheritdoc/>
     public DateTime LastSendTime { get; private set; }
 
-    /// <inheritdoc/>
-    public SerialPort MainSerialPort { get => this.m_mainSerialPort; }
-
     /// <inheritdoc/>
     public Func<ByteBlock, bool> OnHandleRawBuffer { get; set; }
 
     /// <inheritdoc/>
     public Func<ByteBlock, IRequestInfo, bool> OnHandleReceivedData { get; set; }
+
     /// <inheritdoc/>
+    public IContainer Container { get; private set; }
+
+    /// <inheritdoc/>
+    public virtual bool CanSetDataHandlingAdapter => true;
+
+    /// <inheritdoc/>
+    public TouchSocketConfig Config { get; private set; }
+
+    /// <inheritdoc/>
+    public SingleStreamDataHandlingAdapter DataHandlingAdapter { get; private set; }
+
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public SerialProperty SerialProperty { get; private set; }
+    /// <inheritdoc/>
+    public SerialPort MainSerialPort { get; private set; }
+
     /// <inheritdoc/>
     public bool Online { get => this.m_online; }
+
+    /// <inheritdoc/>
+    public bool CanSend => this.m_online;
+
     /// <inheritdoc/>
     public IPluginsManager PluginsManager { get; private set; }
 
+
+    /// <inheritdoc/>
+    public ReceiveType ReceiveType { get; private set; }
+
+
     /// <inheritdoc/>
     public Protocol Protocol { get; set; }
 
-    /// <inheritdoc/>
-    public ReceiveType ReceiveType { get; private set; }
+
+
     #endregion 属性
 
     #region 断开操作
@@ -254,6 +275,21 @@ public class SerialClientBase : BaseSerial, ISerialClient
         }
     }
 
+    private void BreakOut(string msg)
+    {
+        lock (this.SyncRoot)
+        {
+            if (this.m_online)
+            {
+                this.m_online = false;
+                this.MainSerialPort.SafeDispose();
+                this.m_delaySender.SafeDispose();
+                this.DataHandlingAdapter.SafeDispose();
+                this.PrivateOnDisconnected(new DisconnectEventArgs(false, msg));
+            }
+        }
+    }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -278,48 +314,13 @@ public class SerialClientBase : BaseSerial, ISerialClient
         base.Dispose(disposing);
     }
 
-    private void BreakOut(string msg)
-    {
-        lock (this.SyncRoot)
-        {
-            if (this.m_online)
-            {
-                this.m_online = false;
-                this.MainSerialPort.SafeDispose();
-                this.m_delaySender.SafeDispose();
-                this.DataHandlingAdapter.SafeDispose();
-                this.PrivateOnDisconnected(new DisconnectEventArgs(false, msg));
-            }
-        }
-    }
     #endregion 断开操作
 
     #region Connect
-    /// <inheritdoc/>
-    public virtual ISerialClient Connect(int timeout = 5000)
-    {
-        this.TcpConnect(timeout);
-        return this;
-    }
-
-    /// <inheritdoc/>
-    public Task<ISerialClient> ConnectAsync(int timeout = 5000)
-    {
-        return Task.Run(() =>
-        {
-            return this.Connect(timeout);
-        });
-    }
-
     /// <summary>
-    /// 建立Tcp的连接。
+    /// 打开串口
     /// </summary>
-    /// <param name="timeout"></param>
-    /// <exception cref="ObjectDisposedException"></exception>
-    /// <exception cref="ArgumentNullException"></exception>
-    /// <exception cref="Exception"></exception>
-    /// <exception cref="TimeoutException"></exception>
-    protected void TcpConnect(int timeout)
+    protected void Open()
     {
         lock (this.SyncRoot)
         {
@@ -337,42 +338,42 @@ public class SerialClientBase : BaseSerial, ISerialClient
             }
             var serialProperty = this.Config.GetValue(SerialConfigExtension.SerialProperty) ?? throw new ArgumentNullException("串口配置不能为空。");
 
-            this.m_mainSerialPort.SafeDispose();
-            m_mainSerialPort = this.CreateSerial(serialProperty);
+            this.MainSerialPort.SafeDispose();
+            var serialPort = this.CreateSerial(serialProperty);
             var args = new SerialConnectingEventArgs(this.MainSerialPort);
             this.PrivateOnConnecting(args);
-            m_mainSerialPort.Open();
+            serialPort.Open();
 
             this.m_online = true;
-            this.SetSerialPort(m_mainSerialPort);
-
-
-            if (Config.GetValue(TouchSocketConfigExtension.DelaySenderProperty) is DelaySenderOption senderOption)
-            {
-                m_useDelaySender = true;
-                m_delaySender.SafeDispose();
-                m_delaySender = new SerialDelaySender(MainSerialPort, senderOption.QueueLength, this.OnDelaySenderError)
-                {
-                    DelayLength = senderOption.DelayLength
-                };
-            }
+            this.SetSerialPort(serialPort);
 
 
             this.BeginReceive();
             this.PrivateOnConnected(new ConnectedEventArgs());
-
         }
     }
+
+    /// <inheritdoc/>
+    public virtual ISerialSession Connect()
+    {
+        this.Open();
+        return this;
+    }
+
+    /// <inheritdoc/>
+    public Task<ISerialSession> ConnectAsync()
+    {
+        return Task.Run(() =>
+        {
+            return this.Connect();
+        });
+    }
     #endregion
 
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public SerialProperty SerialProperty { get; private set; }
 
     /// <inheritdoc/>
-    public virtual void SetDataHandlingAdapter(TcpDataHandlingAdapter adapter)
+    public virtual void SetDataHandlingAdapter(SingleStreamDataHandlingAdapter adapter)
     {
         if (!this.CanSetDataHandlingAdapter)
         {
@@ -383,7 +384,7 @@ public class SerialClientBase : BaseSerial, ISerialClient
     }
 
     /// <inheritdoc/>
-    public ISerialClient Setup(TouchSocketConfig config)
+    public ISerialSession Setup(TouchSocketConfig config)
     {
         if (config == null)
         {
@@ -401,6 +402,67 @@ public class SerialClientBase : BaseSerial, ISerialClient
         return this;
     }
 
+    private void BuildConfig(TouchSocketConfig config)
+    {
+        this.Config = config;
+
+        if (!(config.GetValue(TouchSocketCoreConfigExtension.ContainerProperty) is IContainer container))
+        {
+            container = new Container();
+        }
+
+        if (!container.IsRegistered(typeof(ILog)))
+        {
+            container.RegisterSingleton<ILog, LoggerGroup>();
+        }
+
+        if (!(config.GetValue(TouchSocketCoreConfigExtension.PluginsManagerProperty) is IPluginsManager pluginsManager))
+        {
+            pluginsManager = new PluginsManager(container);
+        }
+
+        if (container.IsRegistered(typeof(IPluginsManager)))
+        {
+            pluginsManager = container.Resolve<IPluginsManager>();
+        }
+        else
+        {
+            container.RegisterSingleton<IPluginsManager>(pluginsManager);
+        }
+
+        if (config.GetValue(TouchSocketCoreConfigExtension.ConfigureContainerProperty) is Action<IContainer> actionContainer)
+        {
+            actionContainer.Invoke(container);
+        }
+
+        if (config.GetValue(TouchSocketCoreConfigExtension.ConfigurePluginsProperty) is Action<IPluginsManager> actionPluginsManager)
+        {
+            pluginsManager.Enable = true;
+            actionPluginsManager.Invoke(pluginsManager);
+        }
+        this.Container = container;
+        this.PluginsManager = pluginsManager;
+    }
+
+    private void PrivateHandleReceivedData(ByteBlock byteBlock, IRequestInfo requestInfo)
+    {
+        if (this.OnHandleReceivedData?.Invoke(byteBlock, requestInfo) == false)
+        {
+            return;
+        }
+
+        if (this.HandleReceivedData(byteBlock, requestInfo))
+        {
+            return;
+        }
+
+        if (this.PluginsManager.Enable)
+        {
+            var args = new ReceivedDataEventArgs(byteBlock, requestInfo);
+            this.PluginsManager.Raise(nameof(ITcpReceivedPlugin.OnTcpReceived), this, args);
+        }
+    }
+
     /// <summary>
     /// 处理已接收到的数据。
     /// </summary>
@@ -458,7 +520,7 @@ public class SerialClientBase : BaseSerial, ISerialClient
     /// 设置适配器，该方法不会检验<see cref="CanSetDataHandlingAdapter"/>的值。
     /// </summary>
     /// <param name="adapter"></param>
-    protected void SetAdapter(TcpDataHandlingAdapter adapter)
+    protected void SetAdapter(SingleStreamDataHandlingAdapter adapter)
     {
         this.ThrowIfDisposed();
         if (adapter is null)
@@ -480,7 +542,8 @@ public class SerialClientBase : BaseSerial, ISerialClient
 
     private void BeginReceive()
     {
-        if (this.ReceiveType == ReceiveType.Auto)
+
+        if (this.ReceiveType == ReceiveType.Iocp)
         {
             SerialReceivedEventArgs eventArgs = new();
             var byteBlock = BytePool.Default.GetByteBlock(this.BufferLength);
@@ -492,50 +555,15 @@ public class SerialClientBase : BaseSerial, ISerialClient
             }
             MainSerialPort.DataReceived += this.EventArgs_Completed;
         }
+        else if (this.ReceiveType == ReceiveType.Bio)
+        {
+            new Thread(BeginBio)
+            {
+                IsBackground = true
+            }
+            .Start();
+        }
     }
-
-    private void BuildConfig(TouchSocketConfig config)
-    {
-        this.Config = config;
-
-        if (!(config.GetValue(TouchSocketCoreConfigExtension.ContainerProperty) is IContainer container))
-        {
-            container = new Container();
-        }
-
-        if (!container.IsRegistered(typeof(ILog)))
-        {
-            container.RegisterSingleton<ILog, LoggerGroup>();
-        }
-
-        if (!(config.GetValue(TouchSocketCoreConfigExtension.PluginsManagerProperty) is IPluginsManager pluginsManager))
-        {
-            pluginsManager = new PluginsManager(container);
-        }
-
-        if (container.IsRegistered(typeof(IPluginsManager)))
-        {
-            pluginsManager = container.Resolve<IPluginsManager>();
-        }
-        else
-        {
-            container.RegisterSingleton<IPluginsManager>(pluginsManager);
-        }
-
-        if (config.GetValue(TouchSocketCoreConfigExtension.ConfigureContainerProperty) is Action<IContainer> actionContainer)
-        {
-            actionContainer.Invoke(container);
-        }
-
-        if (config.GetValue(TouchSocketCoreConfigExtension.ConfigurePluginsProperty) is Action<IPluginsManager> actionPluginsManager)
-        {
-            pluginsManager.Enable = true;
-            actionPluginsManager.Invoke(pluginsManager);
-        }
-        this.Container = container;
-        this.PluginsManager = pluginsManager;
-    }
-
     private SerialPort CreateSerial(SerialProperty serialProperty)
     {
         SerialPort serialPort = new(serialProperty.PortName, serialProperty.BaudRate, serialProperty.Parity, serialProperty.DataBits, serialProperty.StopBits)
@@ -565,7 +593,84 @@ public class SerialClientBase : BaseSerial, ISerialClient
             this.BreakOut(ex.Message);
         }
     }
+    private void BeginBio()
+    {
+        while (true)
+        {
+            var byteBlock = new ByteBlock(this.BufferLength);
+            try
+            {
+                int r = MainSerialPort.Read(byteBlock.Buffer, 0, MainSerialPort.BytesToRead);
+                if (r == 0)
+                {
+                    this.BreakOut("远程终端主动关闭");
+                    return;
+                }
 
+                byteBlock.SetLength(r);
+                this.HandleBuffer(byteBlock);
+            }
+            catch (Exception ex)
+            {
+                this.BreakOut(ex.Message);
+                return;
+            }
+        }
+    }
+
+    private void ProcessReceived(SerialReceivedEventArgs e)
+    {
+        if (!this.m_online)
+        {
+            e.UserToken.SafeDispose();
+            return;
+        }
+        if (MainSerialPort.BytesToRead > 0)
+        {
+            byte[] buffer = new byte[2048];
+            var byteBlock = (ByteBlock)e.UserToken;
+            int num = MainSerialPort.Read(buffer, 0, MainSerialPort.BytesToRead);
+            byteBlock.Write(buffer, byteBlock.Len, num);
+            this.HandleBuffer(byteBlock);
+            try
+            {
+                var newByteBlock = BytePool.Default.GetByteBlock(Math.Min(this.BufferLength * this.m_bufferRate, 1024 * 1024));
+                newByteBlock.SetLength(num);
+                e.UserToken = newByteBlock;
+
+                if (MainSerialPort.BytesToRead > 0)
+                {
+                    this.m_bufferRate += 2;
+                    this.ProcessReceived(e);
+                }
+            }
+            catch (Exception ex)
+            {
+                e.UserToken.SafeDispose();
+                this.BreakOut(ex.Message);
+            }
+        }
+        else
+        {
+            e.UserToken.SafeDispose();
+            this.BreakOut("远程终端主动关闭");
+        }
+    }
+
+    private void SetSerialPort(SerialPort serialPort)
+    {
+        if (serialPort == null)
+        {
+            return;
+        }
+
+        this.MainSerialPort = serialPort;
+        var delaySenderOption = this.Config.GetValue(TouchSocketConfigExtension.DelaySenderProperty);
+        if (delaySenderOption != null)
+        {
+            this.m_delaySender = new SerialDelaySender(MainSerialPort, delaySenderOption, this.OnDelaySenderError);
+        }
+    }
     /// <summary>
     /// 处理数据
     /// </summary>
@@ -603,24 +708,6 @@ public class SerialClientBase : BaseSerial, ISerialClient
         }
     }
 
-    private void PrivateHandleReceivedData(ByteBlock byteBlock, IRequestInfo requestInfo)
-    {
-        if (this.OnHandleReceivedData?.Invoke(byteBlock, requestInfo) == false)
-        {
-            return;
-        }
-
-        if (this.HandleReceivedData(byteBlock, requestInfo))
-        {
-            return;
-        }
-
-        if (this.PluginsManager.Enable)
-        {
-            var args = new ReceivedDataEventArgs(byteBlock, requestInfo);
-            this.PluginsManager.Raise(nameof(ITcpReceivedPlugin.OnTcpReceived), this, args);
-        }
-    }
     #region 发送
 
     #region 同步发送
@@ -771,9 +858,9 @@ public class SerialClientBase : BaseSerial, ISerialClient
         }
         if (this.HandleSendingData(buffer, offset, length))
         {
-            if (this.m_useDelaySender && length < TouchSocketUtility.BigDataBoundary)
+            if (this.m_delaySender != null && length < m_delaySender.DelayLength)
             {
-                this.m_delaySender.Send(new QueueDataBytes(buffer, offset, length));
+                this.m_delaySender.Send(QueueDataBytes.CreateNew(buffer, offset, length));
             }
             else
             {
@@ -803,52 +890,5 @@ public class SerialClientBase : BaseSerial, ISerialClient
 
     #endregion 发送
 
-    private void ProcessReceived(SerialReceivedEventArgs e)
-    {
-        if (!this.m_online)
-        {
-            e.UserToken.SafeDispose();
-            return;
-        }
-        if (MainSerialPort.BytesToRead > 0)
-        {
-            byte[] buffer = new byte[2048];
-            var byteBlock = (ByteBlock)e.UserToken;
-            int num = MainSerialPort.Read(buffer, 0, MainSerialPort.BytesToRead);
-            byteBlock.Write(buffer, byteBlock.Len, num);
-            this.HandleBuffer(byteBlock);
-            try
-            {
-                var newByteBlock = BytePool.Default.GetByteBlock(Math.Min(this.BufferLength * this.m_bufferRate, 1024 * 1024));
-                newByteBlock.SetLength(num);
-                e.UserToken = newByteBlock;
 
-                if (MainSerialPort.BytesToRead > 0)
-                {
-                    this.m_bufferRate += 2;
-                    this.ProcessReceived(e);
-                }
-            }
-            catch (Exception ex)
-            {
-                e.UserToken.SafeDispose();
-                this.BreakOut(ex.Message);
-            }
-        }
-        else
-        {
-            e.UserToken.SafeDispose();
-            this.BreakOut("远程终端主动关闭");
-        }
-    }
-
-    private void SetSerialPort(SerialPort serialPort)
-    {
-        if (serialPort == null)
-        {
-            return;
-        }
-
-        this.m_mainSerialPort = serialPort;
-    }
 }

framework/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj

@@ -13,7 +13,7 @@
 	
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="TouchSocket" Version="2.0.0-beta.138" />
+		<PackageReference Include="TouchSocket" Version="2.0.0-beta.154" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'!='net45'">
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />

framework/ThingsGateway.Foundation/ThingsGateway.Foundation.xml

@@ -237,13 +237,13 @@
             WaitingClientEx
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.ReadWriteDevicesSerialBase.#ctor(ThingsGateway.Foundation.Serial.SerialClient)">
+        <member name="M:ThingsGateway.Foundation.ReadWriteDevicesSerialBase.#ctor(ThingsGateway.Foundation.Serial.SerialsSession)">
             <summary>
             <inheritdoc cref="T:ThingsGateway.Foundation.ReadWriteDevicesSerialBase"/>
             </summary>
-            <param name="serialClient"></param>
+            <param name="serialSession"></param>
         </member>
-        <member name="P:ThingsGateway.Foundation.ReadWriteDevicesSerialBase.SerialClient">
+        <member name="P:ThingsGateway.Foundation.ReadWriteDevicesSerialBase.SerialsSession">
             <summary>
             串口管理对象
             </summary>
@@ -351,7 +351,7 @@
         <member name="M:ThingsGateway.Foundation.ReadWriteDevicesTcpServerBase.Dispose(System.Boolean)">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Foundation.ReadWriteDevicesTcpServerBase.Received(TouchSocket.Sockets.SocketClient,TouchSocket.Sockets.IRequestInfo)">
+        <member name="M:ThingsGateway.Foundation.ReadWriteDevicesTcpServerBase.Received(TouchSocket.Sockets.SocketClient,TouchSocket.Core.IRequestInfo)">
             <summary>
             接收解析
             </summary>
@@ -685,7 +685,7 @@
             接收到数据
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.TcpClientEx.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Sockets.IRequestInfo)">
+        <member name="M:ThingsGateway.Foundation.TcpClientEx.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Core.IRequestInfo)">
             <summary>
             接收数据
             </summary>
@@ -821,7 +821,7 @@
             <summary>
             建立Tcp的连接。
             </summary>
-            <param name="timeOut"></param>
+            <param name="timeout"></param>
             <param name="token"></param>
             <exception cref="T:System.ObjectDisposedException"></exception>
             <exception cref="T:System.ArgumentNullException"></exception>
@@ -837,7 +837,7 @@
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.GetStream">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SetDataHandlingAdapter(TouchSocket.Sockets.TcpDataHandlingAdapter)">
+        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SetDataHandlingAdapter(TouchSocket.Core.SingleStreamDataHandlingAdapter)">
             <inheritdoc/>
         </member>
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.Setup(System.String)">
@@ -846,7 +846,7 @@
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.Setup(TouchSocket.Core.TouchSocketConfig)">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Sockets.IRequestInfo)">
+        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Core.IRequestInfo)">
             <summary>
             处理已接收到的数据。
             </summary>
@@ -875,7 +875,7 @@
             </summary>
             <param name="ex"></param>
         </member>
-        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SetAdapter(TouchSocket.Sockets.TcpDataHandlingAdapter)">
+        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SetAdapter(TouchSocket.Core.SingleStreamDataHandlingAdapter)">
             <summary>
             设置适配器，该方法不会检验<see cref="P:ThingsGateway.Foundation.TcpClientBaseEx.CanSetDataHandlingAdapter"/>的值。
             </summary>
@@ -886,13 +886,13 @@
             处理数据
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.Send(TouchSocket.Sockets.IRequestInfo)">
+        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.Send(TouchSocket.Core.IRequestInfo)">
             <summary>
             <inheritdoc/>
             </summary>
             <param name="requestInfo"></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"></exception>
             <exception cref="T:System.Exception"></exception>
         </member>
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.Send(System.Byte[],System.Int32,System.Int32)">
@@ -903,7 +903,7 @@
             <param name="offset"><inheritdoc/></param>
             <param name="length"><inheritdoc/></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
             <exception cref="T:System.Exception"><inheritdoc/></exception>
         </member>
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.Send(System.Collections.Generic.IList{System.ArraySegment{System.Byte}})">
@@ -912,7 +912,7 @@
             </summary>
             <param name="transferBytes"><inheritdoc/></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
             <exception cref="T:System.Exception"><inheritdoc/></exception>
         </member>
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SendAsync(System.Byte[],System.Int32,System.Int32)">
@@ -923,16 +923,16 @@
             <param name="offset"><inheritdoc/></param>
             <param name="length"><inheritdoc/></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
             <exception cref="T:System.Exception"><inheritdoc/></exception>
         </member>
-        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SendAsync(TouchSocket.Sockets.IRequestInfo)">
+        <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SendAsync(TouchSocket.Core.IRequestInfo)">
             <summary>
             <inheritdoc/>
             </summary>
             <param name="requestInfo"></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"></exception>
             <exception cref="T:System.Exception"></exception>
         </member>
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.SendAsync(System.Collections.Generic.IList{System.ArraySegment{System.Byte}})">
@@ -941,7 +941,7 @@
             </summary>
             <param name="transferBytes"><inheritdoc/></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
             <exception cref="T:System.Exception"><inheritdoc/></exception>
         </member>
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.DefaultSend(System.Byte[],System.Int32,System.Int32)">
@@ -952,7 +952,7 @@
             <param name="offset"><inheritdoc/></param>
             <param name="length"><inheritdoc/></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
             <exception cref="T:System.Exception"><inheritdoc/></exception>
         </member>
         <member name="M:ThingsGateway.Foundation.TcpClientBaseEx.DefaultSendAsync(System.Byte[],System.Int32,System.Int32)">
@@ -963,7 +963,7 @@
             <param name="offset"><inheritdoc/></param>
             <param name="length"><inheritdoc/></param>
             <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
             <exception cref="T:System.Exception"><inheritdoc/></exception>
         </member>
         <member name="T:ThingsGateway.Foundation.WaitingClientExExtension">
@@ -1037,9 +1037,9 @@
         <member name="M:ThingsGateway.Foundation.ReadWriteDevicesTcpDataHandleAdapter`1.GetResponse(TouchSocket.Core.ByteBlock,`0,System.Byte[],System.Byte[])">
             <summary>
             解包获取实际数据包
-            <para>当不满足解析条件时，请返回<see cref="F:TouchSocket.Sockets.FilterResult.Cache"/>，此时会保存<see cref="P:TouchSocket.Core.ByteBlock.CanReadLen"/>的数据</para>
-            <para>当数据部分异常时，请移动<see cref="P:TouchSocket.Core.ByteBlock.Pos"/>到指定位置，然后返回<see cref="F:TouchSocket.Sockets.FilterResult.GoOn"/></para>
-            <para>当完全满足解析条件时，请返回<see cref="F:TouchSocket.Sockets.FilterResult.Success"/>最后将<see cref="P:TouchSocket.Core.ByteBlock.Pos"/>移至指定位置。</para>
+            <para>当不满足解析条件时，请返回<see cref="F:TouchSocket.Core.FilterResult.Cache"/>，此时会保存<see cref="P:TouchSocket.Core.ByteBlock.CanReadLen"/>的数据</para>
+            <para>当数据部分异常时，请移动<see cref="P:TouchSocket.Core.ByteBlock.Pos"/>到指定位置，然后返回<see cref="F:TouchSocket.Core.FilterResult.GoOn"/></para>
+            <para>当完全满足解析条件时，请返回<see cref="F:TouchSocket.Core.FilterResult.Success"/>最后将<see cref="P:TouchSocket.Core.ByteBlock.Pos"/>移至指定位置。</para>
             </summary>
         </member>
         <member name="M:ThingsGateway.Foundation.ReadWriteDevicesTcpDataHandleAdapter`1.GoSend(System.Byte[])">
@@ -1105,7 +1105,7 @@
         <member name="M:ThingsGateway.Foundation.ReadWriteDevicesUdpDataHandleAdapter`1.PreviewSend(System.Net.EndPoint,System.Collections.Generic.IList{System.ArraySegment{System.Byte}})">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Foundation.ReadWriteDevicesUdpDataHandleAdapter`1.PreviewSend(TouchSocket.Sockets.IRequestInfo)">
+        <member name="M:ThingsGateway.Foundation.ReadWriteDevicesUdpDataHandleAdapter`1.PreviewSend(TouchSocket.Core.IRequestInfo)">
             <inheritdoc/>
         </member>
         <member name="M:ThingsGateway.Foundation.ReadWriteDevicesUdpDataHandleAdapter`1.Reset">
@@ -1289,13 +1289,6 @@
             <param name="value"></param>
             <returns></returns>
         </member>
-        <member name="M:ThingsGateway.Foundation.Extension.String.StringExtensions.ByHexStringToInt32(System.String)">
-            <summary>
-            将16进制的字符转换为int32。
-            </summary>
-            <param name="hexString"></param>
-            <returns></returns>
-        </member>
         <member name="M:ThingsGateway.Foundation.Extension.String.StringExtensions.CombinePathOS(System.String,System.String[])">
             <summary>
             <inheritdoc cref="M:System.IO.Path.Combine(System.String[])"/>
@@ -1845,95 +1838,89 @@
             <param name="value"></param>
             <returns></returns>
         </member>
-        <member name="T:ThingsGateway.Foundation.Serial.ISerialClient">
+        <member name="T:ThingsGateway.Foundation.Serial.ISerialSession">
             <summary>
-            <inheritdoc cref="T:ThingsGateway.Foundation.Serial.ISerialClientBase"/>
+            <inheritdoc cref="T:ThingsGateway.Foundation.Serial.ISerialSessionBase"/>
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClient.Connected">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSession.Connected">
             <summary>
-            成功连接到服务器
+            成功打开串口
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClient.Connecting">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSession.Connecting">
             <summary>
-            准备连接的时候
+            准备连接串口的时候
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.Serial.ISerialClient.Connect(System.Int32)">
+        <member name="M:ThingsGateway.Foundation.Serial.ISerialSession.Connect">
             <summary>
             连接串口
             </summary>
-            <exception cref="T:System.TimeoutException"></exception>
             <exception cref="T:System.Exception"></exception>
         </member>
-        <member name="M:ThingsGateway.Foundation.Serial.ISerialClient.Setup(TouchSocket.Core.TouchSocketConfig)">
+        <member name="M:ThingsGateway.Foundation.Serial.ISerialSession.Setup(TouchSocket.Core.TouchSocketConfig)">
             <summary>
             配置服务器
             </summary>
             <param name="config"></param>
             <exception cref="T:System.Exception"></exception>
         </member>
-        <member name="T:ThingsGateway.Foundation.Serial.ISerialClientBase">
+        <member name="T:ThingsGateway.Foundation.Serial.ISerialSessionBase">
             <summary>
             串口连接接口。
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.CanSetDataHandlingAdapter">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.CanSetDataHandlingAdapter">
             <summary>
-            是否允许自由调用<see cref="M:ThingsGateway.Foundation.Serial.ISerialClientBase.SetDataHandlingAdapter(TouchSocket.Sockets.TcpDataHandlingAdapter)"/>进行赋值。
+            是否允许自由调用<see cref="M:ThingsGateway.Foundation.Serial.ISerialSessionBase.SetDataHandlingAdapter(TouchSocket.Core.SingleStreamDataHandlingAdapter)"/>进行赋值。
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.Config">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.Config">
             <summary>
             客户端配置
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.DataHandlingAdapter">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.DataHandlingAdapter">
             <summary>
             数据处理适配器
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.Disconnected">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.Disconnected">
             <summary>
             断开连接
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.Disconnecting">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.Disconnecting">
             <summary>
             即将断开连接(仅主动断开时有效)。
             <para>
             </para>
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.IsClient">
-            <summary>
-            表示是否为客户端。
-            </summary>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.MainSerialPort">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.MainSerialPort">
             <summary>
             主通信器
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.ReceiveType">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.ReceiveType">
             <summary>
             接收模式
             </summary>
         </member>
-        <member name="P:ThingsGateway.Foundation.Serial.ISerialClientBase.SerialProperty">
+        <member name="P:ThingsGateway.Foundation.Serial.ISerialSessionBase.SerialProperty">
             <summary>
             串口描述
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.Serial.ISerialClientBase.Close(System.String)">
+        <member name="M:ThingsGateway.Foundation.Serial.ISerialSessionBase.Close(System.String)">
             <summary>
             关闭客户端。
             </summary>
             <param name="msg"></param>
             <exception cref="T:System.Exception"></exception>
         </member>
-        <member name="M:ThingsGateway.Foundation.Serial.ISerialClientBase.SetDataHandlingAdapter(TouchSocket.Sockets.TcpDataHandlingAdapter)">
+        <member name="M:ThingsGateway.Foundation.Serial.ISerialSessionBase.SetDataHandlingAdapter(TouchSocket.Core.SingleStreamDataHandlingAdapter)">
             <summary>
             设置数据处理适配器
             </summary>
@@ -1972,285 +1959,22 @@
             <param name="value"></param>
             <returns></returns>
         </member>
-        <member name="T:ThingsGateway.Foundation.Serial.SerialClient">
-            <inheritdoc cref="T:ThingsGateway.Foundation.Serial.SerialClientBase"/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClient.Received">
-            <summary>
-            接收到数据
-            </summary>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClient.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Sockets.IRequestInfo)">
-            <summary>
-            接收数据
-            </summary>
-            <param name="byteBlock"></param>
-            <param name="requestInfo"></param>
-        </member>
-        <member name="T:ThingsGateway.Foundation.Serial.SerialClientBase">
-            <summary>
-            串口管理
-            </summary>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.#ctor">
-            <summary>
-            构造函数
-            </summary>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Connected">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Connecting">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Disconnected">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Disconnecting">
-            <inheritdoc/>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.OnConnected(TouchSocket.Sockets.ConnectedEventArgs)">
-            <summary>
-            已经建立Tcp连接
-            </summary>
-            <param name="e"></param>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.OnConnecting(ThingsGateway.Foundation.Serial.SerialConnectingEventArgs)">
-            <summary>
-            准备连接的时候，此时已初始化Socket，但是并未建立Tcp连接
-            </summary>
-            <param name="e"></param>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.OnDisconnected(TouchSocket.Sockets.DisconnectEventArgs)">
-            <summary>
-            断开连接。在客户端未设置连接状态时，不会触发
-            </summary>
-            <param name="e"></param>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.OnDisconnecting(TouchSocket.Sockets.DisconnectEventArgs)">
-            <summary>
-            即将断开连接(仅主动断开时有效)。
-            <para>
-            当主动调用Close断开时。
-            </para>
-            </summary>
-            <param name="e"></param>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.CanSend">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.CanSetDataHandlingAdapter">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Config">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Container">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.DataHandlingAdapter">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.IsClient">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.LastReceivedTime">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.LastSendTime">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.MainSerialPort">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.OnHandleRawBuffer">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.OnHandleReceivedData">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Online">
-            <inheritdoc/>
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.PluginsManager">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.Protocol">
-            <inheritdoc/>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.ReceiveType">
-            <inheritdoc/>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.Close(System.String)">
-            <inheritdoc/>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.Dispose(System.Boolean)">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="disposing"></param>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.Connect(System.Int32)">
-            <inheritdoc/>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.ConnectAsync(System.Int32)">
-            <inheritdoc/>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.TcpConnect(System.Int32)">
-            <summary>
-            建立Tcp的连接。
-            </summary>
-            <param name="timeout"></param>
-            <exception cref="T:System.ObjectDisposedException"></exception>
-            <exception cref="T:System.ArgumentNullException"></exception>
-            <exception cref="T:System.Exception"></exception>
-            <exception cref="T:System.TimeoutException"></exception>
-        </member>
-        <member name="P:ThingsGateway.Foundation.Serial.SerialClientBase.SerialProperty">
-            <summary>
-            <inheritdoc/>
-            </summary>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.SetDataHandlingAdapter(TouchSocket.Sockets.TcpDataHandlingAdapter)">
-            <inheritdoc/>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.Setup(TouchSocket.Core.TouchSocketConfig)">
-            <inheritdoc/>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Sockets.IRequestInfo)">
-            <summary>
-            处理已接收到的数据。
-            </summary>
-            <param name="byteBlock">以二进制流形式传递</param>
-            <param name="requestInfo">以解析的数据对象传递</param>
-            <returns>如果返回<see langword="true"/>则表示数据已被处理，且不会再向下传递。</returns>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.HandleSendingData(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            当即将发送时，如果覆盖父类方法，则不会触发插件。
-            </summary>
-            <param name="buffer">数据缓存区</param>
-            <param name="offset">偏移</param>
-            <param name="length">长度</param>
-            <returns>返回值表示是否允许发送</returns>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.LoadConfig(TouchSocket.Core.TouchSocketConfig)">
-            <summary>
-            加载配置
-            </summary>
-            <param name="config"></param>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.OnDelaySenderError(System.Exception)">
-            <summary>
-            在延迟发生错误
-            </summary>
-            <param name="ex"></param>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.SetAdapter(TouchSocket.Sockets.TcpDataHandlingAdapter)">
-            <summary>
-            设置适配器，该方法不会检验<see cref="P:ThingsGateway.Foundation.Serial.SerialClientBase.CanSetDataHandlingAdapter"/>的值。
-            </summary>
-            <param name="adapter"></param>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.HandleBuffer(TouchSocket.Core.ByteBlock)">
-            <summary>
-            处理数据
-            </summary>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.Send(TouchSocket.Sockets.IRequestInfo)">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="requestInfo"></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"></exception>
-            <exception cref="T:System.Exception"></exception>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.Send(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="buffer"><inheritdoc/></param>
-            <param name="offset"><inheritdoc/></param>
-            <param name="length"><inheritdoc/></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
-            <exception cref="T:System.Exception"><inheritdoc/></exception>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.Send(System.Collections.Generic.IList{System.ArraySegment{System.Byte}})">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="transferBytes"><inheritdoc/></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
-            <exception cref="T:System.Exception"><inheritdoc/></exception>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.SendAsync(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="buffer"><inheritdoc/></param>
-            <param name="offset"><inheritdoc/></param>
-            <param name="length"><inheritdoc/></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
-            <exception cref="T:System.Exception"><inheritdoc/></exception>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.SendAsync(TouchSocket.Sockets.IRequestInfo)">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="requestInfo"></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"></exception>
-            <exception cref="T:System.Exception"></exception>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.SendAsync(System.Collections.Generic.IList{System.ArraySegment{System.Byte}})">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="transferBytes"><inheritdoc/></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
-            <exception cref="T:System.Exception"><inheritdoc/></exception>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.DefaultSend(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="buffer"><inheritdoc/></param>
-            <param name="offset"><inheritdoc/></param>
-            <param name="length"><inheritdoc/></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
-            <exception cref="T:System.Exception"><inheritdoc/></exception>
-        </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialClientBase.DefaultSendAsync(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            <inheritdoc/>
-            </summary>
-            <param name="buffer"><inheritdoc/></param>
-            <param name="offset"><inheritdoc/></param>
-            <param name="length"><inheritdoc/></param>
-            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
-            <exception cref="T:TouchSocket.Sockets.OverlengthException"><inheritdoc/></exception>
-            <exception cref="T:System.Exception"><inheritdoc/></exception>
-        </member>
         <member name="T:ThingsGateway.Foundation.Serial.SerialDelaySender">
             <summary>
             延迟发送器
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.Serial.SerialDelaySender.#ctor(System.IO.Ports.SerialPort,System.Int32,System.Action{System.Exception})">
+        <member name="M:ThingsGateway.Foundation.Serial.SerialDelaySender.#ctor(System.IO.Ports.SerialPort,TouchSocket.Sockets.DelaySenderOption,System.Action{System.Exception})">
             <summary>
             延迟发送器
             </summary>
+            <param name="serialPort"></param>
+            <param name="onError"></param>
+            <param name="delaySenderOption"></param>
         </member>
         <member name="P:ThingsGateway.Foundation.Serial.SerialDelaySender.DelayLength">
             <summary>
-            延迟包最大尺寸，默认1024*512字节。
+            延迟包最大尺寸。
             </summary>
         </member>
         <member name="P:ThingsGateway.Foundation.Serial.SerialDelaySender.Sending">
@@ -2302,6 +2026,263 @@
         <member name="M:ThingsGateway.Foundation.Serial.SerialProperty.ToString">
             <inheritdoc/>
         </member>
+        <member name="T:ThingsGateway.Foundation.Serial.SerialsSession">
+            <inheritdoc cref="T:ThingsGateway.Foundation.Serial.SerialSessionBase"/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialsSession.Received">
+            <summary>
+            接收到数据
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialsSession.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Core.IRequestInfo)">
+            <summary>
+            接收数据
+            </summary>
+            <param name="byteBlock"></param>
+            <param name="requestInfo"></param>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Serial.SerialSessionBase">
+            <summary>
+            串口管理
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.#ctor">
+            <summary>
+            构造函数
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Connected">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Connecting">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Disconnected">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Disconnecting">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.OnConnected(TouchSocket.Sockets.ConnectedEventArgs)">
+            <summary>
+            已经建立Tcp连接
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.OnConnecting(ThingsGateway.Foundation.Serial.SerialConnectingEventArgs)">
+            <summary>
+            准备连接的时候，此时已初始化Socket，但是并未建立Tcp连接
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.OnDisconnected(TouchSocket.Sockets.DisconnectEventArgs)">
+            <summary>
+            断开连接。在客户端未设置连接状态时，不会触发
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.OnDisconnecting(TouchSocket.Sockets.DisconnectEventArgs)">
+            <summary>
+            即将断开连接(仅主动断开时有效)。
+            <para>
+            当主动调用Close断开时。
+            </para>
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.LastReceivedTime">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.LastSendTime">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.OnHandleRawBuffer">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.OnHandleReceivedData">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Container">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.CanSetDataHandlingAdapter">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Config">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.DataHandlingAdapter">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.SerialProperty">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.MainSerialPort">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Online">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.CanSend">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.PluginsManager">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.ReceiveType">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Serial.SerialSessionBase.Protocol">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Close(System.String)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Dispose(System.Boolean)">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="disposing"></param>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Open">
+            <summary>
+            打开串口
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Connect">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.ConnectAsync">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.SetDataHandlingAdapter(TouchSocket.Core.SingleStreamDataHandlingAdapter)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Setup(TouchSocket.Core.TouchSocketConfig)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.HandleReceivedData(TouchSocket.Core.ByteBlock,TouchSocket.Core.IRequestInfo)">
+            <summary>
+            处理已接收到的数据。
+            </summary>
+            <param name="byteBlock">以二进制流形式传递</param>
+            <param name="requestInfo">以解析的数据对象传递</param>
+            <returns>如果返回<see langword="true"/>则表示数据已被处理，且不会再向下传递。</returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.HandleSendingData(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            当即将发送时，如果覆盖父类方法，则不会触发插件。
+            </summary>
+            <param name="buffer">数据缓存区</param>
+            <param name="offset">偏移</param>
+            <param name="length">长度</param>
+            <returns>返回值表示是否允许发送</returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.LoadConfig(TouchSocket.Core.TouchSocketConfig)">
+            <summary>
+            加载配置
+            </summary>
+            <param name="config"></param>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.OnDelaySenderError(System.Exception)">
+            <summary>
+            在延迟发生错误
+            </summary>
+            <param name="ex"></param>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.SetAdapter(TouchSocket.Core.SingleStreamDataHandlingAdapter)">
+            <summary>
+            设置适配器，该方法不会检验<see cref="P:ThingsGateway.Foundation.Serial.SerialSessionBase.CanSetDataHandlingAdapter"/>的值。
+            </summary>
+            <param name="adapter"></param>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.HandleBuffer(TouchSocket.Core.ByteBlock)">
+            <summary>
+            处理数据
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Send(TouchSocket.Core.IRequestInfo)">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="requestInfo"></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"></exception>
+            <exception cref="T:System.Exception"></exception>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Send(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="buffer"><inheritdoc/></param>
+            <param name="offset"><inheritdoc/></param>
+            <param name="length"><inheritdoc/></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:System.Exception"><inheritdoc/></exception>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.Send(System.Collections.Generic.IList{System.ArraySegment{System.Byte}})">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="transferBytes"><inheritdoc/></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:System.Exception"><inheritdoc/></exception>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.SendAsync(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="buffer"><inheritdoc/></param>
+            <param name="offset"><inheritdoc/></param>
+            <param name="length"><inheritdoc/></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:System.Exception"><inheritdoc/></exception>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.SendAsync(TouchSocket.Core.IRequestInfo)">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="requestInfo"></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"></exception>
+            <exception cref="T:System.Exception"></exception>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.SendAsync(System.Collections.Generic.IList{System.ArraySegment{System.Byte}})">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="transferBytes"><inheritdoc/></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:System.Exception"><inheritdoc/></exception>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.DefaultSend(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="buffer"><inheritdoc/></param>
+            <param name="offset"><inheritdoc/></param>
+            <param name="length"><inheritdoc/></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:System.Exception"><inheritdoc/></exception>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialSessionBase.DefaultSendAsync(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            <inheritdoc/>
+            </summary>
+            <param name="buffer"><inheritdoc/></param>
+            <param name="offset"><inheritdoc/></param>
+            <param name="length"><inheritdoc/></param>
+            <exception cref="T:TouchSocket.Sockets.NotConnectedException"><inheritdoc/></exception>
+            <exception cref="T:TouchSocket.Core.OverlengthException"><inheritdoc/></exception>
+            <exception cref="T:System.Exception"><inheritdoc/></exception>
+        </member>
         <member name="T:ThingsGateway.Foundation.SerialPortExtensions">
             <summary>
             SocketExtension

framework/ThingsGateway.Foundation/Trans/ThingsGatewayBitConverter.cs

@@ -31,11 +31,11 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     private DataFormat dataFormat;
     /// <inheritdoc/>
     [JsonIgnore]
-    public Encoding Encoding { get; set; } = Encoding.UTF8;
+    public virtual Encoding Encoding { get; set; } = Encoding.UTF8;
     /// <inheritdoc/>
-    public BcdFormat? BcdFormat { get; set; }
+    public virtual BcdFormat? BcdFormat { get; set; }
     /// <inheritdoc/>
-    public int StringLength { get; set; }
+    public virtual int StringLength { get; set; }
 
     /// <summary>
     /// 构造函数
@@ -55,7 +55,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public DataFormat DataFormat
+    public virtual DataFormat DataFormat
     {
         get
         {
@@ -69,9 +69,9 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
 
 
     /// <inheritdoc/>
-    public EndianType EndianType => endianType;
+    public virtual EndianType EndianType => endianType;
     /// <inheritdoc/>
-    public bool IsStringReverseByteWord { get; set; }
+    public virtual bool IsStringReverseByteWord { get; set; }
 
     /// <inheritdoc/>
     public virtual IThingsGatewayBitConverter CreateByDateFormat(DataFormat dataFormat)
@@ -86,7 +86,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return byteConverter;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(bool value)
+    public virtual byte[] GetBytes(bool value)
     {
         return GetBytes(new bool[1]
         {
@@ -95,13 +95,13 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public byte[] GetBytes(bool[] values)
+    public virtual byte[] GetBytes(bool[] values)
     {
         return values?.BoolArrayToByte();
     }
 
     /// <inheritdoc/>
-    public byte[] GetBytes(short value)
+    public virtual byte[] GetBytes(short value)
     {
         byte[] bytes = BitConverter.GetBytes(value);
         if (!IsSameOfSet())
@@ -111,7 +111,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return bytes;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(short[] value)
+    public virtual byte[] GetBytes(short[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -123,7 +123,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public byte[] GetBytes(ushort value)
+    public virtual byte[] GetBytes(ushort value)
     {
         byte[] bytes = BitConverter.GetBytes(value);
         if (!IsSameOfSet())
@@ -133,7 +133,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return bytes;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(ushort[] value)
+    public virtual byte[] GetBytes(ushort[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -144,12 +144,12 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(int value)
+    public virtual byte[] GetBytes(int value)
     {
         return ByteTransDataFormat4(BitConverter.GetBytes(value));
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(int[] value)
+    public virtual byte[] GetBytes(int[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -160,12 +160,12 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(uint value)
+    public virtual byte[] GetBytes(uint value)
     {
         return ByteTransDataFormat4(BitConverter.GetBytes(value));
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(uint[] value)
+    public virtual byte[] GetBytes(uint[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -176,12 +176,12 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(long value)
+    public virtual byte[] GetBytes(long value)
     {
         return ByteTransDataFormat8(BitConverter.GetBytes(value));
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(long[] value)
+    public virtual byte[] GetBytes(long[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -192,12 +192,12 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(ulong value)
+    public virtual byte[] GetBytes(ulong value)
     {
         return ByteTransDataFormat8(BitConverter.GetBytes(value));
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(ulong[] value)
+    public virtual byte[] GetBytes(ulong[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -208,12 +208,12 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(float value)
+    public virtual byte[] GetBytes(float value)
     {
         return ByteTransDataFormat4(BitConverter.GetBytes(value));
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(float[] value)
+    public virtual byte[] GetBytes(float[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -224,12 +224,12 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(double value)
+    public virtual byte[] GetBytes(double value)
     {
         return ByteTransDataFormat8(BitConverter.GetBytes(value));
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(double[] value)
+    public virtual byte[] GetBytes(double[] value)
     {
         byte[] numArray = new byte[value.Length * 2];
         for (int index = 0; index < value.Length; ++index)
@@ -240,7 +240,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public byte[] GetBytes(string value)
+    public virtual byte[] GetBytes(string value)
     {
         if (value == null)
         {
@@ -280,7 +280,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
 
 
     /// <inheritdoc/>
-    public bool IsSameOfSet()
+    public virtual bool IsSameOfSet()
     {
         return !(BitConverter.IsLittleEndian ^ (endianType == EndianType.Little));
     }
@@ -288,7 +288,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
 
 
     /// <inheritdoc/>
-    public bool ToBoolean(byte[] buffer, int offset)
+    public virtual bool ToBoolean(byte[] buffer, int offset)
     {
         byte[] bytes = new byte[buffer.Length];
         Array.Copy(buffer, 0, bytes, 0, buffer.Length);
@@ -296,7 +296,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public byte ToByte(byte[] buffer, int offset)
+    public virtual byte ToByte(byte[] buffer, int offset)
     {
         byte[] bytes = new byte[1];
         Array.Copy(buffer, offset, bytes, 0, bytes.Length);
@@ -304,7 +304,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public byte[] ToByte(byte[] buffer, int offset, int length)
+    public virtual byte[] ToByte(byte[] buffer, int offset, int length)
     {
         byte[] bytes = new byte[length];
         Array.Copy(buffer, offset, bytes, 0, bytes.Length);
@@ -317,7 +317,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     /// <param name="buffer"></param>
     /// <param name="offset"></param>
     /// <returns></returns>
-    public double ToDouble(byte[] buffer, int offset)
+    public virtual double ToDouble(byte[] buffer, int offset)
     {
         byte[] bytes = ByteTransDataFormat8(buffer, offset);
 
@@ -325,7 +325,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public short ToInt16(byte[] buffer, int offset)
+    public virtual short ToInt16(byte[] buffer, int offset)
     {
         byte[] bytes = new byte[2];
         Array.Copy(buffer, offset, bytes, 0, bytes.Length);
@@ -337,7 +337,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public int ToInt32(byte[] buffer, int offset)
+    public virtual int ToInt32(byte[] buffer, int offset)
     {
         byte[] bytes = ByteTransDataFormat4(buffer, offset);
 
@@ -345,14 +345,14 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public long ToInt64(byte[] buffer, int offset)
+    public virtual long ToInt64(byte[] buffer, int offset)
     {
         byte[] bytes = ByteTransDataFormat8(buffer, offset);
         return BitConverter.ToInt64(bytes, 0);
     }
 
     /// <inheritdoc/>
-    public float ToSingle(byte[] buffer, int offset)
+    public virtual float ToSingle(byte[] buffer, int offset)
     {
         byte[] bytes = ByteTransDataFormat4(buffer, offset);
 
@@ -360,13 +360,13 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public string ToString(byte[] buffer)
+    public virtual string ToString(byte[] buffer)
     {
         return ToString(buffer, 0, buffer.Length);
     }
 
     /// <inheritdoc/>
-    public string ToString(byte[] buffer, int offset, int length)
+    public virtual string ToString(byte[] buffer, int offset, int length)
     {
         byte[] numArray = buffer.SelectMiddle(offset, length);
         if (BcdFormat != null)
@@ -385,7 +385,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public ushort ToUInt16(byte[] buffer, int offset)
+    public virtual ushort ToUInt16(byte[] buffer, int offset)
     {
         byte[] bytes = new byte[2];
         Array.Copy(buffer, offset, bytes, 0, 2);
@@ -397,7 +397,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public uint ToUInt32(byte[] buffer, int offset)
+    public virtual uint ToUInt32(byte[] buffer, int offset)
     {
         byte[] bytes = ByteTransDataFormat4(buffer, offset);
 
@@ -405,7 +405,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public ulong ToUInt64(byte[] buffer, int offset)
+    public virtual ulong ToUInt64(byte[] buffer, int offset)
     {
         byte[] bytes = ByteTransDataFormat8(buffer, offset);
         return BitConverter.ToUInt64(bytes, 0);
@@ -508,7 +508,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public bool[] ToBoolean(byte[] buffer, int offset, int len)
+    public virtual bool[] ToBoolean(byte[] buffer, int offset, int len)
     {
         bool[] flagArray = new bool[len];
         for (int index = 0; index < len; ++index)
@@ -519,7 +519,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public double[] ToDouble(byte[] buffer, int offset, int len)
+    public virtual double[] ToDouble(byte[] buffer, int offset, int len)
     {
         double[] numArray = new double[len];
         for (int index = 0; index < len; ++index)
@@ -530,7 +530,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public short[] ToInt16(byte[] buffer, int offset, int len)
+    public virtual short[] ToInt16(byte[] buffer, int offset, int len)
     {
         short[] numArray = new short[len];
         for (int index = 0; index < len; ++index)
@@ -541,7 +541,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public int[] ToInt32(byte[] buffer, int offset, int len)
+    public virtual int[] ToInt32(byte[] buffer, int offset, int len)
     {
         int[] numArray = new int[len];
         for (int index = 0; index < len; ++index)
@@ -552,7 +552,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public long[] ToInt64(byte[] buffer, int offset, int len)
+    public virtual long[] ToInt64(byte[] buffer, int offset, int len)
     {
         long[] numArray = new long[len];
         for (int index = 0; index < len; ++index)
@@ -562,7 +562,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
         return numArray;
     }
     /// <inheritdoc/>
-    public float[] ToSingle(byte[] buffer, int offset, int len)
+    public virtual float[] ToSingle(byte[] buffer, int offset, int len)
     {
         float[] numArray = new float[len];
         for (int index = 0; index < len; ++index)
@@ -573,7 +573,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public ushort[] ToUInt16(byte[] buffer, int offset, int len)
+    public virtual ushort[] ToUInt16(byte[] buffer, int offset, int len)
     {
         ushort[] numArray = new ushort[len];
         for (int index = 0; index < len; ++index)
@@ -584,7 +584,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public uint[] ToUInt32(byte[] buffer, int offset, int len)
+    public virtual uint[] ToUInt32(byte[] buffer, int offset, int len)
     {
         uint[] numArray = new uint[len];
         for (int index = 0; index < len; ++index)
@@ -595,7 +595,7 @@ public class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public ulong[] ToUInt64(byte[] buffer, int offset, int len)
+    public virtual ulong[] ToUInt64(byte[] buffer, int offset, int len)
     {
         ulong[] numArray = new ulong[len];
         for (int index = 0; index < len; ++index)

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/DLT645Test/DLT645Test.csproj

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ThingsGateway.Foundation.Adapter.Modbus" Version="2.0.9" />
+	  <ProjectReference Include="..\..\Foundataion\ThingsGateway.Foundation.Adapter.DLT645\ThingsGateway.Foundation.Adapter.DLT645.csproj" />
 	</ItemGroup>
 
 </Project>

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/DLT645Test/DLT645Test.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>ModbusDemo</name>
+        <name>DLT645Test</name>
     </assembly>
     <members>
     </members>

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/DLT645Test/Program.cs

@@ -0,0 +1,112 @@
+using ThingsGateway.Foundation;
+using ThingsGateway.Foundation.Adapter.DLT645;
+using ThingsGateway.Foundation.Extension.Byte;
+using ThingsGateway.Foundation.Serial;
+
+using TouchSocket.Core;
+using TouchSocket.Sockets;
+
+namespace DLT645Test
+{
+    internal class Program
+    {
+        static async Task Main(string[] args)
+        {
+
+            await DLT645_2007ClientAsync();
+
+            Console.ReadLine();
+        }
+
+
+        private static async Task DLT645_2007ClientAsync()
+        {
+            //链路基础配置项
+            var config = new TouchSocketConfig();
+            config.SetRemoteIPHost(new IPHost("127.0.0.1:502"))//TCP/UDP链路才需要
+            .SetSerialProperty(new SerialProperty() //串口链路才需要
+            {
+                PortName = "COM1"
+            }).SetBufferLength(1024);
+
+            var serialSession = new SerialsSession();//链路对象
+            serialSession.Setup(config);
+
+            //创建协议对象,构造函数需要传入对应链路对象
+
+            DLT645_2007 dlt6452007 = new(serialSession)//传入链路
+            {
+                //协议配置
+                DataFormat = DataFormat.ABCD,
+                FrameTime = 0,
+                CacheTimeout = 1000,
+                ConnectTimeOut = 3000,
+                TimeOut = 3000,
+                EnableFEHead = true,
+            };
+
+            #region 读写测试
+            //测试读取写入
+            Console.WriteLine("dlt6452007：" + dlt6452007.SerialsSession.SerialProperty.ToJsonString());
+            await TestAsync(dlt6452007);
+            #endregion
+
+        }
+
+        private static async Task TestAsync(DLT645_2007 plc)
+        {
+            //下面的方法对应PLC读写协议对象都是通用的
+            //注意下面的方法都带有CancellationToken传播，一般是在最后一个参数，默认为None
+
+
+            //var bytes02010100Result = await plc.ReadAsync("03010100", 20);
+            ////返回带有是否成功等参数，实际数据在data.Content中
+            //Console.WriteLine("bytes02010100Result：" + (bytes02010100Result.IsSuccess ? bytes02010100Result.Content.ToHexString() : bytes02010100Result.Message));
+            //Console.WriteLine("bytes02010100Result：" + (bytes02010100Result.IsSuccess ? plc.ThingsGatewayBitConverter.ToDouble(bytes02010100Result.Content, 0) : bytes02010100Result.Message));
+
+            //var bytes02020100Result = await plc.ReadAsync("02020100", 20);
+            ////返回带有是否成功等参数，实际数据在data.Content中
+            //Console.WriteLine("bytes02020100Result：" + (bytes02020100Result.IsSuccess ? bytes02020100Result.Content.ToHexString() : bytes02020100Result.Message));
+            //Console.WriteLine("bytes02020100Result：" + (bytes02020100Result.IsSuccess ? plc.ThingsGatewayBitConverter.ToDouble(bytes02020100Result.Content, 0) : bytes02020100Result.Message));
+
+            //var bytes02020100Result = await plc.ReadAsync("04000103", 1);
+            ////返回带有是否成功等参数，实际数据在data.Content中
+            //Console.WriteLine("bytes02020100Result：" + (bytes02020100Result.IsSuccess ? bytes02020100Result.Content.ToHexString() : bytes02020100Result.Message));
+            //Console.WriteLine("bytes02020100Result：" + (bytes02020100Result.IsSuccess ? plc.ThingsGatewayBitConverter.ToString(bytes02020100Result.Content) : bytes02020100Result.Message));
+
+
+            var test1 = await plc.ReadDeviceStationAsync();
+            Console.WriteLine("bytes02020100Result：" + (test1.IsSuccess ? test1.Content : test1.Message));
+
+            var test2 = await plc.WriteDeviceStationAsync("311111111114");
+            Console.WriteLine("bytes02020100Result：" + (test2.IsSuccess ? test2.Message : test2.Message));
+            plc.BroadcastTime(DateTime.Now);
+            plc.Station = "311111111114";
+
+            var test3 = await plc.WriteBaudRateAsync(19200);
+            Console.WriteLine("bytes02020100Result：" + (test3.IsSuccess ? test3.Message : test3.Message));
+            var test4 = await plc.FreezeAsync(DateTime.Now);
+            Console.WriteLine("bytes02020100Result：" + (test4.IsSuccess ? test4.Message : test4.Message));
+
+            var test5 = await plc.WritePasswordAsync(1, "66666666", "11111111");
+            Console.WriteLine("bytes02020100Result：" + (test5.IsSuccess ? test5.Message : test5.Message));
+            plc.Password = "11111111";
+
+
+
+            var bytes02020100Result1 = await plc.ReadAsync("04000403", 1);
+            //返回带有是否成功等参数，实际数据在data.Content中
+            Console.WriteLine("bytes02020100Result：" + (bytes02020100Result1.IsSuccess ? bytes02020100Result1.Content.ToHexString() : bytes02020100Result1.Message));
+            Console.WriteLine("bytes02020100Result：" + (bytes02020100Result1.IsSuccess ? plc.ThingsGatewayBitConverter.ToString(bytes02020100Result1.Content) : bytes02020100Result1.Message));
+
+            var test = await plc.WriteAsync("04000403", "33");
+            //返回带有是否成功等参数，实际数据在data.Content中
+            Console.WriteLine("test：" + test.Message);
+            var bytes02020100Result = await plc.ReadAsync("04000403", 1);
+            //返回带有是否成功等参数，实际数据在data.Content中
+            Console.WriteLine("bytes02020100Result：" + (bytes02020100Result.IsSuccess ? bytes02020100Result.Content.ToHexString() : bytes02020100Result.Message));
+            Console.WriteLine("bytes02020100Result：" + (bytes02020100Result.IsSuccess ? plc.ThingsGatewayBitConverter.ToString(bytes02020100Result.Content) : bytes02020100Result.Message));
+
+        }
+    }
+}

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/ModbusTest/ModbusTest.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+
+	<ItemGroup>
+	  <ProjectReference Include="..\..\Foundataion\ThingsGateway.Foundation.Adapter.Modbus\ThingsGateway.Foundation.Adapter.Modbus.csproj" />
+	</ItemGroup>
+
+</Project>

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/ModbusTest/ModbusTest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>OPCUAClientDemo</name>
+        <name>ModbusTest</name>
     </assembly>
     <members>
     </members>

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/ModbusTest/Program.cs

@@ -67,12 +67,12 @@ namespace ModbusDemo
             var tcpClient2 = new TcpClientEx();//链路对象
             var udpSession1 = new UdpSession();//链路对象
             var udpSession2 = new UdpSession();//链路对象
-            var serialClient = new SerialClient();//链路对象
+            var serialSession = new SerialsSession();//链路对象
             tcpClient1.Setup(config);
             tcpClient2.Setup(config);
             udpSession1.Setup(config);
             udpSession2.Setup(config);
-            serialClient.Setup(config);
+            serialSession.Setup(config);
 
             //创建协议对象,构造函数需要传入对应链路对象
 
@@ -108,7 +108,7 @@ namespace ModbusDemo
                 TimeOut = 3000,
                 IsCheckMessageId = true
             };
-            ModbusRtu modbusRtu = new(serialClient)//传入链路
+            ModbusRtu modbusRtu = new(serialSession)//传入链路
             {
                 //协议配置
                 DataFormat = DataFormat.ABCD,
@@ -134,7 +134,7 @@ namespace ModbusDemo
             //测试读取写入
             Console.WriteLine("modbusTcp：" + modbusTcp.TcpClientEx.RemoteIPHost);
             await TestAsync(modbusTcp);
-            Console.WriteLine("modbusRtu：" + modbusRtu.SerialClient.SerialProperty.ToJson());
+            Console.WriteLine("modbusRtu：" + modbusRtu.SerialsSession.SerialProperty.ToJsonString());
             await TestAsync(modbusRtu);
             Console.WriteLine("modbusRtuOvrTcp：" + modbusRtuOvrTcp.TcpClientEx.RemoteIPHost);
             await TestAsync(modbusRtuOvrTcp);

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/OPCUAClientTest/OPCUAClientTest.csproj

@@ -7,8 +7,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+
   <ItemGroup>
-	  <PackageReference Include="ThingsGateway.Foundation.Adapter.OPCUA" Version="2.0.9" />
+    <ProjectReference Include="..\..\Foundataion\ThingsGateway.Foundation.Adapter.OPCUA\ThingsGateway.Foundation.Adapter.OPCUA.csproj" />
   </ItemGroup>
 
 </Project>

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/OPCUAClientTest/OPCUAClientTest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>OPCUAClientTest</name>
+    </assembly>
+    <members>
+    </members>
+</doc>

framework/ThingsGateway.Plugin/Foundataion.ConsoleTests/OPCUAClientTest/Program.cs

@@ -12,14 +12,17 @@ namespace ModbusDemo
             {
                 OPCNode = new()
                 {
-                    OPCUrl = "opc.tcp://desktop-p5gb4iq:50001/StandardServer",
+                    OPCUrl = "opc.tcp://127.0.0.1:49320",
                     IsUseSecurity = true,
                 }
             };
             await oPCUAClient.ConnectAsync();
 
             var testData1 = await oPCUAClient.ReadJTokenValueAsync(new[] { "ns=2;i=2897" });
-            await oPCUAClient.WriteNodeAsync("ns=2;i=2897", testData1.FirstOrDefault().Item3);
+            await oPCUAClient.WriteNodeAsync(new()
+            {
+                {"ns=2;i=2897", testData1.FirstOrDefault().Item3 }
+            });
 
         }
     }

framework/ThingsGateway.Plugin/Foundataion/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>2.0.9.2</Version>
+		<Version>2.1.0.1</Version>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007.cs

@@ -12,6 +12,8 @@
 
 using System.ComponentModel;
 
+using ThingsGateway.Foundation.Extension.Byte;
+using ThingsGateway.Foundation.Extension.Generic;
 using ThingsGateway.Foundation.Serial;
 
 namespace ThingsGateway.Foundation.Adapter.DLT645;
@@ -24,48 +26,61 @@ public class DLT645_2007 : ReadWriteDevicesSerialBase
     /// <summary>
     /// DLT645_2007
     /// </summary>
-    /// <param name="serialClient"></param>
-    public DLT645_2007(SerialClient serialClient) : base(serialClient)
+    /// <param name="serialSession"></param>
+    public DLT645_2007(SerialsSession serialSession) : base(serialSession)
     {
-        ThingsGatewayBitConverter = new ThingsGatewayBitConverter(EndianType.Big);
+        ThingsGatewayBitConverter = new DLT645_2007BitConverter(EndianType.Big);
         RegisterByteLength = 2;
     }
 
+
+
     /// <summary>
     /// 组包缓存时间/ms
     /// </summary>
     [Description("组包缓存时间ms")]
     public int CacheTimeout { get; set; } = 1000;
+
     /// <summary>
-    /// Crc校验
+    /// 增加FE FE FE FE的报文头部
     /// </summary>
-    [Description("Crc校验")]
-    public bool Crc16CheckEnable { get; set; } = true;
+    [Description("前导符报文头")]
+    public bool EnableFEHead { get; set; }
+
     /// <summary>
     /// 帧前时间ms
     /// </summary>
     [Description("帧前时间ms")]
     public int FrameTime { get; set; }
     /// <summary>
-    /// 站号
+    /// 写入需操作员代码
     /// </summary>
-    [Description("站号")]
-    public byte Station { get; set; } = 1;
+    [Description("操作员代码")]
+    public string OperCode { get; set; }
+
+    /// <summary>
+    /// 写入密码
+    /// </summary>
+    [Description("写入密码")]
+    public string Password { get; set; }
+
+    /// <summary>
+    /// 通讯地址BCD码，一般应该是12个字符
+    /// </summary>
+    [Description("通讯地址")]
+    public string Station { get; set; }
     /// <inheritdoc/>
-    public override string GetAddressDescription()
-    {
-        return base.GetAddressDescription() + Environment.NewLine + ModbusHelper.GetAddressDescription();
-    }
+    public override string GetAddressDescription() => base.GetAddressDescription() + Environment.NewLine;
     /// <inheritdoc/>
     public override async Task<OperResult<byte[]>> ReadAsync(string address, int length, CancellationToken token = default)
     {
         try
         {
             await ConnectAsync(token);
-            var commandResult = ModbusHelper.GetReadModbusCommand(address, length, Station);
+            var commandResult = DLT645Helper.GetDLT645_2007Command(address, length, (byte)ControlCode.Read, Station);
             if (commandResult.IsSuccess)
             {
-                ResponsedData result = await SendThenReturnAsync(commandResult, token);
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
                 return (MessageBase)result.RequestInfo;
             }
             else
@@ -77,70 +92,368 @@ public class DLT645_2007 : ReadWriteDevicesSerialBase
         {
             return new OperResult<byte[]>(ex);
         }
+
     }
 
     /// <inheritdoc/>
     public override void SetDataAdapter()
     {
-        ModbusRtuDataHandleAdapter dataHandleAdapter = new()
+        var dataHandleAdapter = new DLT645_2007DataHandleAdapter
         {
-            Crc16CheckEnable = Crc16CheckEnable,
-            CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
+            EnableFEHead = EnableFEHead
         };
-        SerialClient.SetDataHandlingAdapter(dataHandleAdapter);
+        SerialsSession.SetDataHandlingAdapter(dataHandleAdapter);
     }
-
     /// <inheritdoc/>
-    public override async Task<OperResult> WriteAsync(string address, byte[] value, CancellationToken token = default)
+    public override async Task<OperResult> WriteAsync(string address, string value, CancellationToken token = default)
     {
+
         try
         {
             await ConnectAsync(token);
-            var commandResult = ModbusHelper.GetWriteModbusCommand(address, value, Station);
+            Password ??= string.Empty;
+            OperCode ??= string.Empty;
+            if (Password.Length < 8)
+                Password = Password.PadLeft(8, '0');
+            if (OperCode.Length < 8)
+                OperCode = OperCode.PadLeft(8, '0');
+            var data = DataTransUtil.SpliceArray(Password.ByHexStringToBytes(), OperCode.ByHexStringToBytes());
+            string[] strArray = value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            var commandResult = DLT645Helper.GetDLT645_2007Command(address, 1, (byte)ControlCode.Write, Station, data, strArray);
             if (commandResult.IsSuccess)
             {
-                ResponsedData result = await SendThenReturnAsync(commandResult, token);
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
                 return (MessageBase)result.RequestInfo;
             }
             else
             {
-                return OperResult.CreateFailedResult<bool[]>(commandResult);
+                return OperResult.CreateFailedResult<byte[]>(commandResult);
             }
         }
         catch (Exception ex)
         {
-            return new OperResult<bool[]>(ex);
+            return new OperResult<byte[]>(ex);
         }
+
+
     }
 
     /// <inheritdoc/>
-    public override async Task<OperResult> WriteAsync(string address, bool[] value, CancellationToken token = default)
+    public override Task<OperResult> WriteAsync(string address, byte[] value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, uint value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, byte value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, double value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, float value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, long value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, ulong value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, ushort value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, short value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, int value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+
+
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, bool[] value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+
+
+    #region 其他方法
+
+    /// <summary>
+    /// 广播校时
+    /// </summary>
+    /// <param name="dateTime"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public OperResult BroadcastTime(DateTime dateTime, CancellationToken token = default)
+    {
+        try
+        {
+            Connect(token);
+            string str = $"{dateTime.Second:D2}{dateTime.Minute:D2}{dateTime.Hour:D2}{dateTime.Day:D2}{dateTime.Month:D2}{dateTime.Year % 100:D2}";
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.BroadcastTime, str.ByHexStringToBytes().Reverse().ToArray(), "999999999999".ByHexStringToBytes());
+            if (commandResult.IsSuccess)
+            {
+                SerialsSession.Send(commandResult.Content);
+                return OperResult.CreateSuccessResult();
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+    /// <summary>
+    /// 冻结
+    /// </summary>
+    /// <param name="dateTime"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> FreezeAsync(DateTime dateTime, CancellationToken token = default)
     {
         try
         {
             await ConnectAsync(token);
-            var commandResult = ModbusHelper.GetWriteBoolModbusCommand(address, value, Station);
+            string str = $"{dateTime.Minute:D2}{dateTime.Hour:D2}{dateTime.Day:D2}{dateTime.Month:D2}";
+            if (Station.IsNullOrEmpty()) Station = string.Empty;
+            if (Station.Length < 12) Station = Station.PadLeft(12, '0');
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.Freeze, str.ByHexStringToBytes().Reverse().ToArray(), Station.ByHexStringToBytes().Reverse().ToArray());
             if (commandResult.IsSuccess)
             {
-                ResponsedData result = await SendThenReturnAsync(commandResult, token);
-                return (MessageBase)result.RequestInfo;
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
             }
             else
             {
-                return OperResult.CreateFailedResult<bool[]>(commandResult);
+                return OperResult.CreateFailedResult<string>(commandResult);
             }
         }
         catch (Exception ex)
         {
-            return new OperResult<bool[]>(ex);
+            return new OperResult<string>(ex);
         }
+
     }
 
-    private async Task<ResponsedData> SendThenReturnAsync(OperResult<byte[]> commandResult, CancellationToken token)
+    /// <summary>
+    /// 读取通信地址
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult<string>> ReadDeviceStationAsync(CancellationToken token = default)
     {
-        var item = commandResult.Content;
-        await Task.Delay(FrameTime, token);
-        var result = await WaitingClientEx.SendThenResponseAsync(item, TimeOut, token);
-        return result;
+        try
+        {
+            await ConnectAsync(token);
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.ReadStation, null, "AAAAAAAAAAAA".ByHexStringToBytes());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    var buffer = result1.Content.SelectMiddle(0, 6).BytesAdd(-0x33);
+                    return OperResult.CreateSuccessResult(buffer.Reverse().ToArray().ToHexString());
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
     }
+
+
+    /// <summary>
+    /// 修改波特率
+    /// </summary>
+    /// <param name="baudRate"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> WriteBaudRateAsync(int baudRate, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+            byte baudRateByte;
+            switch (baudRate)
+            {
+                case 600: baudRateByte = 0x02; break;
+                case 1200: baudRateByte = 0x04; break;
+                case 2400: baudRateByte = 0x08; break;
+                case 4800: baudRateByte = 0x10; break;
+                case 9600: baudRateByte = 0x20; break;
+                case 19200: baudRateByte = 0x40; break;
+                default: return new OperResult<string>($"不支持此波特率:{baudRate}");
+            }
+            if (Station.IsNullOrEmpty()) Station = string.Empty;
+            if (Station.Length < 12) Station = Station.PadLeft(12, '0');
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.WriteBaudRate, new byte[] { baudRateByte }, Station.ByHexStringToBytes().Reverse().ToArray());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+    /// <summary>
+    /// 更新通信地址
+    /// </summary>
+    /// <param name="station"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> WriteDeviceStationAsync(string station, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.WriteStation, station.ByHexStringToBytes().Reverse().ToArray(), "AAAAAAAAAAAA".ByHexStringToBytes());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+    /// <summary>
+    /// 修改密码
+    /// </summary>
+    /// <param name="level"></param>
+    /// <param name="oldPassword"></param>
+    /// <param name="newPassword"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> WritePasswordAsync(byte level, string oldPassword, string newPassword, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+
+            if (Station.IsNullOrEmpty()) Station = string.Empty;
+            if (Station.Length < 12) Station = Station.PadLeft(12, '0');
+            string str = $"04000C{level:D2}";
+
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.WritePassword,
+                str.ByHexStringToBytes().Reverse().ToArray()
+                .SpliceArray(oldPassword.ByHexStringToBytes().Reverse().ToArray())
+                .SpliceArray(newPassword.ByHexStringToBytes().Reverse().ToArray())
+                , Station.ByHexStringToBytes().Reverse().ToArray());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+
+    #endregion
+
 }
+/// <summary>
+/// 控制码
+/// </summary>
+public enum ControlCode : byte
+{
+    /// <summary>
+    /// 读数据
+    /// </summary>
+    Read = 0x11,
+    /// <summary>
+    /// 读后续数据
+    /// </summary>
+    ReadSub = 0x12,
+    /// <summary>
+    /// 读站号
+    /// </summary>
+    ReadStation = 0x13,
+    /// <summary>
+    /// 写数据
+    /// </summary>
+    Write = 0x14,
+    /// <summary>
+    /// 写站号
+    /// </summary>
+    WriteStation = 0x15,
+    /// <summary>
+    /// 广播校时
+    /// </summary>
+    BroadcastTime = 0x08,
+    /// <summary>
+    /// 冻结
+    /// </summary>
+    Freeze = 0x16,
+    /// <summary>
+    /// 更新波特率
+    /// </summary>
+    WriteBaudRate = 0x17,
+    /// <summary>
+    /// 更新密码
+    /// </summary>
+    WritePassword = 0x18,
+}

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007Address.cs

@@ -0,0 +1,146 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using System.Text;
+
+using ThingsGateway.Foundation.Extension.Byte;
+
+namespace ThingsGateway.Foundation.Adapter.DLT645;
+
+/// <summary>
+/// DLT645_2007Address
+/// </summary>
+public class DLT645_2007Address : DeviceAddressBase
+{
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public DLT645_2007Address()
+    {
+
+    }
+    /// <inheritdoc/>
+    public DLT645_2007Address(string address, ushort len)
+    {
+        Parse(address, len);
+    }
+
+    /// <inheritdoc/>
+    public DLT645_2007Address(string address, byte[] station)
+    {
+        Station = station;
+        Parse(address, 0);
+    }
+
+    /// <summary>
+    /// 数据标识
+    /// </summary>
+    public byte[] DataId { get; set; } = new byte[0];
+    /// <summary>
+    /// 反转解析
+    /// </summary>
+    public bool Reverse { get; set; } = true;
+    /// <summary>
+    /// 站号信息
+    /// </summary>
+    public byte[] Station { get; set; } = new byte[0];
+
+    /// <inheritdoc/>
+    public override void Parse(string address, int length)
+    {
+        var result = ParseFrom(address, length);
+        if (result.IsSuccess)
+        {
+            Length = result.Content.Length;
+            AddressStart = result.Content.AddressStart;
+            DataId = result.Content.DataId;
+            Station = result.Content.Station;
+        }
+        else
+        {
+            throw new Exception(result.Message);
+        }
+    }
+    /// <summary>
+    /// 解析地址
+    /// </summary>
+    /// <param name="address"></param>
+    /// <param name="length"></param>
+    /// <returns></returns>
+    public static OperResult<DLT645_2007Address> ParseFrom(string address, int length)
+    {
+
+        try
+        {
+            DLT645_2007Address dLT645_2007Address = new();
+            byte[] array;
+            array = new byte[0];
+            dLT645_2007Address.Length = length;
+            if (address.IndexOf(';') < 0)
+            {
+                array = address.ByHexStringToBytes().Reverse().ToArray();
+            }
+            else
+            {
+                string[] strArray = address.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+
+                for (int index = 0; index < strArray.Length; ++index)
+                {
+                    if (strArray[index].ToUpper().StartsWith("S="))
+                    {
+                        var station = strArray[index].Substring(2);
+                        if (station.IsNullOrEmpty()) return new OperResult<DLT645_2007Address>("通讯地址不能为空");
+                        if (station.Length < 12)
+                            station = station.PadLeft(12, '0');
+                        dLT645_2007Address.Station = station.ByHexStringToBytes().Reverse().ToArray();
+                    }
+                    else if (!strArray[index].Contains("r="))
+                    {
+                        dLT645_2007Address.Reverse = strArray[index].Substring(2).GetBoolValue();
+                    }
+                    else if (!strArray[index].Contains("="))
+                    {
+                        array = strArray[index].ByHexStringToBytes().Reverse().ToArray();
+                    }
+                }
+            }
+            dLT645_2007Address.DataId = array;
+            return OperResult.CreateSuccessResult(dLT645_2007Address);
+
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<DLT645_2007Address>(ex);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        StringBuilder stringGeter = new();
+        if (Station.Length > 0)
+        {
+            stringGeter.Append("s=" + Station.Reverse().ToArray().ToHexString() + ";");
+        }
+        if (DataId.Length > 0)
+        {
+            stringGeter.Append(DataId.Reverse().ToArray().ToHexString() + ";");
+        }
+        if (!Reverse)
+        {
+            stringGeter.Append("s=" + Reverse.ToString() + ";");
+        }
+        return stringGeter.ToString();
+    }
+
+
+}

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007BitConverter.cs

@@ -0,0 +1,106 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+
+using System.Text;
+
+using ThingsGateway.Foundation.Extension.Byte;
+using ThingsGateway.Foundation.Extension.Generic;
+
+namespace ThingsGateway.Foundation.Adapter.DLT645;
+/// <summary>
+/// DLT645_2007
+/// </summary>
+public class DLT645_2007BitConverter : ThingsGatewayBitConverter
+{
+    /// <summary>
+    /// DLT645_2007
+    /// </summary>
+    public DLT645_2007BitConverter(EndianType endianType) : base(endianType)
+    {
+    }
+
+    /// <summary>
+    /// DLT645协议转换double
+    /// </summary>
+    /// <param name="buffer">带数据项标识</param>
+    /// <param name="offset"></param>
+    /// <returns></returns>
+    public override double ToDouble(byte[] buffer, int offset)
+    {
+        return Convert.ToDouble(this.ToString(buffer, offset, buffer.Length));
+    }
+
+
+    /// <inheritdoc/>
+    public override string ToString(byte[] buffer)
+    {
+        return this.ToString(buffer, 0, buffer.Length);
+    }
+
+    /// <inheritdoc/>
+    public override string ToString(byte[] buffer, int offset, int length)
+    {
+        buffer = buffer.SelectMiddle(offset, length);
+        buffer = buffer.BytesAdd(-0x33);
+        var dataInfos = DLT645Helper.GetDataInfos(buffer);
+        StringBuilder stringBuilder = new();
+        foreach (var dataInfo in dataInfos)
+        {
+            //实际数据
+            var content = buffer.SelectMiddle(4, dataInfo.ByteLength).Reverse().ToArray();
+            if (dataInfo.IsSigned)//可能为负数
+            {
+                if (content[0] > 0x80)//最高位是表示正负
+                {
+                    content[0] = (byte)(content[0] - 0x80);
+                    if (dataInfo.Digtal == 0)//无小数点
+                    {
+                        stringBuilder.AppendLine($"-{content.ToHexString()}");
+                    }
+                    else
+                    {
+                        stringBuilder.AppendLine((-(Convert.ToDouble(content.ToHexString()) / Math.Pow(10.0, dataInfo.Digtal))).ToString());
+                    }
+                }
+                else
+                {
+                    ToString(stringBuilder, dataInfo, content);
+                }
+            }
+            else
+            {
+                ToString(stringBuilder, dataInfo, content);
+            }
+        }
+
+        return stringBuilder.ToString();
+
+        static void ToString(StringBuilder stringBuilder, DataInfo dataInfo, byte[] content)
+        {
+            if (dataInfo.Digtal < 0)
+            {
+                stringBuilder.AppendLine($"{Encoding.ASCII.GetString(content)}");
+            }
+            else if (dataInfo.Digtal == 0)//无小数点
+            {
+                stringBuilder.AppendLine($"{content.ToHexString()}");
+            }
+            else
+            {
+                stringBuilder.AppendLine(((Convert.ToDouble(content.ToHexString()) / Math.Pow(10.0, dataInfo.Digtal))).ToString());
+            }
+        }
+    }
+
+
+}

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007DataHandleAdapter.cs

@@ -0,0 +1,192 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using System.ComponentModel;
+
+using ThingsGateway.Foundation.Adapter.Modbus;
+using ThingsGateway.Foundation.Extension.Generic;
+
+namespace ThingsGateway.Foundation.Adapter.DLT645;
+
+/// <summary>
+/// DLT645_2007DataHandleAdapter
+/// </summary>
+public class DLT645_2007DataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapter<DLT645_2007Message>
+{
+    /// <summary>
+    /// 增加FE FE FE FE的报文头部
+    /// </summary>
+    [Description("前导符报文头")]
+    public bool EnableFEHead { get; set; }
+
+    /// <inheritdoc/>
+    public override byte[] PackCommand(byte[] command)
+    {
+        //打包时加上4个FE字节
+        if (EnableFEHead)
+        {
+            return DataTransUtil.SpliceArray(new byte[4] { 0xFE, 0xFE, 0xFE, 0xFE }, command);
+        }
+        return command;
+    }
+
+    /// <inheritdoc/>
+    protected override DLT645_2007Message GetInstance()
+    {
+        return new DLT645_2007Message();
+    }
+
+
+    /// <inheritdoc/>
+    protected override FilterResult UnpackResponse(DLT645_2007Message request, byte[] send, byte[] body, byte[] response)
+    {
+        //因为设备可能带有FE前导符开头，这里找到0x68的位置
+        int headCodeIndex = -1;
+        if (response != null)
+        {
+            for (int index = 0; index < response.Length; index++)
+            {
+                if (response[index] == 0x68)
+                {
+                    headCodeIndex = index;
+                    break;
+                }
+            }
+        }
+        int sendHeadCodeIndex = 0;
+        if (send != null)
+        {
+            for (int index = 0; index < send.Length; index++)
+            {
+                if (send[index] == 0x68)
+                {
+                    sendHeadCodeIndex = index;
+                    break;
+                }
+            }
+        }
+
+        //帧起始符 地址域  帧起始符 控制码 数据域长度共10个字节
+        if (headCodeIndex < 0 || headCodeIndex + 10 > response.Length)
+            return FilterResult.Cache;
+
+
+        var len = 10 + response[headCodeIndex + 9] + 2;
+
+        if (response.Length - headCodeIndex < len)
+        {
+            return FilterResult.Cache;
+        }
+        if (response.Length - headCodeIndex >= len && response[len + headCodeIndex - 1] == 0x16)
+        {
+
+            //检查校验码
+            int sumCheck = 0;
+            for (int i = headCodeIndex; i < len + headCodeIndex - 2; i++)
+                sumCheck += response[i];
+            if ((byte)sumCheck != response[len + headCodeIndex - 2])
+            {
+                //校验错误
+                request.Message = "和校验错误";
+                request.ResultCode = ResultCode.Fail;
+                return FilterResult.Success;
+            }
+
+            if (
+                (response[headCodeIndex + 1] != send[sendHeadCodeIndex + 1]) ||
+                (response[headCodeIndex + 2] != send[sendHeadCodeIndex + 2]) ||
+                (response[headCodeIndex + 3] != send[sendHeadCodeIndex + 3]) ||
+                (response[headCodeIndex + 4] != send[sendHeadCodeIndex + 4]) ||
+                (response[headCodeIndex + 5] != send[sendHeadCodeIndex + 5]) ||
+                (response[headCodeIndex + 6] != send[sendHeadCodeIndex + 6])
+                )//设备地址不符合时，返回错误
+            {
+
+                if (
+                (response[headCodeIndex + 1] == 0xAA) &&
+                (response[headCodeIndex + 2] == 0xAA) &&
+                (response[headCodeIndex + 3] == 0xAA) &&
+                (response[headCodeIndex + 4] == 0xAA) &&
+                (response[headCodeIndex + 5] == 0xAA) &&
+                (response[headCodeIndex + 6] == 0xAA)
+                )//读写通讯地址例外
+                {
+
+                }
+                else
+                {
+                    request.Message = "返回地址不符合规则";
+                    request.ResultCode = ResultCode.Fail;
+                    return FilterResult.Success;
+                }
+
+            }
+
+
+
+            if ((response[headCodeIndex + 8] != send[sendHeadCodeIndex + 8] + 0x80))//控制码不符合时，返回错误
+            {
+                request.Message = "返回控制码：" + $"0x{response[headCodeIndex + 8]:X2}，请求控制码：" + $"0x{send[sendHeadCodeIndex + 8]:X2}，不符合规则";
+                request.ResultCode = ResultCode.Fail;
+                return FilterResult.Success;
+            }
+
+
+
+
+            if ((response[headCodeIndex + 8] & 0x40) == 0x40)//控制码bit6为1时，返回错误
+            {
+                byte byte1 = (byte)(response[headCodeIndex + 10] - 0x33);
+                var error = DLT645Helper.Get2007ErrorMessage(byte1);
+                request.Message = "异常控制码：" + $"0x{response[headCodeIndex + 8]:X2}，错误信息：{error}";
+                request.ResultCode = ResultCode.Fail;
+                return FilterResult.Success;
+            }
+
+            if (send[sendHeadCodeIndex + 8] == (byte)ControlCode.Read ||
+    send[sendHeadCodeIndex + 8] == (byte)ControlCode.Write
+    )
+            {
+                //数据标识不符合时，返回错误
+                if (
+                (response[headCodeIndex + 10] == send[sendHeadCodeIndex + 10]) &&
+                (response[headCodeIndex + 11] == send[sendHeadCodeIndex + 11]) &&
+                (response[headCodeIndex + 12] == send[sendHeadCodeIndex + 12]) &&
+                (response[headCodeIndex + 13] == send[sendHeadCodeIndex + 13])
+                )
+                {
+
+                }
+                else
+                {
+                    request.Message = "返回数据标识不符合规则";
+                    request.ResultCode = ResultCode.Fail;
+                    return FilterResult.Success;
+                }
+
+            }
+
+
+            request.Content = response.RemoveBegin(headCodeIndex + 10).RemoveLast(response.Length + 2 - len - headCodeIndex);
+            request.ResultCode = ResultCode.Success;
+            return FilterResult.Success;
+
+        }
+        else
+        {
+            request.ResultCode = ResultCode.Error;
+            return FilterResult.Success;
+
+        }
+    }
+
+}

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007Message.cs

@@ -14,7 +14,7 @@ namespace ThingsGateway.Foundation.Adapter.Modbus;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class ModbusRtuMessage : MessageBase, IMessage
+public class DLT645_2007Message : MessageBase, IMessage
 {
     /// <inheritdoc/>
     public override int HeadBytesLength => -1;

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007OverTcp.cs

@@ -0,0 +1,416 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using System.ComponentModel;
+
+using ThingsGateway.Foundation.Extension.Byte;
+using ThingsGateway.Foundation.Extension.Generic;
+
+namespace ThingsGateway.Foundation.Adapter.DLT645;
+/// <summary>
+/// DLT645_2007
+/// </summary>
+public class DLT645_2007OverTcp : ReadWriteDevicesTcpClientBase
+{
+
+    /// <summary>
+    /// DLT645_2007
+    /// </summary>
+    /// <param name="tcpClient"></param>
+    public DLT645_2007OverTcp(TcpClientEx tcpClient) : base(tcpClient)
+    {
+        ThingsGatewayBitConverter = new DLT645_2007BitConverter(EndianType.Big);
+        RegisterByteLength = 2;
+    }
+
+
+
+    /// <summary>
+    /// 组包缓存时间/ms
+    /// </summary>
+    [Description("组包缓存时间ms")]
+    public int CacheTimeout { get; set; } = 1000;
+
+    /// <summary>
+    /// 增加FE FE FE FE的报文头部
+    /// </summary>
+    [Description("前导符报文头")]
+    public bool EnableFEHead { get; set; }
+
+    /// <summary>
+    /// 帧前时间ms
+    /// </summary>
+    [Description("帧前时间ms")]
+    public int FrameTime { get; set; }
+    /// <summary>
+    /// 写入需操作员代码
+    /// </summary>
+    [Description("操作员代码")]
+    public string OperCode { get; set; }
+
+    /// <summary>
+    /// 写入密码
+    /// </summary>
+    [Description("写入密码")]
+    public string Password { get; set; }
+
+    /// <summary>
+    /// 通讯地址BCD码，一般应该是12个字符
+    /// </summary>
+    [Description("通讯地址")]
+    public string Station { get; set; }
+    /// <inheritdoc/>
+    public override string GetAddressDescription() => base.GetAddressDescription() + Environment.NewLine;
+    /// <inheritdoc/>
+    public override async Task<OperResult<byte[]>> ReadAsync(string address, int length, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+            var commandResult = DLT645Helper.GetDLT645_2007Command(address, length, (byte)ControlCode.Read, Station);
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                return (MessageBase)result.RequestInfo;
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<byte[]>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<byte[]>(ex);
+        }
+
+    }
+
+    /// <inheritdoc/>
+    public override void SetDataAdapter()
+    {
+        var dataHandleAdapter = new DLT645_2007DataHandleAdapter
+        {
+            EnableFEHead = EnableFEHead
+        };
+        TcpClientEx.SetDataHandlingAdapter(dataHandleAdapter);
+    }
+    /// <inheritdoc/>
+    public override async Task<OperResult> WriteAsync(string address, string value, CancellationToken token = default)
+    {
+
+        try
+        {
+            await ConnectAsync(token);
+            Password ??= string.Empty;
+            OperCode ??= string.Empty;
+            if (Password.Length < 8)
+                Password = Password.PadLeft(8, '0');
+            if (OperCode.Length < 8)
+                OperCode = OperCode.PadLeft(8, '0');
+            var data = DataTransUtil.SpliceArray(Password.ByHexStringToBytes(), OperCode.ByHexStringToBytes());
+            string[] strArray = value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            var commandResult = DLT645Helper.GetDLT645_2007Command(address, 1, (byte)ControlCode.Write, Station, data, strArray);
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                return (MessageBase)result.RequestInfo;
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<byte[]>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<byte[]>(ex);
+        }
+
+
+    }
+
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, byte[] value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, uint value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, byte value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, double value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, float value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, long value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, ulong value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, ushort value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, short value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, int value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+
+
+    /// <inheritdoc/>
+    public override Task<OperResult> WriteAsync(string address, bool[] value, CancellationToken token = default) => WriteAsync(address, value.ToString(), token);
+
+
+    #region 其他方法
+
+    /// <summary>
+    /// 广播校时
+    /// </summary>
+    /// <param name="dateTime"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public OperResult BroadcastTime(DateTime dateTime, CancellationToken token = default)
+    {
+        try
+        {
+            Connect(token);
+            string str = $"{dateTime.Second:D2}{dateTime.Minute:D2}{dateTime.Hour:D2}{dateTime.Day:D2}{dateTime.Month:D2}{dateTime.Year % 100:D2}";
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.BroadcastTime, str.ByHexStringToBytes().Reverse().ToArray(), "999999999999".ByHexStringToBytes());
+            if (commandResult.IsSuccess)
+            {
+                TcpClientEx.Send(commandResult.Content);
+                return OperResult.CreateSuccessResult();
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+    /// <summary>
+    /// 冻结
+    /// </summary>
+    /// <param name="dateTime"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> FreezeAsync(DateTime dateTime, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+            string str = $"{dateTime.Minute:D2}{dateTime.Hour:D2}{dateTime.Day:D2}{dateTime.Month:D2}";
+            if (Station.IsNullOrEmpty()) Station = string.Empty;
+            if (Station.Length < 12) Station = Station.PadLeft(12, '0');
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.Freeze, str.ByHexStringToBytes().Reverse().ToArray(), Station.ByHexStringToBytes().Reverse().ToArray());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+    /// <summary>
+    /// 读取通信地址
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult<string>> ReadDeviceStationAsync(CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.ReadStation, null, "AAAAAAAAAAAA".ByHexStringToBytes());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    var buffer = result1.Content.SelectMiddle(0, 6).BytesAdd(-0x33);
+                    return OperResult.CreateSuccessResult(buffer.Reverse().ToArray().ToHexString());
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+
+    /// <summary>
+    /// 修改波特率
+    /// </summary>
+    /// <param name="baudRate"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> WriteBaudRateAsync(int baudRate, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+            byte baudRateByte;
+            switch (baudRate)
+            {
+                case 600: baudRateByte = 0x02; break;
+                case 1200: baudRateByte = 0x04; break;
+                case 2400: baudRateByte = 0x08; break;
+                case 4800: baudRateByte = 0x10; break;
+                case 9600: baudRateByte = 0x20; break;
+                case 19200: baudRateByte = 0x40; break;
+                default: return new OperResult<string>($"不支持此波特率:{baudRate}");
+            }
+            if (Station.IsNullOrEmpty()) Station = string.Empty;
+            if (Station.Length < 12) Station = Station.PadLeft(12, '0');
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.WriteBaudRate, new byte[] { baudRateByte }, Station.ByHexStringToBytes().Reverse().ToArray());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+    /// <summary>
+    /// 更新通信地址
+    /// </summary>
+    /// <param name="station"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> WriteDeviceStationAsync(string station, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.WriteStation, station.ByHexStringToBytes().Reverse().ToArray(), "AAAAAAAAAAAA".ByHexStringToBytes());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+    /// <summary>
+    /// 修改密码
+    /// </summary>
+    /// <param name="level"></param>
+    /// <param name="oldPassword"></param>
+    /// <param name="newPassword"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public async Task<OperResult> WritePasswordAsync(byte level, string oldPassword, string newPassword, CancellationToken token = default)
+    {
+        try
+        {
+            await ConnectAsync(token);
+
+            if (Station.IsNullOrEmpty()) Station = string.Empty;
+            if (Station.Length < 12) Station = Station.PadLeft(12, '0');
+            string str = $"04000C{level:D2}";
+
+            var commandResult = DLT645Helper.GetDLT645_2007Command((byte)ControlCode.WritePassword,
+                str.ByHexStringToBytes().Reverse().ToArray()
+                .SpliceArray(oldPassword.ByHexStringToBytes().Reverse().ToArray())
+                .SpliceArray(newPassword.ByHexStringToBytes().Reverse().ToArray())
+                , Station.ByHexStringToBytes().Reverse().ToArray());
+            if (commandResult.IsSuccess)
+            {
+                var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
+                var result1 = ((MessageBase)result.RequestInfo);
+                if (result1.IsSuccess)
+                {
+                    return OperResult.CreateSuccessResult();
+                }
+                else
+                {
+                    return OperResult.CreateFailedResult<string>(result1);
+                }
+            }
+            else
+            {
+                return OperResult.CreateFailedResult<string>(commandResult);
+            }
+        }
+        catch (Exception ex)
+        {
+            return new OperResult<string>(ex);
+        }
+
+    }
+
+
+    #endregion
+
+}

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/ModbusRtuDataHandleAdapter.cs

@@ -1,60 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-namespace ThingsGateway.Foundation.Adapter.Modbus;
-
-/// <summary>
-/// Rtu适配器
-/// </summary>
-public class ModbusRtuDataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapter<ModbusRtuMessage>
-{
-    /// <summary>
-    /// 检测CRC
-    /// </summary>
-    public bool Crc16CheckEnable { get; set; } = true;
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    public override byte[] PackCommand(byte[] command)
-    {
-        return ModbusHelper.AddCrc(command);
-    }
-
-    /// <inheritdoc/>
-    protected override ModbusRtuMessage GetInstance()
-    {
-        return new ModbusRtuMessage();
-    }
-
-
-    /// <inheritdoc/>
-    protected override FilterResult UnpackResponse(ModbusRtuMessage request, byte[] send, byte[] body, byte[] response)
-    {
-        //理想状态检测
-        var result = ModbusHelper.GetModbusRtuData(send, response, Crc16CheckEnable);
-        if (result.IsSuccess)
-        {
-            request.ResultCode = result.ResultCode;
-            request.Message = result.Message;
-            request.Content = result.Content1;
-        }
-        else
-        {
-            request.ResultCode = result.ResultCode;
-            request.Message = result.Message;
-        }
-        return result.Content2;
-    }
-
-}

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/ThingsGateway.Foundation.Adapter.DLT645.xml

@@ -0,0 +1,462 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>ThingsGateway.Foundation.Adapter.DLT645</name>
+    </assembly>
+    <members>
+        <member name="T:ThingsGateway.Foundation.Adapter.DLT645.DataInfo">
+            <summary>
+            解析参数
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DataInfo.ByteLength">
+            <summary>
+            解析长度
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DataInfo.Digtal">
+            <summary>
+            小数位
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DataInfo.IsSigned">
+            <summary>
+            有符号解析
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645Helper.GetDataInfos(System.Byte[])">
+            <summary>
+            获取返回的解析信息
+            </summary>
+            <param name="buffer"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645Helper.GetDLT645_2007Command(System.String,System.Int32,System.Byte,System.String,System.Byte[],System.String[])">
+            <summary>
+            获取DLT645报文
+            </summary>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007">
+            <summary>
+            DLT645_2007
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.#ctor(ThingsGateway.Foundation.Serial.SerialsSession)">
+            <summary>
+            DLT645_2007
+            </summary>
+            <param name="serialSession"></param>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.CacheTimeout">
+            <summary>
+            组包缓存时间/ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.EnableFEHead">
+            <summary>
+            增加FE FE FE FE的报文头部
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.FrameTime">
+            <summary>
+            帧前时间ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.OperCode">
+            <summary>
+            写入需操作员代码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.Password">
+            <summary>
+            写入密码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.Station">
+            <summary>
+            通讯地址BCD码，一般应该是12个字符
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.GetAddressDescription">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.ReadAsync(System.String,System.Int32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.SetDataAdapter">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.String,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Byte[],System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.UInt32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Byte,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Double,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Single,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Int64,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.UInt64,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.UInt16,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Int16,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Int32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteAsync(System.String,System.Boolean[],System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.BroadcastTime(System.DateTime,System.Threading.CancellationToken)">
+            <summary>
+            广播校时
+            </summary>
+            <param name="dateTime"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.FreezeAsync(System.DateTime,System.Threading.CancellationToken)">
+            <summary>
+            冻结
+            </summary>
+            <param name="dateTime"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.ReadDeviceStationAsync(System.Threading.CancellationToken)">
+            <summary>
+            读取通信地址
+            </summary>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteBaudRateAsync(System.Int32,System.Threading.CancellationToken)">
+            <summary>
+            修改波特率
+            </summary>
+            <param name="baudRate"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WriteDeviceStationAsync(System.String,System.Threading.CancellationToken)">
+            <summary>
+            更新通信地址
+            </summary>
+            <param name="station"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007.WritePasswordAsync(System.Byte,System.String,System.String,System.Threading.CancellationToken)">
+            <summary>
+            修改密码
+            </summary>
+            <param name="level"></param>
+            <param name="oldPassword"></param>
+            <param name="newPassword"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Adapter.DLT645.ControlCode">
+            <summary>
+            控制码
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.Read">
+            <summary>
+            读数据
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.ReadSub">
+            <summary>
+            读后续数据
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.ReadStation">
+            <summary>
+            读站号
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.Write">
+            <summary>
+            写数据
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.WriteStation">
+            <summary>
+            写站号
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.BroadcastTime">
+            <summary>
+            广播校时
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.Freeze">
+            <summary>
+            冻结
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.WriteBaudRate">
+            <summary>
+            更新波特率
+            </summary>
+        </member>
+        <member name="F:ThingsGateway.Foundation.Adapter.DLT645.ControlCode.WritePassword">
+            <summary>
+            更新密码
+            </summary>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address">
+            <summary>
+            DLT645_2007Address
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.#ctor">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.#ctor(System.String,System.UInt16)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.#ctor(System.String,System.Byte[])">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.DataId">
+            <summary>
+            数据标识
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.Reverse">
+            <summary>
+            反转解析
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.Station">
+            <summary>
+            站号信息
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.Parse(System.String,System.Int32)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.ParseFrom(System.String,System.Int32)">
+            <summary>
+            解析地址
+            </summary>
+            <param name="address"></param>
+            <param name="length"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007Address.ToString">
+            <inheritdoc/>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007BitConverter">
+            <summary>
+            DLT645_2007
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007BitConverter.#ctor(TouchSocket.Core.EndianType)">
+            <summary>
+            DLT645_2007
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007BitConverter.ToDouble(System.Byte[],System.Int32)">
+            <summary>
+            DLT645协议转换double
+            </summary>
+            <param name="buffer">带数据项标识</param>
+            <param name="offset"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007BitConverter.ToString(System.Byte[])">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007BitConverter.ToString(System.Byte[],System.Int32,System.Int32)">
+            <inheritdoc/>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007DataHandleAdapter">
+            <summary>
+            DLT645_2007DataHandleAdapter
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007DataHandleAdapter.EnableFEHead">
+            <summary>
+            增加FE FE FE FE的报文头部
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007DataHandleAdapter.PackCommand(System.Byte[])">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007DataHandleAdapter.GetInstance">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007DataHandleAdapter.UnpackResponse(ThingsGateway.Foundation.Adapter.Modbus.DLT645_2007Message,System.Byte[],System.Byte[],System.Byte[])">
+            <inheritdoc/>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp">
+            <summary>
+            DLT645_2007
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.#ctor(ThingsGateway.Foundation.TcpClientEx)">
+            <summary>
+            DLT645_2007
+            </summary>
+            <param name="tcpClient"></param>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.CacheTimeout">
+            <summary>
+            组包缓存时间/ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.EnableFEHead">
+            <summary>
+            增加FE FE FE FE的报文头部
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.FrameTime">
+            <summary>
+            帧前时间ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.OperCode">
+            <summary>
+            写入需操作员代码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.Password">
+            <summary>
+            写入密码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.Station">
+            <summary>
+            通讯地址BCD码，一般应该是12个字符
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.GetAddressDescription">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.ReadAsync(System.String,System.Int32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.SetDataAdapter">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.String,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Byte[],System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.UInt32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Byte,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Double,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Single,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Int64,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.UInt64,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.UInt16,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Int16,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Int32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteAsync(System.String,System.Boolean[],System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.BroadcastTime(System.DateTime,System.Threading.CancellationToken)">
+            <summary>
+            广播校时
+            </summary>
+            <param name="dateTime"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.FreezeAsync(System.DateTime,System.Threading.CancellationToken)">
+            <summary>
+            冻结
+            </summary>
+            <param name="dateTime"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.ReadDeviceStationAsync(System.Threading.CancellationToken)">
+            <summary>
+            读取通信地址
+            </summary>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteBaudRateAsync(System.Int32,System.Threading.CancellationToken)">
+            <summary>
+            修改波特率
+            </summary>
+            <param name="baudRate"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WriteDeviceStationAsync(System.String,System.Threading.CancellationToken)">
+            <summary>
+            更新通信地址
+            </summary>
+            <param name="station"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp.WritePasswordAsync(System.Byte,System.String,System.String,System.Threading.CancellationToken)">
+            <summary>
+            修改密码
+            </summary>
+            <param name="level"></param>
+            <param name="oldPassword"></param>
+            <param name="newPassword"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="T:ThingsGateway.Foundation.Adapter.Modbus.DLT645_2007Message">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.Modbus.DLT645_2007Message.HeadBytesLength">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.DLT645_2007Message.CheckHeadBytes(System.Byte[])">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.DLT645_2007Message.SendBytesThen">
+            <inheritdoc/>
+        </member>
+    </members>
+</doc>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusAddress.cs

@@ -60,45 +60,94 @@ public class ModbusAddress : DeviceAddressBase
     /// <inheritdoc/>
     public override void Parse(string address, int length)
     {
-        Length = length;
-        if (address.IndexOf(';') < 0)
+        var result = ParseFrom(address, length);
+        if (result.IsSuccess)
         {
-            Address(address);
-
+            Length = result.Content.Length;
+            AddressStart = result.Content.AddressStart;
+            ReadFunction = result.Content.ReadFunction;
+            if (result.Content.Station > 0)
+                Station = result.Content.Station;
+            WriteFunction = result.Content.WriteFunction;
         }
-        else
+    }
+    /// <summary>
+    /// 解析地址
+    /// </summary>
+    /// <param name="address"></param>
+    /// <param name="length"></param>
+    /// <returns></returns>
+    public static OperResult<ModbusAddress> ParseFrom(string address, int length)
+    {
+
+        try
         {
-            string[] strArray = address.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            for (int index = 0; index < strArray.Length; ++index)
+            ModbusAddress modbusAddress = new()
             {
-                if (strArray[index].ToUpper().StartsWith("S="))
+                Length = length
+            };
+            if (address.IndexOf(';') < 0)
+            {
+                Address(address);
+
+            }
+            else
+            {
+                string[] strArray = address.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+                for (int index = 0; index < strArray.Length; ++index)
                 {
-                    if (Convert.ToInt16(strArray[index].Substring(2)) > 0)
-                        Station = byte.Parse(strArray[index].Substring(2));
-                }
-                else if (strArray[index].ToUpper().StartsWith("W="))
-                {
-                    if (Convert.ToInt16(strArray[index].Substring(2)) > 0)
-                        this.WriteFunction = byte.Parse(strArray[index].Substring(2));
-                }
-                else if (!strArray[index].Contains("="))
-                {
-                    Address(strArray[index]);
+                    if (strArray[index].ToUpper().StartsWith("S="))
+                    {
+                        if (Convert.ToInt16(strArray[index].Substring(2)) > 0)
+                            modbusAddress.Station = byte.Parse(strArray[index].Substring(2));
+                    }
+                    else if (strArray[index].ToUpper().StartsWith("W="))
+                    {
+                        if (Convert.ToInt16(strArray[index].Substring(2)) > 0)
+                            modbusAddress.WriteFunction = byte.Parse(strArray[index].Substring(2));
+                    }
+                    else if (!strArray[index].Contains("="))
+                    {
+                        Address(strArray[index]);
+                    }
                 }
             }
-        }
 
-        void Address(string address)
+            return OperResult.CreateSuccessResult(modbusAddress);
+
+            void Address(string address)
+            {
+                var readF = ushort.Parse(address.Substring(0, 1));
+                if (readF > 4)
+                    throw new("功能码错误");
+                switch (readF)
+                {
+                    case 0:
+                        modbusAddress.ReadFunction = 1;
+                        break;
+                    case 1:
+                        modbusAddress.ReadFunction = 2;
+                        break;
+                    case 3:
+                        modbusAddress.ReadFunction = 4;
+                        break;
+                    case 4:
+                        modbusAddress.ReadFunction = 3;
+                        break;
+                }
+                modbusAddress.AddressStart = int.Parse(address.Substring(1)) - 1;
+            }
+
+
+        }
+        catch (Exception ex)
         {
-            var readF = ushort.Parse(address.Substring(0, 1));
-            if (readF > 4)
-                throw new("功能码错误");
-            GetFunction(readF);
-            AddressStart = int.Parse(address.Substring(1)) - 1;
+            return new OperResult<ModbusAddress>(ex);
         }
-
     }
 
+
+
     /// <inheritdoc/>
     public override string ToString()
     {
@@ -115,24 +164,6 @@ public class ModbusAddress : DeviceAddressBase
         return stringGeter.ToString();
     }
 
-    private void GetFunction(ushort readF)
-    {
-        switch (readF)
-        {
-            case 0:
-                ReadFunction = 1;
-                break;
-            case 1:
-                ReadFunction = 2;
-                break;
-            case 3:
-                ReadFunction = 4;
-                break;
-            case 4:
-                ReadFunction = 3;
-                break;
-        }
-    }
     private string GetFunctionString(int readF)
     {
         return readF switch

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusHelper.cs

@@ -124,10 +124,10 @@ internal class ModbusHelper
     {
         if (response.Length < 3)
             return new OperResult<byte[], FilterResult>("数据长度不足" + response.ToHexString()) { Content2 = FilterResult.Cache };
-
-        if (crcCheck && !EasyCRC16.CheckCRC16(response))
-            return new OperResult<byte[], FilterResult>("Crc校验失败" + DataTransUtil.ByteToHexString(response, ' ')) { Content2 = FilterResult.Success };
-        return GetModbusData(send, response.RemoveLast(2));
+        var data = response.SelectMiddle(0, response[2] + 5);
+        if (crcCheck && !EasyCRC16.CheckCRC16(data))
+            return new OperResult<byte[], FilterResult>("Crc校验失败" + DataTransUtil.ByteToHexString(data, ' ')) { Content2 = FilterResult.Success };
+        return GetModbusData(send, data.RemoveLast(2));
     }
     /// <summary>
     /// 获取读取报文

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtu.cs

@@ -24,8 +24,8 @@ public class ModbusRtu : ReadWriteDevicesSerialBase
     /// <summary>
     /// ModbusRtu
     /// </summary>
-    /// <param name="serialClient"></param>
-    public ModbusRtu(SerialClient serialClient) : base(serialClient)
+    /// <param name="serialSession"></param>
+    public ModbusRtu(SerialsSession serialSession) : base(serialSession)
     {
         ThingsGatewayBitConverter = new ThingsGatewayBitConverter(EndianType.Big);
         RegisterByteLength = 2;
@@ -87,7 +87,7 @@ public class ModbusRtu : ReadWriteDevicesSerialBase
             Crc16CheckEnable = Crc16CheckEnable,
             CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
         };
-        SerialClient.SetDataHandlingAdapter(dataHandleAdapter);
+        SerialsSession.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
     /// <inheritdoc/>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/ThingsGateway.Foundation.Adapter.Modbus.xml

@@ -38,6 +38,14 @@
         <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusAddress.Parse(System.String,System.Int32)">
             <inheritdoc/>
         </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusAddress.ParseFrom(System.String,System.Int32)">
+            <summary>
+            解析地址
+            </summary>
+            <param name="address"></param>
+            <param name="length"></param>
+            <returns></returns>
+        </member>
         <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusAddress.ToString">
             <inheritdoc/>
         </member>
@@ -231,11 +239,11 @@
             ModbusRtu
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu.#ctor(ThingsGateway.Foundation.Serial.SerialClient)">
+        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu.#ctor(ThingsGateway.Foundation.Serial.SerialsSession)">
             <summary>
             ModbusRtu
             </summary>
-            <param name="serialClient"></param>
+            <param name="serialSession"></param>
         </member>
         <member name="P:ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu.CacheTimeout">
             <summary>
@@ -370,7 +378,7 @@
         <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusServer.Dispose(System.Boolean)">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusServer.Received(TouchSocket.Sockets.SocketClient,TouchSocket.Sockets.IRequestInfo)">
+        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusServer.Received(TouchSocket.Sockets.SocketClient,TouchSocket.Core.IRequestInfo)">
             <inheritdoc/>
         </member>
         <member name="T:ThingsGateway.Foundation.Adapter.Modbus.ModbusServerDataHandleAdapter">

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCDA/COM/Discovery/OpcDiscovery.cs

@@ -75,7 +75,7 @@ public class OpcDiscovery
                 {
                     return new OperResult<ServerInfo>($"无法创建OPCServer连接，请检查OPC名称是否一致，以下为Host{host}中的OPC列表:"
                         + Environment.NewLine +
-                      JToken.Parse(serverInfos.ToJson()).ToString()
+                      JToken.Parse(serverInfos.ToJsonString()).ToString()
                         );
                 }
                 return OperResult.CreateSuccessResult(result);

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCDA/OPCDAClient.cs

@@ -301,50 +301,94 @@ public class OPCDAClient : DisposableObject
         return OPCNode?.ToString();
     }
 
+
     /// <summary>
-    /// 写入值
+    /// 批量写入值
     /// </summary>
-    /// <param name="valueName">写入</param>
-    /// <param name="value"></param>
     /// <returns></returns>
-    public OperResult WriteItem(string valueName, JToken value)
+    public Dictionary<string, OperResult> WriteItem(Dictionary<string, JToken> writeInfos)
     {
+        Dictionary<string, OperResult> results = new();
         if (PrivateConnect())
         {
             try
             {
-                var group = Groups.FirstOrDefault(it => it.OpcItems.Any(a => a.ItemID == valueName));
-                if (group == null)
-                    return new OperResult("不存在该变量" + valueName);
-                var item = group.OpcItems.Where(it => it.ItemID == valueName).FirstOrDefault();
-                int[] serverHandle = new int[1] { item.ServerHandle };
-                int[] PErrors = new int[1];
-                var jtoken = value;
-                var rank = jtoken.CalculateActualValueRank();
-                object rawWriteValue;
-                switch (rank)
+                var valueGroup = writeInfos.GroupBy(itemId =>
+                  {
+                      var group = Groups.FirstOrDefault(it => it.OpcItems.Any(a => a.ItemID == itemId.Key));
+                      return group;
+                  }).ToList();
+
+
+
+
+                foreach (var item1 in valueGroup)
                 {
-                    case -1:
-                        rawWriteValue = ((JValue)jtoken).Value;
-                        break;
-                    default:
-                        var jarray = ((JArray)jtoken);
-                        rawWriteValue = jarray.Select(j => (object)j).ToArray();
-                        break;
+                    if (item1.Key == null)
+                    {
+                        foreach (var item2 in item1)
+                        {
+                            results.Add(item2.Key, new OperResult("不存在该变量" + item2.Key));
+                        }
+                    }
+                    else
+                    {
+                        List<int> ServerHandles = new();
+                        List<object> Values = new();
+                        foreach (var item2 in item1)
+                        {
+                            var opcItem = item1.Key.OpcItems.Where(it => it.ItemID == item2.Key).FirstOrDefault();
+                            ServerHandles.Add(opcItem.ServerHandle);
+                            var jtoken = item2.Value;
+                            var rank = jtoken.CalculateActualValueRank();
+                            object rawWriteValue;
+                            switch (rank)
+                            {
+                                case -1:
+                                    rawWriteValue = ((JValue)jtoken).Value;
+                                    break;
+                                default:
+                                    var jarray = ((JArray)jtoken);
+                                    rawWriteValue = jarray.Select(j => (object)j).ToArray();
+                                    break;
+                            }
+
+                            Values.Add(rawWriteValue);
+
+                        }
+
+                        var result = item1.Key.Write(Values.ToArray(), ServerHandles.ToArray(), out var PErrors);
+                        var data = item1.ToList();
+                        for (int i = 0; i < data.Count; i++)
+                        {
+                            results.Add(data[i].Key, PErrors[i] == 0 ? OperResult.CreateSuccessResult() : new OperResult("错误代码：" + PErrors[i]));
+                        }
+                    }
                 }
 
-                object[] Value = new object[1] { rawWriteValue };
-                var result = group.Write(Value, serverHandle, out PErrors);
-                return result;
+                return results;
             }
             catch (Exception ex)
             {
-                return new OperResult(ex.Message);
+                var keys = writeInfos.Keys.ToList();
+                foreach (var item in keys)
+                {
+                    results.AddOrUpdate(item, new(ex));
+                }
+                return results;
+
             }
         }
-        return new OperResult();
+        else
+        {
+            var keys = writeInfos.Keys.ToList();
+            foreach (var item in keys)
+            {
+                results.AddOrUpdate(item, new("未初始化连接"));
+            }
+            return results;
+        }
     }
-
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)
     {

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCDA/ThingsGateway.Foundation.Adapter.OPCDA.xml

@@ -520,12 +520,10 @@
         <member name="M:ThingsGateway.Foundation.Adapter.OPCDA.OPCDAClient.ToString">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Foundation.Adapter.OPCDA.OPCDAClient.WriteItem(System.String,Newtonsoft.Json.Linq.JToken)">
+        <member name="M:ThingsGateway.Foundation.Adapter.OPCDA.OPCDAClient.WriteItem(System.Collections.Generic.Dictionary{System.String,Newtonsoft.Json.Linq.JToken})">
             <summary>
-            写入值
+            批量写入值
             </summary>
-            <param name="valueName">写入</param>
-            <param name="value"></param>
             <returns></returns>
         </member>
         <member name="M:ThingsGateway.Foundation.Adapter.OPCDA.OPCDAClient.Dispose(System.Boolean)">

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/JsonUtils.cs

@@ -70,7 +70,7 @@ public static class JsonUtils
                         TypeId = new { Id = dataTypeId.Identifier, Namespace = dataTypeId.NamespaceIndex },
                         Body = json
                     }
-                }.ToJson();
+                }.ToJsonString();
                 break;
             case BuiltInType.Variant:
                 var type = TypeInfo.GetDataTypeId(GetSystemType(json.Type));
@@ -82,13 +82,13 @@ public static class JsonUtils
                         Body = json
                     }
 
-                }.ToJson();
+                }.ToJsonString();
                 break;
             default:
                 newData = new
                 {
                     Value = json
-                }.ToJson();
+                }.ToJsonString();
                 break;
         }
 

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCNode.cs

@@ -34,7 +34,12 @@ public class OPCNode
     /// </summary>
     [Description("登录密码")]
     public string Password { get; set; }
-
+    /// <summary>
+    /// 检查域
+    /// </summary>
+    [Description("检查域")]
+    public bool CheckDomain { get; set; }
+    
     /// <summary>
     /// 更新间隔
     /// </summary>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs

@@ -69,7 +69,10 @@ public class OPCUAClient : DisposableObject
     private readonly ApplicationInstance m_application = new();
 
     private readonly ApplicationConfiguration m_configuration;
-
+    /// <summary>
+    /// SessionReconnectHandler
+    /// </summary>
+    public SessionReconnectHandler ReConnectHandler => m_reConnectHandler;
     private SessionReconnectHandler m_reConnectHandler;
     private ISession m_session;
     /// <summary>
@@ -80,14 +83,6 @@ public class OPCUAClient : DisposableObject
         Log = log;
         var certificateValidator = new CertificateValidator();
         certificateValidator.CertificateValidation += CertificateValidation;
-        SecurityConfiguration securityConfigurationcv = new()
-        {
-            UseValidatedCertificates = true,
-            AutoAcceptUntrustedCertificates = true,//自动接受证书
-            RejectSHA1SignedCertificates = false,
-            MinimumCertificateKeySize = 1024,
-        };
-        certificateValidator.Update(securityConfigurationcv);
 
         // 构建应用程序配置
         m_configuration = new ApplicationConfiguration
@@ -109,7 +104,8 @@ public class OPCUAClient : DisposableObject
 
             SecurityConfiguration = new SecurityConfiguration
             {
-                AutoAcceptUntrustedCertificates = true,
+                UseValidatedCertificates = true,
+                AutoAcceptUntrustedCertificates = true,//自动接受证书
                 RejectSHA1SignedCertificates = false,
                 MinimumCertificateKeySize = 1024,
                 SuppressNonceValidationErrors = true,
@@ -169,6 +165,8 @@ public class OPCUAClient : DisposableObject
             DisableHiResClock = true
         };
 
+        certificateValidator.Update(m_configuration);
+
         m_configuration.Validate(ApplicationType.Client);
         m_application.ApplicationConfiguration = m_configuration;
 
@@ -224,7 +222,7 @@ public class OPCUAClient : DisposableObject
         {
             try
             {
-                var variableNode = (VariableNode)ReadNode(items[i], false);
+                var variableNode = await ReadNodeAsync(items[i], false);
                 var item = new MonitoredItem
                 {
                     StartNodeId = variableNode.NodeId,
@@ -233,8 +231,6 @@ public class OPCUAClient : DisposableObject
                     Filter = OPCNode.DeadBand == 0 ? null : new DataChangeFilter() { DeadbandValue = OPCNode.DeadBand, DeadbandType = (int)DeadbandType.Absolute, Trigger = DataChangeTrigger.StatusValue },
                     SamplingInterval = OPCNode?.UpdateRate ?? 1000,
                 };
-                await typeSystem.LoadType(variableNode.DataType, true, true);
-
                 item.Notification += Callback;
                 monitoredItems.Add(item);
             }
@@ -256,7 +252,7 @@ public class OPCUAClient : DisposableObject
         var iserror = m_subscription.MonitoredItems.Any(a => a.Status.Error != null && StatusCode.IsBad(a.Status.Error.StatusCode));
         if (iserror)
         {
-            Log.Error("创建以下变量订阅失败" + m_subscription.MonitoredItems.Where(a => a.Status.Error != null && StatusCode.IsBad(a.Status.Error.StatusCode)).Select(a => a.StartNodeId.ToString() + "：" + a.Status.Error.ToString()).ToJson());
+            Log.Error("创建以下变量订阅失败" + m_subscription.MonitoredItems.Where(a => a.Status.Error != null && StatusCode.IsBad(a.Status.Error.StatusCode)).Select(a => a.StartNodeId.ToString() + "：" + a.Status.Error.ToString()).ToJsonString());
         }
 
         lock (dic_subscriptions)
@@ -313,11 +309,11 @@ public class OPCUAClient : DisposableObject
 
     }
 
-    private void Callback(MonitoredItem monitoreditem, MonitoredItemNotificationEventArgs monitoredItemNotificationEventArgs)
+    private async void Callback(MonitoredItem monitoreditem, MonitoredItemNotificationEventArgs monitoredItemNotificationEventArgs)
     {
         try
         {
-            VariableNode variableNode = (VariableNode)ReadNode(monitoreditem.StartNodeId.ToString(), false);
+            var variableNode = await ReadNodeAsync(monitoreditem.StartNodeId.ToString(), false);
             foreach (var value in monitoreditem.DequeueValues())
             {
                 if (value.Value != null)
@@ -490,6 +486,55 @@ public class OPCUAClient : DisposableObject
             m_session = null;
         }
     }
+    private ComplexTypeSystem typeSystem;
+    /// <summary>
+    /// Creates a new session.
+    /// </summary>
+    /// <returns>The new session object.</returns>
+    private async Task<ISession> ConnectAsync(string serverUrl)
+    {
+        PrivateDisconnect();
+
+        if (m_configuration == null)
+        {
+            throw new ArgumentNullException("未初始化配置");
+        }
+        var useSecurity = OPCNode?.IsUseSecurity ?? true;
+        EndpointDescription endpointDescription = CoreClientUtils.SelectEndpoint(m_configuration, serverUrl, useSecurity, 10000);
+        EndpointConfiguration endpointConfiguration = EndpointConfiguration.Create(m_configuration);
+        ConfiguredEndpoint endpoint = new(null, endpointDescription, endpointConfiguration);
+        UserIdentity userIdentity;
+        if (!OPCNode.UserName.IsNullOrEmpty())
+        {
+            userIdentity = new UserIdentity(OPCNode.UserName, OPCNode.Password);
+        }
+        else
+        {
+            userIdentity = new UserIdentity(new AnonymousIdentityToken());
+        }
+        //创建本地证书
+        await m_application.CheckApplicationInstanceCertificate(true, 0, 1200);
+        m_session = await Opc.Ua.Client.Session.Create(
+     m_configuration,
+    endpoint,
+    false,
+    OPCNode.CheckDomain,
+    (string.IsNullOrEmpty(OPCUAName)) ? m_configuration.ApplicationName : OPCUAName,
+    60000,
+    userIdentity,
+    Array.Empty<string>());
+
+        typeSystem = new ComplexTypeSystem(m_session);
+        Log.Debug("连接成功");
+
+        m_session.KeepAliveInterval = OPCNode.KeepAliveInterval == 0 ? 60000 : OPCNode.KeepAliveInterval;
+        m_session.KeepAlive += new KeepAliveEventHandler(Session_KeepAlive);
+
+        //如果是订阅模式，连接时添加订阅组
+        if (OPCNode.ActiveSubscribe)
+            await AddSubscriptionAsync(Guid.NewGuid().ToString(), Variables.ToArray());
+        return m_session;
+    }
 
     private void PrivateDisconnect()
     {
@@ -499,7 +544,11 @@ public class OPCUAClient : DisposableObject
             m_reConnectHandler.SafeDispose();
             m_reConnectHandler = null;
         }
-        m_session?.Close(10000);
+        if (m_session != null)
+        {
+            m_session.KeepAlive -= Session_KeepAlive;
+            m_session.Close(10000);
+        }
 
 
     }
@@ -521,29 +570,32 @@ public class OPCUAClient : DisposableObject
     /// <summary>
     /// 异步写opc标签
     /// </summary>
-    public async Task<OperResult> WriteNodeAsync(string tag, JToken value, CancellationToken token = default)
+    public async Task<Dictionary<string, OperResult>> WriteNodeAsync(Dictionary<string, JToken> writeInfoLists, CancellationToken token = default)
     {
+        Dictionary<string, OperResult> results = new();
         try
         {
-            WriteValue valueToWrite = new()
+            WriteValueCollection valuesToWrite = new();
+            foreach (var item in writeInfoLists)
             {
-                NodeId = new NodeId(tag),
-                AttributeId = Attributes.Value,
-            };
-            var variableNode = (VariableNode)ReadNode(tag.ToString(), false);
-            await typeSystem.LoadType(variableNode.DataType, true, true);
-            var dataValue = JsonUtils.Decode(
-                m_session.MessageContext,
-                variableNode.DataType,
-                TypeInfo.GetBuiltInType(variableNode.DataType, m_session.SystemContext.TypeTable),
-                value.CalculateActualValueRank(),
-                value
-                );
-            valueToWrite.Value = dataValue;
-            WriteValueCollection valuesToWrite = new()
-            {
-                valueToWrite
-            };
+                WriteValue valueToWrite = new()
+                {
+                    NodeId = new NodeId(item.Key),
+                    AttributeId = Attributes.Value,
+                };
+                var variableNode = await ReadNodeAsync(item.Key, false, token);
+                var dataValue = JsonUtils.Decode(
+                    m_session.MessageContext,
+                    variableNode.DataType,
+                    TypeInfo.GetBuiltInType(variableNode.DataType, m_session.SystemContext.TypeTable),
+                    item.Value.CalculateActualValueRank(),
+                    item.Value
+                    );
+                valueToWrite.Value = dataValue;
+
+                valuesToWrite.Add(valueToWrite);
+            }
+
 
             var result = await m_session.WriteAsync(
      requestHeader: null,
@@ -551,15 +603,29 @@ public class OPCUAClient : DisposableObject
 
             ClientBase.ValidateResponse(result.Results, valuesToWrite);
             ClientBase.ValidateDiagnosticInfos(result.DiagnosticInfos, valuesToWrite);
-            if (!StatusCode.IsGood(result.Results[0]))
+
+
+            var keys = writeInfoLists.Keys.ToList();
+            for (int i = 0; i < keys.Count; i++)
             {
-                return new OperResult(result.Results[0].ToString());
+                if (!StatusCode.IsGood(result.Results[i]))
+                    results.Add(keys[i], new(result.Results[i].ToString()));
+                else
+                {
+                    results.Add(keys[i], OperResult.CreateSuccessResult());
+                }
             }
-            return OperResult.CreateSuccessResult();
+
+            return results;
         }
         catch (Exception ex)
         {
-            return new OperResult(ex);
+            var keys = writeInfoLists.Keys.ToList();
+            foreach (var item in keys)
+            {
+                results.Add(item, new(ex));
+            }
+            return results;
         }
 
     }
@@ -576,8 +642,6 @@ public class OPCUAClient : DisposableObject
         ReadValueIdCollection nodesToRead = new();
         for (int i = 0; i < nodeIds.Length; i++)
         {
-            var variableNode = (VariableNode)ReadNode(nodeIds[i].ToString(), false);
-            await typeSystem.LoadType(variableNode.DataType, true, true);
             nodesToRead.Add(new ReadValueId()
             {
                 NodeId = nodeIds[i],
@@ -599,7 +663,7 @@ public class OPCUAClient : DisposableObject
         List<(string, DataValue, JToken)> jTokens = new();
         for (int i = 0; i < results.Count; i++)
         {
-            var variableNode = (VariableNode)ReadNode(nodeIds[i].ToString(), false);
+            var variableNode = await ReadNodeAsync(nodeIds[i].ToString(), false, token);
             var type = TypeInfo.GetBuiltInType(variableNode.DataType, m_session.SystemContext.TypeTable);
             var jToken = JsonUtils.Encode(m_session.MessageContext, type, results[i].Value);
             jTokens.Add((variableNode.NodeId.ToString(), results[i], jToken));
@@ -610,7 +674,7 @@ public class OPCUAClient : DisposableObject
     /// <summary>
     /// 从服务器或缓存读取节点
     /// </summary>
-    private Node ReadNode(string nodeIdStr, bool isOnlyServer = true)
+    private async Task<VariableNode> ReadNodeAsync(string nodeIdStr, bool isOnlyServer = true, CancellationToken token = default)
     {
         if (!isOnlyServer)
         {
@@ -621,8 +685,9 @@ public class OPCUAClient : DisposableObject
         }
 
         NodeId nodeToRead = new(nodeIdStr);
-        var node = m_session.ReadNode(nodeToRead);
-        _variableDicts.AddOrUpdate(nodeIdStr, (VariableNode)node);
+        var node = (VariableNode)await m_session.ReadNodeAsync(nodeToRead, token);
+        await typeSystem.LoadType(node.DataType, true, true);
+        _variableDicts.AddOrUpdate(nodeIdStr, node);
         return node;
     }
     #endregion
@@ -879,55 +944,6 @@ public class OPCUAClient : DisposableObject
         else
             throw new Exception(string.Format("验证证书失败，错误代码:{0}: {1}", eventArgs.Error.Code, eventArgs.Error.AdditionalInfo));
     }
-    private ComplexTypeSystem typeSystem;
-    /// <summary>
-    /// Creates a new session.
-    /// </summary>
-    /// <returns>The new session object.</returns>
-    private async Task<ISession> ConnectAsync(string serverUrl)
-    {
-        PrivateDisconnect();
-
-        if (m_configuration == null)
-        {
-            throw new ArgumentNullException("未初始化配置");
-        }
-        var useSecurity = OPCNode?.IsUseSecurity ?? true;
-        EndpointDescription endpointDescription = CoreClientUtils.SelectEndpoint(serverUrl, useSecurity);
-        EndpointConfiguration endpointConfiguration = EndpointConfiguration.Create(m_configuration);
-        UserIdentity userIdentity;
-        ConfiguredEndpoint endpoint = new(null, endpointDescription, endpointConfiguration);
-        if (!OPCNode.UserName.IsNullOrEmpty())
-        {
-            userIdentity = new UserIdentity(OPCNode.UserName, OPCNode.Password);
-        }
-        else
-        {
-            userIdentity = new UserIdentity(new AnonymousIdentityToken());
-        }
-        //创建本地证书
-        await m_application.CheckApplicationInstanceCertificate(true, 0, 1200);
-        m_session = await Opc.Ua.Client.Session.Create(
-     m_configuration,
-    endpoint,
-    false,
-    false,
-    (string.IsNullOrEmpty(OPCUAName)) ? m_configuration.ApplicationName : OPCUAName,
-    60000,
-    userIdentity,
-    Array.Empty<string>());
-
-        typeSystem = new ComplexTypeSystem(m_session);
-        Log.Debug("连接成功");
-
-        m_session.KeepAliveInterval = OPCNode.KeepAliveInterval == 0 ? 60000 : OPCNode.KeepAliveInterval;
-        m_session.KeepAlive += new KeepAliveEventHandler(Session_KeepAlive);
-
-        //如果是订阅模式，连接时添加订阅组
-        if (OPCNode.ActiveSubscribe)
-            await AddSubscriptionAsync(Guid.NewGuid().ToString(), Variables.ToArray());
-        return m_session;
-    }
 
 
     private async Task<OperResult<Dictionary<string, List<OPCNodeAttribute>>>> ReadNoteAttributeAsync(BrowseDescriptionCollection nodesToBrowse, ReadValueIdCollection nodesToRead, CancellationToken token)

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/ThingsGateway.Foundation.Adapter.OPCUA.csproj

@@ -2,14 +2,14 @@
 
 	<PropertyGroup>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
-		<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
 
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.371.96" />
-	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.4.371.96" />
-	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.4.371.96" />
+	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.372.56" />
+	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.4.372.56" />
+	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.4.372.56" />
 	</ItemGroup>
 
 

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/ThingsGateway.Foundation.Adapter.OPCUA.xml

@@ -217,6 +217,11 @@
             登录密码
             </summary>
         </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.OPCUA.OPCNode.CheckDomain">
+            <summary>
+            检查域
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Foundation.Adapter.OPCUA.OPCNode.UpdateRate">
             <summary>
             更新间隔
@@ -286,6 +291,11 @@
             当前的订阅组，组名称/组
             </summary>
         </member>
+        <member name="P:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.ReConnectHandler">
+            <summary>
+            SessionReconnectHandler
+            </summary>
+        </member>
         <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.#ctor(TouchSocket.Core.ILog)">
             <summary>
             默认的构造函数，实例化一个新的OPC UA类
@@ -370,12 +380,18 @@
             断开连接。
             </summary>
         </member>
+        <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.ConnectAsync(System.String)">
+            <summary>
+            Creates a new session.
+            </summary>
+            <returns>The new session object.</returns>
+        </member>
         <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.ReadJTokenValueAsync(System.String[],System.Threading.CancellationToken)">
             <summary>
             从服务器读取值
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.WriteNodeAsync(System.String,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
+        <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.WriteNodeAsync(System.Collections.Generic.Dictionary{System.String,Newtonsoft.Json.Linq.JToken},System.Threading.CancellationToken)">
             <summary>
             异步写opc标签
             </summary>
@@ -385,7 +401,7 @@
             从服务器读取值
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.ReadNode(System.String,System.Boolean)">
+        <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.ReadNodeAsync(System.String,System.Boolean,System.Threading.CancellationToken)">
             <summary>
             从服务器或缓存读取节点
             </summary>
@@ -410,12 +426,6 @@
         <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.Dispose(System.Boolean)">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.ConnectAsync(System.String)">
-            <summary>
-            Creates a new session.
-            </summary>
-            <returns>The new session object.</returns>
-        </member>
         <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient.Server_ReconnectComplete(System.Object,System.EventArgs)">
             <summary>
             连接处理器连接事件处理完成。

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/DLT645_2007/DLT645_2007.cs

@@ -0,0 +1,121 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using ThingsGateway.Application;
+using ThingsGateway.Foundation;
+using ThingsGateway.Foundation.Serial;
+
+using TouchSocket.Core;
+using TouchSocket.Sockets;
+
+namespace ThingsGateway.DLT645;
+
+/// <inheritdoc/>
+public class DLT645_2007 : CollectBase
+{
+    private readonly DLT645_2007Property driverPropertys = new();
+    /// <inheritdoc/>
+    protected override IReadWriteDevice PLC => _plc;
+    private ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007 _plc;
+    /// <inheritdoc/>
+    public override Type DriverDebugUIType => typeof(DLT645_2007DebugDriverPage);
+
+
+    /// <inheritdoc/>
+    public override CollectDriverPropertyBase DriverPropertys => driverPropertys;
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public override bool IsSupportRequest => true;
+
+    /// <inheritdoc/>
+    public override IThingsGatewayBitConverter ThingsGatewayBitConverter { get => _plc?.ThingsGatewayBitConverter; }
+
+    /// <inheritdoc/>
+    public override Task AfterStopAsync()
+    {
+        _plc?.Disconnect();
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc/>
+    public override async Task BeforStartAsync(CancellationToken token)
+    {
+        await _plc?.ConnectAsync(token);
+    }
+    /// <inheritdoc/>
+    protected override void Dispose(bool disposing)
+    {
+        _plc?.Disconnect();
+        _plc?.SafeDispose();
+        base.Dispose(disposing);
+    }
+
+    /// <inheritdoc/>
+    public override void InitDataAdapter()
+    {
+        _plc.SetDataAdapter();
+    }
+    /// <inheritdoc/>
+    public override bool IsConnected()
+    {
+        return _plc?.SerialsSession?.CanSend == true;
+    }
+    /// <inheritdoc/>
+    public override List<DeviceVariableSourceRead> LoadSourceRead(List<DeviceVariableRunTime> deviceVariables)
+    {
+        return deviceVariables.LoadSourceRead(_plc);
+    }
+
+    /// <inheritdoc/>
+    protected override void Init(CollectDeviceRunTime device, object client = null)
+    {
+        if (client == null)
+        {
+            FoundataionConfig.SetSerialProperty(new()
+            {
+                PortName = driverPropertys.PortName,
+                BaudRate = driverPropertys.BaudRate,
+                DataBits = driverPropertys.DataBits,
+                Parity = driverPropertys.Parity,
+                StopBits = driverPropertys.StopBits,
+            })
+                .SetBufferLength(1024);
+            client = new SerialsSession();
+            ((SerialsSession)client).Setup(FoundataionConfig);
+        }
+        //载入配置
+        _plc = new((SerialsSession)client)
+        {
+            FrameTime = driverPropertys.FrameTime,
+            CacheTimeout = driverPropertys.CacheTimeout,
+            DataFormat = driverPropertys.DataFormat,
+            EnableFEHead = driverPropertys.EnableFEHead,
+            OperCode = driverPropertys.OperCode,
+            Password = driverPropertys.Password,
+            Station = driverPropertys.Station,
+            TimeOut = driverPropertys.TimeOut
+        };
+    }
+
+    /// <inheritdoc/>
+    protected override async Task<OperResult<byte[]>> ReadAsync(string address, int length, CancellationToken token)
+    {
+        return await _plc.ReadAsync(address, length, token);
+    }
+
+}

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/DLT645_2007/DLT645_2007DebugDriverPage.razor

@@ -0,0 +1,68 @@
+@*
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+*@
+
+@using BlazorComponent;
+@using Microsoft.AspNetCore.Components.Web;
+@using Microsoft.JSInterop;
+@using ThingsGateway.Admin.Core;
+@using ThingsGateway.Foundation.Adapter.DLT645;
+@using ThingsGateway.Foundation;
+@using ThingsGateway.Foundation.Extension;
+@using ThingsGateway.Foundation.Serial;
+@using ThingsGateway.Blazor;
+@namespace ThingsGateway.DLT645
+@using Masa.Blazor
+@using ThingsGateway.Application;
+
+<DefalutDebugDriverPage  Channel="ChannelEnum.SerialPort" @ref=defalutDebugDriverPage>
+    <MCard Flat Elevation="0">
+        <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.EnableFEHead)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.EnableFEHead></MCheckbox>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
+
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.OperCode)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.OperCode></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Password)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Password></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+                     Items=@(typeof(DataFormat).GetEnumList())
+                     MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
+                     ItemText=@((u) =>u.des)
+                     ItemValue=@(u =>(DataFormat)u.value)
+                     HideDetails=@("auto") Height="30"
+                     Dense>
+            </MSelect>
+        </MRow>
+    </MCard>
+</DefalutDebugDriverPage>
+
+@code
+{
+    private DefalutDebugDriverPage defalutDebugDriverPage;
+    private ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007 _plc;
+    protected override void OnAfterRender(bool firstRender)
+    {
+        if (firstRender)
+        {
+            //载入配置
+            _plc = new ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007((SerialsSession)defalutDebugDriverPage.SerialSessionPage.GetSerialSession());
+            defalutDebugDriverPage.Plc = _plc;
+        }
+        base.OnAfterRender(firstRender);
+    }
+
+    public override string ToString()
+    {
+        return nameof(DLT645_2007);
+    }
+}

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/DLT645_2007/DLT645_2007Property.cs

@@ -0,0 +1,111 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using System.IO.Ports;
+
+using ThingsGateway.Application;
+using ThingsGateway.Foundation;
+
+namespace ThingsGateway.DLT645;
+
+/// <summary>
+/// <inheritdoc/>
+/// </summary>
+public class DLT645_2007Property : CollectDriverPropertyBase
+{
+    /// <summary>
+    /// COM口
+    /// </summary>
+    [DeviceProperty("COM口", "示例：COM1")]
+    public override string PortName { get; set; } = "COM1";
+    /// <summary>
+    /// 波特率
+    /// </summary>
+    [DeviceProperty("波特率", "通常为：38400/19200/9600/4800")]
+    public override int BaudRate { get; set; } = 9600;
+    /// <summary>
+    /// 数据位
+    /// </summary>
+    [DeviceProperty("数据位", "通常为：8/7/6")]
+    public override byte DataBits { get; set; } = 8;
+
+    /// <summary>
+    /// 停止位
+    /// </summary>
+    [DeviceProperty("停止位", "示例：None/One/Two/OnePointFive")]
+    public override StopBits StopBits { get; set; } = StopBits.One;
+
+    /// <summary>
+    /// 校验位
+    /// </summary>
+    [DeviceProperty("校验位", "示例：None/Odd/Even/Mark/Space")]
+    public override Parity Parity { get; set; } = Parity.None;
+
+    /// <summary>
+    /// 读写超时时间
+    /// </summary>
+    [DeviceProperty("读写超时时间", "")]
+    public ushort TimeOut { get; set; } = 3000;
+    /// <summary>
+    /// 默认地址
+    /// </summary>
+    [DeviceProperty("默认地址", "")]
+    public string Station { get; set; }
+    /// <summary>
+    /// 密码
+    /// </summary>
+    [DeviceProperty("密码", "")]
+    public string Password { get; set; }
+    /// <summary>
+    /// 操作员代码
+    /// </summary>
+    [DeviceProperty("操作员代码", "")]
+    public string OperCode { get; set; }
+
+    /// <summary>
+    /// 前导符报文头
+    /// </summary>
+    [DeviceProperty("前导符报文头", "")]
+    public bool EnableFEHead { get; set; } = true;
+
+    /// <summary>
+    /// 默认解析顺序
+    /// </summary>
+    [DeviceProperty("默认解析顺序", "")]
+    public DataFormat DataFormat { get; set; }
+
+    /// <summary>
+    /// 帧前时间ms
+    /// </summary>
+    [DeviceProperty("帧前时间", "某些设备性能较弱，报文间需要间隔较长时间")]
+    public int FrameTime { get; set; } = 0;
+    /// <summary>
+    /// 组包缓存超时ms
+    /// </summary>
+    [DeviceProperty("组包缓存超时ms", "某些设备性能较弱，报文间需要间隔较长时间，可以设置更长的组包缓存，默认1s")]
+    public int CacheTimeout { get; set; } = 1000;
+
+
+
+
+    /// <summary>
+    /// 共享链路
+    /// </summary>
+    [DeviceProperty("共享链路", "")]
+    public override bool IsShareChannel { get; set; } = false;
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public override ShareChannelEnum ShareChannel => ShareChannelEnum.SerialPort;
+
+
+}

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/DLT645_2007Helper.cs

@@ -0,0 +1,48 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using System.Collections.Generic;
+
+using ThingsGateway.Application;
+using ThingsGateway.Foundation;
+
+namespace ThingsGateway.DLT645;
+
+internal static class DLT645_2007Helper
+{
+    internal static List<DeviceVariableSourceRead> LoadSourceRead(this List<DeviceVariableRunTime> deviceVariables, IReadWriteDevice device)
+    {
+        var byteConverter = device.ThingsGatewayBitConverter;
+        var result = new List<DeviceVariableSourceRead>();
+        //需要先剔除额外信息，比如dataformat等
+        foreach (var item in deviceVariables)
+        {
+            var address = item.VariableAddress;
+
+            IThingsGatewayBitConverter transformParameter = ByteTransformUtil.GetTransByAddress(ref address, byteConverter);
+            item.ThingsGatewayBitConverter = transformParameter;
+            item.VariableAddress = address;
+            item.Index = device.GetBitOffset(item.VariableAddress);
+
+            result.Add(new()
+            {
+                DeviceVariables = new() { item },
+                Address = address,
+                Length = 1,
+            });
+        }
+        return result;
+
+    }
+
+
+}

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/DLT645_2007OverTcp/DLT645_2007OverTcp.cs

@@ -0,0 +1,107 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using ThingsGateway.Application;
+using ThingsGateway.Foundation;
+
+using TouchSocket.Sockets;
+
+namespace ThingsGateway.DLT645;
+
+/// <inheritdoc/>
+public class DLT645_2007OverTcp : CollectBase
+{
+
+    private readonly ModbusRtuOverTcpProperty driverPropertys = new();
+    /// <inheritdoc/>
+    protected override IReadWriteDevice PLC => _plc;
+    private ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp _plc;
+    /// <inheritdoc/>
+    public override Type DriverDebugUIType => typeof(ModbusRtuOverTcpDebugDriverPage);
+    /// <inheritdoc/>
+    public override CollectDriverPropertyBase DriverPropertys => driverPropertys;
+    /// <inheritdoc/>
+    public override bool IsSupportRequest => true;
+    /// <inheritdoc/>
+    public override IThingsGatewayBitConverter ThingsGatewayBitConverter { get => _plc?.ThingsGatewayBitConverter; }
+    /// <inheritdoc/>
+    public override Task AfterStopAsync()
+    {
+        _plc?.Disconnect();
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc/>
+    public override async Task BeforStartAsync(CancellationToken token)
+    {
+        await _plc?.ConnectAsync(token);
+    }
+    /// <inheritdoc/>
+    public override void InitDataAdapter()
+    {
+        _plc.SetDataAdapter();
+    }
+
+    /// <inheritdoc/>
+    public override bool IsConnected()
+    {
+        return _plc?.TcpClientEx?.CanSend == true;
+    }
+
+    /// <inheritdoc/>
+    public override List<DeviceVariableSourceRead> LoadSourceRead(List<DeviceVariableRunTime> deviceVariables)
+    {
+        return deviceVariables.LoadSourceRead(_plc);
+    }
+
+
+
+    /// <inheritdoc/>
+    protected override void Dispose(bool disposing)
+    {
+        _plc?.Disconnect();
+        base.Dispose(disposing);
+    }
+    /// <inheritdoc/>
+    protected override void Init(CollectDeviceRunTime device, object client = null)
+    {
+        if (client == null)
+        {
+            FoundataionConfig.SetRemoteIPHost(new IPHost($"{driverPropertys.IP}:{driverPropertys.Port}"))
+                .SetBufferLength(1024);
+            client = new TcpClientEx();
+            ((TcpClientEx)client).Setup(FoundataionConfig);
+        }
+        //载入配置
+        _plc = new((TcpClientEx)client)
+        {
+            FrameTime = driverPropertys.FrameTime,
+            CacheTimeout = driverPropertys.CacheTimeout,
+            DataFormat = driverPropertys.DataFormat,
+            EnableFEHead = driverPropertys.EnableFEHead,
+            OperCode = driverPropertys.OperCode,
+            Password = driverPropertys.Password,
+            Station = driverPropertys.Station,
+            TimeOut = driverPropertys.TimeOut
+        };
+    }
+    /// <inheritdoc/>
+    protected override async Task<OperResult<byte[]>> ReadAsync(string address, int length, CancellationToken token)
+    {
+        return await _plc.ReadAsync(address, length, token);
+    }
+
+}

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/DLT645_2007OverTcp/ModbusRtuOverTcpDebugDriverPage.razor

@@ -0,0 +1,68 @@
+@*
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+*@
+
+@using BlazorComponent;
+@using Microsoft.AspNetCore.Components.Web;
+@using Microsoft.JSInterop;
+@using ThingsGateway.Admin.Core;
+@using ThingsGateway.Foundation.Adapter.Modbus;
+@using ThingsGateway.Foundation;
+@using ThingsGateway.Foundation.Extension;
+@using ThingsGateway.Foundation.Serial;
+@using ThingsGateway.Application;
+@using Masa.Blazor
+@using ThingsGateway.Blazor;
+@namespace ThingsGateway.DLT645
+<DefalutDebugDriverPage Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
+    <MCard Flat Elevation="0">
+        <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.EnableFEHead)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.EnableFEHead></MCheckbox>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
+
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.OperCode)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.OperCode></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Password)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Password></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+                     Items=@(typeof(DataFormat).GetEnumList())
+                     MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
+                     ItemText=@((u) =>u.des)
+                     ItemValue=@(u =>(DataFormat)u.value)
+                     HideDetails=@("auto") Height="30"
+                     Dense>
+            </MSelect>
+        </MRow>
+    </MCard>
+</DefalutDebugDriverPage>
+
+
+@code
+{
+    private DefalutDebugDriverPage defalutDebugDriverPage;
+    private ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp _plc;
+    protected override void OnAfterRender(bool firstRender)
+    {
+        if (firstRender)
+        {
+            //载入配置
+            _plc = new ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007OverTcp((TcpClientEx)defalutDebugDriverPage.TcpClientPage.GetTcpClient());
+            defalutDebugDriverPage.Plc = _plc;
+        }
+        base.OnAfterRender(firstRender);
+    }
+
+    public override string ToString()
+    {
+        return nameof(DLT645_2007OverTcp);
+    }
+}

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/DLT645_2007OverTcp/ModbusRtuOverTcpProperty.cs

@@ -0,0 +1,88 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using ThingsGateway.Application;
+using ThingsGateway.Foundation;
+
+namespace ThingsGateway.DLT645;
+
+/// <summary>
+/// <inheritdoc/>
+/// </summary>
+public class ModbusRtuOverTcpProperty : CollectDriverPropertyBase
+{
+    /// <summary>
+    /// IP
+    /// </summary>
+    [DeviceProperty("IP", "")]
+    public override string IP { get; set; } = "127.0.0.1";
+    /// <summary>
+    /// 端口
+    /// </summary>
+    [DeviceProperty("端口", "")]
+    public override int Port { get; set; } = 502;
+    /// <summary>
+    /// 默认解析顺序
+    /// </summary>
+    [DeviceProperty("默认解析顺序", "")]
+    public DataFormat DataFormat { get; set; }
+    /// <summary>
+    /// 连接超时时间
+    /// </summary>
+    [DeviceProperty("连接超时时间", "")]
+    public ushort ConnectTimeOut { get; set; } = 3000;
+    /// <summary>
+    /// 默认地址
+    /// </summary>
+    [DeviceProperty("默认地址", "")]
+    public string Station { get; set; }
+    /// <summary>
+    /// 密码
+    /// </summary>
+    [DeviceProperty("密码", "")]
+    public string Password { get; set; }
+    /// <summary>
+    /// 操作员代码
+    /// </summary>
+    [DeviceProperty("操作员代码", "")]
+    public string OperCode { get; set; }
+
+    /// <summary>
+    /// 前导符报文头
+    /// </summary>
+    [DeviceProperty("前导符报文头", "")]
+    public bool EnableFEHead { get; set; } = true;
+    /// <summary>
+    /// 读写超时时间
+    /// </summary>
+    [DeviceProperty("读写超时时间", "")]
+    public ushort TimeOut { get; set; } = 3000;
+    /// <summary>
+    /// 帧前时间ms
+    /// </summary>
+    [DeviceProperty("帧前时间ms", "某些设备性能较弱，报文间需要间隔较长时间")]
+    public int FrameTime { get; set; } = 0;
+    /// <summary>
+    /// 组包缓存超时ms
+    /// </summary>
+    [DeviceProperty("组包缓存超时", "某些设备性能较弱，报文间需要间隔较长时间，可以设置更长的组包缓存，默认1s")]
+    public int CacheTimeout { get; set; } = 1;
+    /// <summary>
+    /// 共享链路
+    /// </summary>
+    [DeviceProperty("共享链路", "")]
+    public override bool IsShareChannel { get; set; } = false;
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public override ShareChannelEnum ShareChannel => ShareChannelEnum.TcpClientEx;
+}

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/GlobalUsings.cs

@@ -0,0 +1,13 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+global using System;

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/ThingsGateway.DLT645.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+	<PropertyGroup>
+		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
+		<EnableDynamicLoading>true</EnableDynamicLoading>
+	</PropertyGroup>
+
+
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+
+		<Exec Command=" set dir=&quot;$(SolutionDir)ThingsGateway.Web.Entry\bin\$(Configuration)\$(TargetFramework)\Plugins\$(AssemblyName)&quot;&#xD;&#xA; if not exist %25dir%25  md %25dir%25  &#xD;&#xA;copy &quot;$(TargetDir)*DLT645*.dll&quot;  %25dir%25&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;" />
+
+	</Target>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj">
+			<IncludeAssets>Compile</IncludeAssets>
+		</ProjectReference>
+		<ProjectReference Include="..\Foundataion\ThingsGateway.Foundation.Adapter.DLT645\ThingsGateway.Foundation.Adapter.DLT645.csproj" />
+	</ItemGroup>
+
+
+</Project>

framework/ThingsGateway.Plugin/ThingsGateway.DLT645/ThingsGateway.DLT645.xml

@@ -0,0 +1,244 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>ThingsGateway.DLT645</name>
+    </assembly>
+    <members>
+        <member name="T:ThingsGateway.DLT645.DLT645_2007OverTcp">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007OverTcp.PLC">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007OverTcp.DriverDebugUIType">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007OverTcp.DriverPropertys">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007OverTcp.IsSupportRequest">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007OverTcp.ThingsGatewayBitConverter">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.AfterStopAsync">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.BeforStartAsync(System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.InitDataAdapter">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.IsConnected">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.LoadSourceRead(System.Collections.Generic.List{ThingsGateway.Application.DeviceVariableRunTime})">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.Dispose(System.Boolean)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.Init(ThingsGateway.Application.CollectDeviceRunTime,System.Object)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007OverTcp.ReadAsync(System.String,System.Int32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="T:ThingsGateway.DLT645.ModbusRtuOverTcpProperty">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.IP">
+            <summary>
+            IP
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.Port">
+            <summary>
+            端口
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.DataFormat">
+            <summary>
+            默认解析顺序
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.ConnectTimeOut">
+            <summary>
+            连接超时时间
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.Station">
+            <summary>
+            默认地址
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.Password">
+            <summary>
+            密码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.OperCode">
+            <summary>
+            操作员代码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.EnableFEHead">
+            <summary>
+            前导符报文头
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.TimeOut">
+            <summary>
+            读写超时时间
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.FrameTime">
+            <summary>
+            帧前时间ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.CacheTimeout">
+            <summary>
+            组包缓存超时ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.IsShareChannel">
+            <summary>
+            共享链路
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.ModbusRtuOverTcpProperty.ShareChannel">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+        <member name="T:ThingsGateway.DLT645.DLT645_2007">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007.PLC">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007.DriverDebugUIType">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007.DriverPropertys">
+            <inheritdoc/>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007.IsSupportRequest">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007.ThingsGatewayBitConverter">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.AfterStopAsync">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.BeforStartAsync(System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.Dispose(System.Boolean)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.InitDataAdapter">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.IsConnected">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.LoadSourceRead(System.Collections.Generic.List{ThingsGateway.Application.DeviceVariableRunTime})">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.Init(ThingsGateway.Application.CollectDeviceRunTime,System.Object)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.DLT645.DLT645_2007.ReadAsync(System.String,System.Int32,System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="T:ThingsGateway.DLT645.DLT645_2007Property">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.PortName">
+            <summary>
+            COM口
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.BaudRate">
+            <summary>
+            波特率
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.DataBits">
+            <summary>
+            数据位
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.StopBits">
+            <summary>
+            停止位
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.Parity">
+            <summary>
+            校验位
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.TimeOut">
+            <summary>
+            读写超时时间
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.Station">
+            <summary>
+            默认地址
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.Password">
+            <summary>
+            密码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.OperCode">
+            <summary>
+            操作员代码
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.EnableFEHead">
+            <summary>
+            前导符报文头
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.DataFormat">
+            <summary>
+            默认解析顺序
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.FrameTime">
+            <summary>
+            帧前时间ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.CacheTimeout">
+            <summary>
+            组包缓存超时ms
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.IsShareChannel">
+            <summary>
+            共享链路
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.DLT645.DLT645_2007Property.ShareChannel">
+            <summary>
+            <inheritdoc/>
+            </summary>
+        </member>
+    </members>
+</doc>

framework/ThingsGateway.Plugin/ThingsGateway.Kafka/KafkaProducer.cs

@@ -92,7 +92,7 @@ public class KafkaProducer : UpLoadBase
                     {
                         if (!token.IsCancellationRequested)
                         {
-                            await KafKaUp(driverPropertys.VariableTopic, item.ToJson(), token);
+                            await KafKaUp(driverPropertys.VariableTopic, item.ToJsonString(), token);
                         }
                         else
                         {
@@ -128,7 +128,7 @@ public class KafkaProducer : UpLoadBase
                     {
                         if (!token.IsCancellationRequested)
                         {
-                            await KafKaUp(driverPropertys.DeviceTopic, item.ToJson(), token);
+                            await KafKaUp(driverPropertys.DeviceTopic, item.ToJsonString(), token);
                         }
                         else
                         {

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusRtu/ModbusRtu.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Newtonsoft.Json.Linq;
-
 using ThingsGateway.Application;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Serial;
@@ -22,6 +20,8 @@ namespace ThingsGateway.Modbus;
 public class ModbusRtu : CollectBase
 {
     private readonly ModbusRtuProperty driverPropertys = new();
+    /// <inheritdoc/>
+    protected override IReadWriteDevice PLC => _plc;
     private ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu _plc;
     /// <inheritdoc/>
     public override Type DriverDebugUIType => typeof(ModbusRtuDebugDriverPage);
@@ -66,7 +66,7 @@ public class ModbusRtu : CollectBase
     /// <inheritdoc/>
     public override bool IsConnected()
     {
-        return _plc?.SerialClient?.CanSend == true;
+        return _plc?.SerialsSession?.CanSend == true;
     }
     /// <inheritdoc/>
     public override List<DeviceVariableSourceRead> LoadSourceRead(List<DeviceVariableRunTime> deviceVariables)
@@ -74,12 +74,6 @@ public class ModbusRtu : CollectBase
         return deviceVariables.LoadSourceRead(_plc, driverPropertys.MaxPack);
     }
 
-    /// <inheritdoc/>
-    public override async Task<OperResult> WriteValueAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token)
-    {
-        return await _plc.WriteAsync(deviceVariable.VariableAddress, deviceVariable.DataType, value.ToString(), token);
-    }
-
     /// <inheritdoc/>
     protected override void Init(CollectDeviceRunTime device, object client = null)
     {
@@ -94,11 +88,11 @@ public class ModbusRtu : CollectBase
                 StopBits = driverPropertys.StopBits,
             })
                 .SetBufferLength(1024);
-            client = new SerialClient();
-            ((SerialClient)client).Setup(FoundataionConfig);
+            client = new SerialsSession();
+            ((SerialsSession)client).Setup(FoundataionConfig);
         }
         //载入配置
-        _plc = new((SerialClient)client)
+        _plc = new((SerialsSession)client)
         {
             Crc16CheckEnable = driverPropertys.Crc16CheckEnable,
             FrameTime = driverPropertys.FrameTime,

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusRtu/ModbusRtuDebugDriverPage.razor

@@ -53,7 +53,7 @@
         if (firstRender)
         {
             //载入配置
-            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu((SerialClient)defalutDebugDriverPage.SerialClientPage.GetSerialClient());
+            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu((SerialsSession)defalutDebugDriverPage.SerialSessionPage.GetSerialSession());
             defalutDebugDriverPage.Plc = _plc;
         }
         base.OnAfterRender(firstRender);

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusRtuOverTcp/ModbusRtuOverTcp.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Newtonsoft.Json.Linq;
-
 using ThingsGateway.Application;
 using ThingsGateway.Foundation;
 
@@ -22,6 +20,8 @@ public class ModbusRtuOverTcp : CollectBase
 {
 
     private readonly ModbusRtuOverTcpProperty driverPropertys = new();
+    /// <inheritdoc/>
+    protected override IReadWriteDevice PLC => _plc;
     private ThingsGateway.Foundation.Adapter.Modbus.ModbusRtuOverTcp _plc;
     /// <inheritdoc/>
     public override Type DriverDebugUIType => typeof(ModbusRtuOverTcpDebugDriverPage);
@@ -61,11 +61,7 @@ public class ModbusRtuOverTcp : CollectBase
         return deviceVariables.LoadSourceRead(_plc, driverPropertys.MaxPack);
     }
 
-    /// <inheritdoc/>
-    public override async Task<OperResult> WriteValueAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token)
-    {
-        return await _plc.WriteAsync(deviceVariable.VariableAddress, deviceVariable.DataType, value.ToString(), token);
-    }
+
 
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusRtuOverUdp/ModbusRtuOverUdp.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Newtonsoft.Json.Linq;
-
 using ThingsGateway.Application;
 using ThingsGateway.Foundation;
 
@@ -22,6 +20,8 @@ namespace ThingsGateway.Modbus;
 public class ModbusRtuOverUdp : CollectBase
 {
     private readonly ModbusRtuOverUdpProperty driverPropertys = new();
+    /// <inheritdoc/>
+    protected override IReadWriteDevice PLC => _plc;
     private ThingsGateway.Foundation.Adapter.Modbus.ModbusRtuOverUdp _plc;
     /// <inheritdoc/>
     public override Type DriverDebugUIType => typeof(ModbusRtuOverUdpDebugDriverPage);
@@ -65,11 +65,7 @@ public class ModbusRtuOverUdp : CollectBase
         return deviceVariables.LoadSourceRead(_plc, driverPropertys.MaxPack);
     }
 
-    /// <inheritdoc/>
-    public override async Task<OperResult> WriteValueAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token)
-    {
-        return await _plc.WriteAsync(deviceVariable.VariableAddress, deviceVariable.DataType, value.ToString(), token);
-    }
+
 
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusServer/ModbusServer.cs

@@ -201,16 +201,25 @@ public class ModbusServer : UpLoadBase
             if (Enum.TryParse<DataTypeEnum>(type, out DataTypeEnum result))
             {
                 var resultTask1 = RpcCore.InvokeDeviceMethodAsync($"{nameof(ModbusServer)}-{CurDevice.Name}-{client.IP + ":" + client.Port}",
-                new(tag.Value.Name, thingsGatewayBitConverter.GetDynamicDataFormBytes(addressStr ?? string.Empty, result.GetSystemType(), bytes).ToString()));
+               new Dictionary<string, string>
+{
+    {tag.Value.Name, thingsGatewayBitConverter.GetDynamicDataFormBytes(addressStr ?? string.Empty, result.GetSystemType(), bytes).ToString()},
+}
+
+                );
                 var result1 = resultTask1.ConfigureAwait(true).GetAwaiter().GetResult();
-                return result1;
+                return result1.FirstOrDefault().Value;
             }
             else
             {
                 var resultTask1 = RpcCore.InvokeDeviceMethodAsync($"{nameof(ModbusServer)}-{CurDevice.Name}-{client.IP + ":" + client.Port}",
-new(tag.Value.Name, thingsGatewayBitConverter.GetDynamicDataFormBytes(addressStr ?? string.Empty, tag.Value.DataType, bytes).ToString()));
+               new Dictionary<string, string>
+{
+    {tag.Value.Name, thingsGatewayBitConverter.GetDynamicDataFormBytes(addressStr ?? string.Empty, result.GetSystemType(), bytes).ToString()},
+}
+                );
                 var result1 = resultTask1.ConfigureAwait(true).GetAwaiter().GetResult();
-                return result1;
+                return result1.FirstOrDefault().Value;
             }
         }
         catch (Exception ex)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusTcp/ModbusTcp.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Newtonsoft.Json.Linq;
-
 using ThingsGateway.Application;
 using ThingsGateway.Foundation;
 
@@ -22,6 +20,8 @@ namespace ThingsGateway.Modbus;
 /// </summary>
 public class ModbusTcp : CollectBase
 {
+    /// <inheritdoc/>
+    protected override IReadWriteDevice PLC => _plc;
     private ThingsGateway.Foundation.Adapter.Modbus.ModbusTcp _plc;
 
     private readonly ModbusTcpProperty driverPropertys = new();
@@ -67,11 +67,7 @@ public class ModbusTcp : CollectBase
         return deviceVariables.LoadSourceRead(_plc, driverPropertys.MaxPack);
     }
 
-    /// <inheritdoc/>
-    public override async Task<OperResult> WriteValueAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token)
-    {
-        return await _plc.WriteAsync(deviceVariable.VariableAddress, deviceVariable.DataType, value.ToString(), token);
-    }
+
 
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusUdp/ModbusUdp.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Newtonsoft.Json.Linq;
-
 using ThingsGateway.Application;
 using ThingsGateway.Foundation;
 
@@ -21,6 +19,8 @@ namespace ThingsGateway.Modbus;
 /// <inheritdoc/>
 public class ModbusUdp : CollectBase
 {
+    /// <inheritdoc/>
+    protected override IReadWriteDevice PLC => _plc;
     private ThingsGateway.Foundation.Adapter.Modbus.ModbusUdp _plc;
 
     private readonly ModbusUdpProperty driverPropertys = new();
@@ -66,11 +66,7 @@ public class ModbusUdp : CollectBase
         return deviceVariables.LoadSourceRead(_plc, driverPropertys.MaxPack);
     }
 
-    /// <inheritdoc/>
-    public override async Task<OperResult> WriteValueAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token)
-    {
-        return await _plc.WriteAsync(deviceVariable.VariableAddress, deviceVariable.DataType, value.ToString(), token);
-    }
+
 
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ThingsGateway.Modbus.xml

@@ -7,6 +7,9 @@
         <member name="T:ThingsGateway.Modbus.ModbusRtuOverTcp">
             <inheritdoc/>
         </member>
+        <member name="P:ThingsGateway.Modbus.ModbusRtuOverTcp.PLC">
+            <inheritdoc/>
+        </member>
         <member name="P:ThingsGateway.Modbus.ModbusRtuOverTcp.DriverDebugUIType">
             <inheritdoc/>
         </member>
@@ -34,9 +37,6 @@
         <member name="M:ThingsGateway.Modbus.ModbusRtuOverTcp.LoadSourceRead(System.Collections.Generic.List{ThingsGateway.Application.DeviceVariableRunTime})">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Modbus.ModbusRtuOverTcp.WriteValueAsync(ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
-            <inheritdoc/>
-        </member>
         <member name="M:ThingsGateway.Modbus.ModbusRtuOverTcp.Dispose(System.Boolean)">
             <inheritdoc/>
         </member>
@@ -116,6 +116,9 @@
             <inheritdoc/>
             </summary>
         </member>
+        <member name="P:ThingsGateway.Modbus.ModbusRtuOverUdp.PLC">
+            <inheritdoc/>
+        </member>
         <member name="P:ThingsGateway.Modbus.ModbusRtuOverUdp.DriverDebugUIType">
             <inheritdoc/>
         </member>
@@ -143,9 +146,6 @@
         <member name="M:ThingsGateway.Modbus.ModbusRtuOverUdp.LoadSourceRead(System.Collections.Generic.List{ThingsGateway.Application.DeviceVariableRunTime})">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Modbus.ModbusRtuOverUdp.WriteValueAsync(ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
-            <inheritdoc/>
-        </member>
         <member name="M:ThingsGateway.Modbus.ModbusRtuOverUdp.Dispose(System.Boolean)">
             <inheritdoc/>
         </member>
@@ -168,6 +168,9 @@
         <member name="T:ThingsGateway.Modbus.ModbusRtu">
             <inheritdoc/>
         </member>
+        <member name="P:ThingsGateway.Modbus.ModbusRtu.PLC">
+            <inheritdoc/>
+        </member>
         <member name="P:ThingsGateway.Modbus.ModbusRtu.DriverDebugUIType">
             <inheritdoc/>
         </member>
@@ -200,9 +203,6 @@
         <member name="M:ThingsGateway.Modbus.ModbusRtu.LoadSourceRead(System.Collections.Generic.List{ThingsGateway.Application.DeviceVariableRunTime})">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Modbus.ModbusRtu.WriteValueAsync(ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
-            <inheritdoc/>
-        </member>
         <member name="M:ThingsGateway.Modbus.ModbusRtu.Init(ThingsGateway.Application.CollectDeviceRunTime,System.Object)">
             <inheritdoc/>
         </member>
@@ -400,6 +400,9 @@
             <inheritdoc/>
             </summary>
         </member>
+        <member name="P:ThingsGateway.Modbus.ModbusTcp.PLC">
+            <inheritdoc/>
+        </member>
         <member name="P:ThingsGateway.Modbus.ModbusTcp.DriverDebugUIType">
             <inheritdoc/>
         </member>
@@ -427,9 +430,6 @@
         <member name="M:ThingsGateway.Modbus.ModbusTcp.LoadSourceRead(System.Collections.Generic.List{ThingsGateway.Application.DeviceVariableRunTime})">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Modbus.ModbusTcp.WriteValueAsync(ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
-            <inheritdoc/>
-        </member>
         <member name="M:ThingsGateway.Modbus.ModbusTcp.Dispose(System.Boolean)">
             <inheritdoc/>
         </member>
@@ -507,6 +507,9 @@
         <member name="T:ThingsGateway.Modbus.ModbusUdp">
             <inheritdoc/>
         </member>
+        <member name="P:ThingsGateway.Modbus.ModbusUdp.PLC">
+            <inheritdoc/>
+        </member>
         <member name="P:ThingsGateway.Modbus.ModbusUdp.DriverDebugUIType">
             <inheritdoc/>
         </member>
@@ -534,9 +537,6 @@
         <member name="M:ThingsGateway.Modbus.ModbusUdp.LoadSourceRead(System.Collections.Generic.List{ThingsGateway.Application.DeviceVariableRunTime})">
             <inheritdoc/>
         </member>
-        <member name="M:ThingsGateway.Modbus.ModbusUdp.WriteValueAsync(ThingsGateway.Application.DeviceVariableRunTime,Newtonsoft.Json.Linq.JToken,System.Threading.CancellationToken)">
-            <inheritdoc/>
-        </member>
         <member name="M:ThingsGateway.Modbus.ModbusUdp.Dispose(System.Boolean)">
             <inheritdoc/>
         </member>

framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/IotSharp/IotSharpClient.cs

@@ -118,7 +118,7 @@ public class IotSharpClient : UpLoadBase
                         }
                         if (!token.IsCancellationRequested)
                         {
-                            await MqttUp($"devices/{item.Key}/telemetry", nameValueDict.ToJson(), token);
+                            await MqttUp($"devices/{item.Key}/telemetry", nameValueDict.ToJsonString(), token);
                         }
                         else
                         {
@@ -326,7 +326,7 @@ public class IotSharpClient : UpLoadBase
             else
             {
                 RpcResponse rpcResponse = new();
-                var nameValue = e.ApplicationMessage.ConvertPayloadToString().FromJson<List<KeyValuePair<string, string>>>();
+                var nameValue = e.ApplicationMessage.ConvertPayloadToString().FromJsonString<List<KeyValuePair<string, string>>>();
                 Dictionary<string, OperResult> results = new();
                 if (nameValue?.Count > 0)
                 {
@@ -340,29 +340,33 @@ GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean()
 && driverPropertys.DeviceRpcEnable;
                             if (rpcEnable == true)
                             {
-                                var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + rpcrequestid, item);
 
-                                results.Add(item.Key, result);
 
                             }
                             else
                             {
-                                results.Add(item.Key, new("权限不足，变量不支持写入"));
+                                results.Add(item.Key, new OperResult("权限不足，变量不支持写入"));
                             }
 
                         }
                         else
                         {
-                            results.Add(item.Key, new("不存在该变量"));
+                            results.Add(item.Key, new OperResult("不存在该变量"));
                         }
                     }
+
+                    var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + rpcrequestid, nameValue
+                        .Where(a => !results.Any(b => b.Key == a.Key))
+                        .ToDictionary(a => a.Key, a => a.Value));
+
+                    results.AddRange(result);
                     rpcResponse = new()
                     {
                         DeviceId = rpcdevicename,
                         ResponseId = rpcrequestid,
                         Method = rpcmethodname,
                         Success = !results.Any(a => !a.Value.IsSuccess),
-                        Data = results.ToJson()
+                        Data = results.ToJsonString()
                     };
                 }
                 else
@@ -392,7 +396,7 @@ GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean()
 
                 var variableMessage = new MqttApplicationMessageBuilder()
 .WithTopic($"{topic}")
-.WithPayload(rpcResponse.ToJson()).Build();
+.WithPayload(rpcResponse.ToJsonString()).Build();
                 var isConnect = await TryMqttClientAsync(CancellationToken.None);
                 if (isConnect.IsSuccess)
                     await _mqttClient.PublishAsync(variableMessage);
@@ -412,7 +416,7 @@ GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean()
         {
             LogMessage?.LogWarning(subResult.Items
                 .Where(a => a.ResultCode > (MqttClientSubscribeResultCode)10)
-                .Select(a => a.ToString()).ToJson());
+                .Select(a => a.ToString()).ToJsonString());
         }
     }
     /// <summary>

framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttClient.cs

@@ -317,6 +317,7 @@ public class MqttClient : UpLoadBase
            .WithTcpServer(driverPropertys.IP, driverPropertys.Port)//服务器
            .WithCleanSession(true)
            .WithKeepAlivePeriod(TimeSpan.FromSeconds(120.0))
+           .WithoutThrowOnNonSuccessfulConnectResponse()
            .Build();
         _mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
             .WithTopicFilter(
@@ -405,46 +406,54 @@ public class MqttClient : UpLoadBase
             return;
         if (arg.ApplicationMessage.Topic != driverPropertys.RpcWriteTopic)
             return;
-        var rpcData = Encoding.UTF8.GetString(arg.ApplicationMessage.PayloadSegment).FromJson<MqttRpcNameVaueWithId>();
-        if (rpcData == null)
+        var rpcDatas = Encoding.UTF8.GetString(arg.ApplicationMessage.PayloadSegment).FromJsonString<MqttRpcNameVaueWithId>();
+        if (rpcDatas == null)
             return;
 
-        MqttRpcResult mqttRpcResult = new();
+        MqttRpcResult mqttRpcResult = new() { RpcId = rpcDatas.RpcId, Success = true };
         try
         {
-            var nv = rpcData.Adapt<KeyValuePair<string, string>>();
-            var tag = _uploadVariables.FirstOrDefault(a => a.Name == nv.Key);
-            if (tag != null)
+            foreach (var rpcData in rpcDatas.WriteInfos)
             {
-                var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean();
-                if (rpcEnable == true)
+
+                var tag = _uploadVariables.FirstOrDefault(a => a.Name == rpcData.Key);
+                if (tag != null)
                 {
-                    var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + arg.ClientId, nv);
-
-                    mqttRpcResult = new() { Message = result.Message, RpcId = rpcData.RpcId, Success = result.IsSuccess };
+                    var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean();
+                    if (rpcEnable == true)
+                    {
 
+                    }
+                    else
+                    {
+                        mqttRpcResult.Success = false;
+                        mqttRpcResult.Message.Add(rpcData.Key, new("权限不足，变量不支持写入"));
+                    }
                 }
                 else
                 {
-                    mqttRpcResult = new() { Message = "权限不足，变量不支持写入", RpcId = rpcData.RpcId, Success = false };
+                    mqttRpcResult.Success = false;
+                    mqttRpcResult.Message.Add(rpcData.Key, new("不存在该变量"));
                 }
+            }
+
+            var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + arg.ClientId,
+                rpcDatas.WriteInfos.Where(
+                a => !mqttRpcResult.Message.Any(b => b.Key == a.Key)).ToDictionary(a => a.Key, a => a.Value));
+
+            mqttRpcResult.Message.AddRange(result);
+            mqttRpcResult.Success = !mqttRpcResult.Message.Any(a => !a.Value.IsSuccess);
 
-            }
-            else
-            {
-                mqttRpcResult = new() { Message = "不存在该变量", RpcId = rpcData.RpcId, Success = false };
-            }
         }
         catch (Exception ex)
         {
             LogMessage?.LogWarning(ex, ToString());
-            mqttRpcResult = new() { Message = "Failed", RpcId = rpcData.RpcId, Success = false };
         }
         try
         {
             var variableMessage = new MqttApplicationMessageBuilder()
 .WithTopic($"{driverPropertys.RpcSubTopic}")
-.WithPayload(mqttRpcResult.ToJson()).Build();
+.WithPayload(mqttRpcResult.ToJsonString()).Build();
             var isConnect = await TryMqttClientAsync(CancellationToken.None);
             if (isConnect.IsSuccess)
                 await _mqttClient.PublishAsync(variableMessage);
@@ -461,7 +470,7 @@ public class MqttClient : UpLoadBase
         {
             LogMessage?.Warning("订阅失败-" + subResult.Items
                 .Where(a => a.ResultCode > (MqttClientSubscribeResultCode)10)
-                .ToJson());
+                .ToJsonString());
         }
     }
     /// <summary>

framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttRpcNameVaueWithId.cs

@@ -10,6 +10,10 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using System.Collections.Generic;
+
+using ThingsGateway.Foundation;
+
 namespace ThingsGateway.Mqtt;
 
 /// <summary>
@@ -22,13 +26,9 @@ public class MqttRpcNameVaueWithId
     /// </summary>
     public string RpcId { get; set; }
     /// <summary>
-    /// 通常是变量名称
+    /// "WriteInfos":{"test":"1"}
     /// </summary>
-    public string Key { get; set; }
-    /// <summary>
-    /// 值
-    /// </summary>
-    public string Value { get; set; }
+    public Dictionary<string, string> WriteInfos { get; set; } = new();
 }
 /// <summary>
 /// MqttRpc输出
@@ -42,7 +42,7 @@ public class MqttRpcResult
     /// <summary>
     /// 消息
     /// </summary>
-    public string Message { get; set; }
+    public Dictionary<string, OperResult> Message { get; set; } = new();
     /// <summary>
     /// 是否成功
     /// </summary>

framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttServer.cs

@@ -260,49 +260,54 @@ public class MqttServer : UpLoadBase
             return;
         if (arg.ApplicationMessage.Topic != driverPropertys.RpcWriteTopic)
             return;
-        var rpcData = Encoding.UTF8.GetString(arg.ApplicationMessage.PayloadSegment).FromJson<MqttRpcNameVaueWithId>();
-        if (rpcData == null)
+        var rpcDatas = Encoding.UTF8.GetString(arg.ApplicationMessage.PayloadSegment).FromJsonString<MqttRpcNameVaueWithId>();
+        if (rpcDatas == null)
             return;
-        MqttRpcResult mqttRpcResult = new();
+        MqttRpcResult mqttRpcResult = new() { RpcId = rpcDatas.RpcId, Success = true };
         try
         {
-            var nv = rpcData.Adapt<KeyValuePair<string, string>>();
-            var tag = _uploadVariables.FirstOrDefault(a => a.Name == nv.Key);
-            if (tag != null)
+            foreach (var rpcData in rpcDatas.WriteInfos)
             {
-                var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean();
-                if (rpcEnable == true)
+
+                var tag = _uploadVariables.FirstOrDefault(a => a.Name == rpcData.Key);
+                if (tag != null)
                 {
-                    var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + IdWithName[arg.ClientId], nv);
-
-                    mqttRpcResult = new() { Message = result.Message, RpcId = rpcData.RpcId, Success = result.IsSuccess };
+                    var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean();
+                    if (rpcEnable == true)
+                    {
 
+                    }
+                    else
+                    {
+                        mqttRpcResult.Success = false;
+                        mqttRpcResult.Message.Add(rpcData.Key, new OperResult("权限不足，变量不支持写入"));
+                    }
                 }
                 else
                 {
-                    mqttRpcResult = new() { Message = "权限不足，变量不支持写入", RpcId = rpcData.RpcId, Success = false };
+                    mqttRpcResult.Success = false;
+                    mqttRpcResult.Message.Add(rpcData.Key, new OperResult("不存在该变量"));
                 }
+            }
 
-            }
-            else
-            {
-                mqttRpcResult = new() { Message = "不存在该变量", RpcId = rpcData.RpcId, Success = false };
-            }
+            var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + arg.ClientId,
+                rpcDatas.WriteInfos.Where(
+                a => !mqttRpcResult.Message.Any(b => b.Key == a.Key)).ToDictionary(a => a.Key, a => a.Value));
+
+            mqttRpcResult.Message.AddRange(result);
+            mqttRpcResult.Success = !mqttRpcResult.Message.Any(a => !a.Value.IsSuccess);
         }
-
         catch (Exception ex)
         {
             LogMessage?.LogWarning(ex, ToString());
-            mqttRpcResult = new() { Message = "Failed", RpcId = rpcData.RpcId, Success = false };
-
         }
         try
         {
             var variableMessage = new MqttApplicationMessageBuilder()
 .WithTopic($"{driverPropertys.RpcSubTopic}")
-.WithPayload(mqttRpcResult.ToJson()).Build();
+.WithPayload(mqttRpcResult.ToJsonString()).Build();
             await _mqttServer.InjectApplicationMessage(
-                    new InjectedMqttApplicationMessage(variableMessage));
+                     new InjectedMqttApplicationMessage(variableMessage));
         }
         catch
         {