1

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 
   <!--<ItemGroup>

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.12</Version>
+    <Version>1.0.0.14</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Core/data/AddressValue.cs

@@ -71,8 +71,7 @@ namespace YSAI.Core.data
 
                 data.Value == this.Value&&
                 data.Quality==this.Quality&&
-                data.OriginalValue==this.OriginalValue&&
-                data.Time==this.Time)
+                data.OriginalValue==this.OriginalValue)
             {
                 if (data.AddressParseParam == this.AddressParseParam)
                 {

src/YSAI.DAQ/YSAI.Core/subscribe/SubscribeOperate.cs

@@ -188,7 +188,7 @@ namespace YSAI.Core.subscription
                                                     //如果不一致，就找寻里面不一样的 键、值
                                                     ConcurrentDictionary<string, AddressValue> data = new ConcurrentDictionary<string, AddressValue>(RData.Except(UpParam).ToDictionary(x => x.Key, x => x.Value));
                                                     //抛出差异数据
-                                                    OnEventHandler?.Invoke(this, new EventResult(true, "变化数据", value.RType));
+                                                    OnEventHandler?.Invoke(this, new EventResult(true, "变化数据", data, value.RType));
                                                 }
                                                 //把这次新数据 赋值到历史数据中
                                                 UpParam = RData;
@@ -197,7 +197,7 @@ namespace YSAI.Core.subscription
                                     }
                                     else
                                     {
-                                        OnEventHandler?.Invoke(this, new EventResult(true, "实时数据", value.RType));
+                                        OnEventHandler?.Invoke(this, new EventResult(true, "实时数据", value.RData, value.RType));
                                     }
                                     break;
                                 case @enum.ResultType.KeyValueArray:
@@ -216,7 +216,7 @@ namespace YSAI.Core.subscription
                                             foreach (var item in RDataArray)
                                             {
                                                 //抛出差异数据
-                                                OnEventHandler?.Invoke(this, new EventResult(true, "存在变化数据", value.RType));
+                                                OnEventHandler?.Invoke(this, new EventResult(true, "存在变化数据", RDataArray, value.RType));
                                             }
                                             //把这次新数据 赋值到历史数据中
                                             UpParamArray = RDataArray;

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -85,13 +85,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.RabbitMQ.Pack", "YSAI.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Can.Pack", "YSAI.Can.Pack\YSAI.Can.Pack.csproj", "{940983FB-5DDE-4B13-BBA0-FDA1EEED6C02}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test", "YSAI.Test\YSAI.Test.csproj", "{7DC11866-9D92-4B0A-AFDA-A841359F38A0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unility", "unility", "{737BD61C-AF23-43CD-9F29-51F98D5EE90B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool", "YSAI.Tool\YSAI.Tool.csproj", "{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test", "YSAI.Test\YSAI.Test.csproj", "{4B503AF7-E1D3-4C94-AE98-4175CC94CD4B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool.Core", "YSAI.Tool.Core\YSAI.Tool.Core.csproj", "{4CB15594-A04E-4D32-B3C8-A3578DFA1552}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool.Core", "YSAI.Tool.Core\YSAI.Tool.Core.csproj", "{E85BF19B-E671-4A1E-BC67-B545700B4BF1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unility", "unility", "{737BD61C-AF23-43CD-9F29-51F98D5EE90B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool", "YSAI.Tool\YSAI.Tool.csproj", "{3C333E39-520D-4183-8E3D-D0FF6628C15E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -227,18 +227,18 @@ Global
 		{940983FB-5DDE-4B13-BBA0-FDA1EEED6C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{940983FB-5DDE-4B13-BBA0-FDA1EEED6C02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{940983FB-5DDE-4B13-BBA0-FDA1EEED6C02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DC11866-9D92-4B0A-AFDA-A841359F38A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DC11866-9D92-4B0A-AFDA-A841359F38A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DC11866-9D92-4B0A-AFDA-A841359F38A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DC11866-9D92-4B0A-AFDA-A841359F38A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B503AF7-E1D3-4C94-AE98-4175CC94CD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B503AF7-E1D3-4C94-AE98-4175CC94CD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B503AF7-E1D3-4C94-AE98-4175CC94CD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B503AF7-E1D3-4C94-AE98-4175CC94CD4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E85BF19B-E671-4A1E-BC67-B545700B4BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E85BF19B-E671-4A1E-BC67-B545700B4BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E85BF19B-E671-4A1E-BC67-B545700B4BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E85BF19B-E671-4A1E-BC67-B545700B4BF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C333E39-520D-4183-8E3D-D0FF6628C15E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C333E39-520D-4183-8E3D-D0FF6628C15E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C333E39-520D-4183-8E3D-D0FF6628C15E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C333E39-520D-4183-8E3D-D0FF6628C15E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -280,10 +280,10 @@ Global
 		{690A2E26-908A-4AED-8689-01B23F5CFCBE} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{68C1433D-2DB7-499E-9225-CB8191891F8F} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{940983FB-5DDE-4B13-BBA0-FDA1EEED6C02} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
-		{7DC11866-9D92-4B0A-AFDA-A841359F38A0} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
-		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
-		{4CB15594-A04E-4D32-B3C8-A3578DFA1552} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 		{737BD61C-AF23-43CD-9F29-51F98D5EE90B} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
+		{4B503AF7-E1D3-4C94-AE98-4175CC94CD4B} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
+		{E85BF19B-E671-4A1E-BC67-B545700B4BF1} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
+		{3C333E39-520D-4183-8E3D-D0FF6628C15E} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -12,7 +12,7 @@
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.14" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.14" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.xml

@@ -302,36 +302,6 @@
             次函数的运行时间
             </summary>
         </member>
-        <member name="T:YSAI.Core.data.packet.MessagePacket">
-            <summary>
-            地址数据包（发送）
-            </summary>
-        </member>
-        <member name="T:YSAI.Core.data.packet.StatusPacket">
-            <summary>
-            状态数据包（发送）
-            </summary>
-        </member>
-        <member name="P:YSAI.Core.data.packet.StatusPacket.SN">
-            <summary>
-            库的实例 唯一标识符
-            </summary>
-        </member>
-        <member name="P:YSAI.Core.data.packet.StatusPacket.Message">
-            <summary>
-            消息
-            </summary>
-        </member>
-        <member name="P:YSAI.Core.data.packet.StatusPacket.SType">
-            <summary>
-            状态代码
-            </summary>
-        </member>
-        <member name="P:YSAI.Core.data.packet.StatusPacket.Time">
-            <summary>
-            时间
-            </summary>
-        </member>
         <member name="P:YSAI.Core.data.Result.Message">
             <summary>
             信息
@@ -707,15 +677,15 @@
             关闭接口
             </summary>
         </member>
-        <member name="M:YSAI.Core.interface.IOff.OffAsync">
+        <member name="M:YSAI.Core.interface.IOff.Off">
             <summary>
-            异步关闭
+            关闭
             </summary>
             <returns>统一泛型结果</returns>
         </member>
-        <member name="M:YSAI.Core.interface.IOff.Off">
+        <member name="M:YSAI.Core.interface.IOff.OffAsync">
             <summary>
-            关闭
+            异步关闭
             </summary>
             <returns>统一泛型结果</returns>
         </member>
@@ -724,15 +694,15 @@
             打开接口
             </summary>
         </member>
-        <member name="M:YSAI.Core.interface.IOn.OnAsync">
+        <member name="M:YSAI.Core.interface.IOn.On">
             <summary>
-            异步打开
+            打开
             </summary>
             <returns>统一泛型结果</returns>
         </member>
-        <member name="M:YSAI.Core.interface.IOn.On">
+        <member name="M:YSAI.Core.interface.IOn.OnAsync">
             <summary>
-            打开
+            异步打开
             </summary>
             <returns>统一泛型结果</returns>
         </member>
@@ -813,16 +783,16 @@
             读取接口
             </summary>
         </member>
-        <member name="M:YSAI.Core.interface.IRead.ReadAsync(YSAI.Core.data.Address)">
+        <member name="M:YSAI.Core.interface.IRead.Read(YSAI.Core.data.Address)">
             <summary>
-            异步读取
+            读取
             </summary>
             <param name="address">地址的数据</param>
             <returns>统一泛型结果</returns>
         </member>
-        <member name="M:YSAI.Core.interface.IRead.Read(YSAI.Core.data.Address)">
+        <member name="M:YSAI.Core.interface.IRead.ReadAsync(YSAI.Core.data.Address)">
             <summary>
-            读取
+            异步读取
             </summary>
             <param name="address">地址的数据</param>
             <returns>统一泛型结果</returns>
@@ -832,14 +802,14 @@
             底层通信字节参
             </summary>
         </member>
-        <member name="M:YSAI.Core.interface.IReadOrWrite.ReadOrWriteAsync(System.Byte[])">
+        <member name="M:YSAI.Core.interface.IReadOrWrite.ReadOrWrite(System.Byte[])">
             <summary>
             读取或发送
             </summary>
             <param name="Data">字节数据</param>
             <returns>统一出参</returns>
         </member>
-        <member name="M:YSAI.Core.interface.IReadOrWrite.ReadOrWrite(System.Byte[])">
+        <member name="M:YSAI.Core.interface.IReadOrWrite.ReadOrWriteAsync(System.Byte[])">
             <summary>
             读取或发送
             </summary>
@@ -856,14 +826,14 @@
             底层通信字节参
             </summary>
         </member>
-        <member name="M:YSAI.Core.interface.ISend.SendAsync(System.Byte[])">
+        <member name="M:YSAI.Core.interface.ISend.Send(System.Byte[])">
             <summary>
             发送
             </summary>
             <param name="Data">字节数据</param>
             <returns>统一出参</returns>
         </member>
-        <member name="M:YSAI.Core.interface.ISend.Send(System.Byte[])">
+        <member name="M:YSAI.Core.interface.ISend.SendAsync(System.Byte[])">
             <summary>
             发送
             </summary>
@@ -948,28 +918,28 @@
             udp接口
             </summary>
         </member>
-        <member name="M:YSAI.Core.interface.ISocketUdp.ReadOrWriteAsync(System.Byte[],System.Net.IPEndPoint)">
+        <member name="M:YSAI.Core.interface.ISocketUdp.ReadOrWrite(System.Byte[],System.Net.IPEndPoint)">
             <summary>
             读取或发送
             </summary>
             <param name="Data">字节数据</param>
             <returns>统一出参</returns>
         </member>
-        <member name="M:YSAI.Core.interface.ISocketUdp.ReadOrWrite(System.Byte[],System.Net.IPEndPoint)">
+        <member name="M:YSAI.Core.interface.ISocketUdp.ReadOrWriteAsync(System.Byte[],System.Net.IPEndPoint)">
             <summary>
             读取或发送
             </summary>
             <param name="Data">字节数据</param>
             <returns>统一出参</returns>
         </member>
-        <member name="M:YSAI.Core.interface.ISocketUdp.SendAsync(System.Byte[],System.Net.IPEndPoint)">
+        <member name="M:YSAI.Core.interface.ISocketUdp.Send(System.Byte[],System.Net.IPEndPoint)">
             <summary>
             读取或发送
             </summary>
             <param name="Data">字节数据</param>
             <returns>统一出参</returns>
         </member>
-        <member name="M:YSAI.Core.interface.ISocketUdp.Send(System.Byte[],System.Net.IPEndPoint)">
+        <member name="M:YSAI.Core.interface.ISocketUdp.SendAsync(System.Byte[],System.Net.IPEndPoint)">
             <summary>
             读取或发送
             </summary>
@@ -981,16 +951,16 @@
             写入接口
             </summary>
         </member>
-        <member name="M:YSAI.Core.interface.IWrite.WriteAsync``1(System.Collections.Concurrent.ConcurrentDictionary{System.String,``0})">
+        <member name="M:YSAI.Core.interface.IWrite.Write``1(System.Collections.Concurrent.ConcurrentDictionary{System.String,``0})">
             <summary>
-            异步写入
+            写入
             </summary>
             <param name="Values">写入的数据点，与数据类型</param>
             <returns>统一泛型结果</returns>
         </member>
-        <member name="M:YSAI.Core.interface.IWrite.Write``1(System.Collections.Concurrent.ConcurrentDictionary{System.String,``0})">
+        <member name="M:YSAI.Core.interface.IWrite.WriteAsync``1(System.Collections.Concurrent.ConcurrentDictionary{System.String,``0})">
             <summary>
-            写入
+            异步写入
             </summary>
             <param name="Values">写入的数据点，与数据类型</param>
             <returns>统一泛型结果</returns>
@@ -1861,6 +1831,26 @@
             <param name="obj"></param>
             <returns></returns>
         </member>
+        <member name="T:YSAI.Core.socket.tcp.service.SocketTcpServiceData.ClientMessage">
+            <summary>
+            客户端消息
+            </summary>
+        </member>
+        <member name="P:YSAI.Core.socket.tcp.service.SocketTcpServiceData.ClientMessage.Step">
+            <summary>
+            步骤
+            </summary>
+        </member>
+        <member name="P:YSAI.Core.socket.tcp.service.SocketTcpServiceData.ClientMessage.IpPort">
+            <summary>
+            IP地址:端口
+            </summary>
+        </member>
+        <member name="P:YSAI.Core.socket.tcp.service.SocketTcpServiceData.ClientMessage.Data">
+            <summary>
+            字节数据
+            </summary>
+        </member>
         <member name="T:YSAI.Core.socket.tcp.service.SocketTcpServiceData.Steps">
             <summary>
             步骤枚举
@@ -2026,6 +2016,21 @@
             <param name="obj"></param>
             <returns></returns>
         </member>
+        <member name="T:YSAI.Core.socket.udp.SocketUdpData.TerminalMessage">
+            <summary>
+            终端数据
+            </summary>
+        </member>
+        <member name="P:YSAI.Core.socket.udp.SocketUdpData.TerminalMessage.IpPort">
+            <summary>
+            IP端口
+            </summary>
+        </member>
+        <member name="P:YSAI.Core.socket.udp.SocketUdpData.TerminalMessage.Data">
+            <summary>
+            数据
+            </summary>
+        </member>
         <member name="T:YSAI.Core.socket.udp.SocketUdpOperate">
             <summary>
             socket UDP 客户端

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MQTTnet" Version="4.2.1.781" />
-    <PackageReference Include="MQTTnet.AspNetCore" Version="4.2.1.781" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+    <PackageReference Include="MQTTnet" Version="4.3.0.858" />
+    <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.0.858" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.56" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.Opc/da/client/OpcDaClientData.cs

@@ -31,7 +31,7 @@ namespace YSAI.Opc.da.client
             /// 服务名
             /// </summary>
             [Description("服务名")]
-            public string? ServiceName { get; set; }
+            public string? SName { get; set; }
             /// <summary>
             /// 接口版本
             /// </summary>
@@ -53,7 +53,7 @@ namespace YSAI.Opc.da.client
                 Basics? obj = Obj as Basics;
                 if (obj == null) return false;
                 if (obj.SN == this.SN &&
-                    obj.ServiceName == this.ServiceName &&
+                    obj.SName == this.SName &&
                     obj.ApiVerType == this.ApiVerType)
                 {
                     return true;

src/YSAI.DAQ/YSAI.Opc/da/client/OpcDaClientOperate.cs

@@ -627,7 +627,7 @@ namespace YSAI.Opc.da.client
                     {
                         foreach (var item in servers)
                         {
-                            if (item.Name.Equals(basics.ServiceName))
+                            if (item.Name.Equals(basics.SName))
                             {
                                 //opcda客户端对象
                                 opcDaClient = item as OpcDaNetApi.Da.Server;

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj

@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.14" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.S7/client/S7ClientOperate.cs

@@ -22,6 +22,8 @@ namespace YSAI.S7.client
     /// </summary>
     public sealed class S7ClientOperate : IBaseAbstract, IDaq
     {
+        protected override string LogHead => "[ S7ClientOperate 操作 ]";
+        protected override string ClassName => "S7ClientOperate";
         private static readonly object Lock = new object();  //锁
         private static List<S7ClientOperate> ThisObjList = new List<S7ClientOperate>(); //自身对象集合
 
@@ -81,8 +83,7 @@ namespace YSAI.S7.client
             GC.SuppressFinalize(this);
             ThisObjList.Remove(this);
         }
-        protected override string LogHead => "[ S7Operate 操作 ]";
-        protected override string ClassName => "S7Operate";
+        
         public Task<OperateResult> OnAsync()
         {
             return Task.Run(() => On());

src/YSAI.DAQ/YSAI.Test.Console/Program.cs

@@ -1,51 +1,103 @@
-using Confluent.Kafka;
+//using Confluent.Kafka;
 using S7.Net;
 using System.Collections.Concurrent;
 using YSAI.Core.data;
 using YSAI.Core.@enum;
 using YSAI.Core.reflection;
 using YSAI.Core.script;
-using YSAI.DaqManage;
-using YSAI.Log;
-using YSAI.Mqtt.client;
-using YSAI.Mqtt.service.websocket;
-using YSAI.Opc.ua.client;
-using YSAI.RabbitMQ;
-using YSAI.RelayManage;
+//using YSAI.DaqManage;
+//using YSAI.Log;
+//using YSAI.Mqtt.client;
+//using YSAI.Mqtt.service.websocket;
+//using YSAI.Opc.ua.client;
+//using YSAI.RabbitMQ;
+//using YSAI.RelayManage;
 using YSAI.S7.client;
 using YSAI.Unility;
 
 
-RabbitMQOperate rabbitMQOperate = RabbitMQOperate.Instance(new RabbitMQData.Basics()
+S7ClientOperate s7ClientOperate = S7ClientOperate.Instance(new S7ClientData.Basics()
 {
-    ExChangeName = "VariableExchangeRead",
-    HostName = "192.168.2.200",
-    UserName = "ys",
-    Password = "ys123456",
-    Port = 5672,
-    SN=Guid.NewGuid().ToString()
+    Ip = "192.168.2.20",
+    Port = 102,
+    Rack = 0,
+    Slot = 1,
+    S7CpuType = CpuType.S71200,
+    SN = "1",
+    DataChangeOut=true
 });
 
-OperateResult operateResult = rabbitMQOperate.On();
-Console.WriteLine(operateResult.ToJson);
+//点位地址
+Address address = new Address();
+address.SN = Guid.NewGuid().ToString();
+address.CreationTime = DateTime.Now.ToLocalTime();
+address.AddressArray = new List<AddressDetails>();
+address.AddressArray.Add(new AddressDetails()
+{
+    AddressName = "DB71.DBD4",
+    AddressDataType = YSAI.Core.@enum.DataType.Float,
+    AddressType = AddressType.Reality
+});
+OperateResult operateResult = s7ClientOperate.On();
+Console.WriteLine(operateResult.ToJson());
+
+
+//读取
+operateResult = s7ClientOperate.Read(address);
+Console.WriteLine(operateResult.ToJson());
 
 
 
+s7ClientOperate.OnEvent += S7ClientOperate_OnEvent;
 
-rabbitMQOperate.OnEvent += RabbitMQOperate_OnEvent;
-operateResult= rabbitMQOperate.Consume("VariableTopic");
+
+operateResult = s7ClientOperate.Subscribe(address);
 Console.WriteLine(operateResult.ToJson());
 
 while (true)
 {
-
+    string a = Console.ReadLine();
+    ConcurrentDictionary<string, float> keyValuePairs = new ConcurrentDictionary<string, float>();
+    keyValuePairs.TryAdd("DB71.DBD4", float.Parse(a));
+    operateResult = s7ClientOperate.Write(keyValuePairs);
+    Console.WriteLine(operateResult.ToJson());
 }
-void RabbitMQOperate_OnEvent(object? sender, EventResult e)
+void S7ClientOperate_OnEvent(object? sender, EventResult e)
 {
-    Console.WriteLine(e.ToJson()) ;
+    Console.WriteLine(e.ToJson());
 }
 
 
+//RabbitMQOperate rabbitMQOperate = RabbitMQOperate.Instance(new RabbitMQData.Basics()
+//{
+//    ExChangeName = "VariableExchangeRead",
+//    HostName = "192.168.2.200",
+//    UserName = "ys",
+//    Password = "ys123456",
+//    Port = 5672,
+//    SN=Guid.NewGuid().ToString()
+//});
+
+//OperateResult operateResult = rabbitMQOperate.On();
+//Console.WriteLine(operateResult.ToJson);
+
+
+
+
+//rabbitMQOperate.OnEvent += RabbitMQOperate_OnEvent;
+//operateResult= rabbitMQOperate.Consume("VariableTopic");
+//Console.WriteLine(operateResult.ToJson());
+
+//while (true)
+//{
+
+//}
+//void RabbitMQOperate_OnEvent(object? sender, EventResult e)
+//{
+//    Console.WriteLine(e.ToJson()) ;
+//}
+
+
 
 //MqttClientOperate mqttClientOperate = MqttClientOperate.Instance(new MqttClientData.Basics()
 //{

src/YSAI.DAQ/YSAI.Test/UnitTest1.cs

@@ -173,7 +173,7 @@ namespace YSAI.Test
             servers = OpcDaClientOperate.GetServersArray(Specification.COM_DA_30);
             Console.WriteLine();
 
-            using (OpcDaClientOperate opcDaClientOperate = OpcDaClientOperate.Instance(new OpcDaClientData.Basics() { SN = Guid.NewGuid().ToString(), ServiceName = "Knight.OPC.Server.Demo", ApiVerType = OpcDaClientData.ApiVerType.COM_DA_20 }))
+            using (OpcDaClientOperate opcDaClientOperate = OpcDaClientOperate.Instance(new OpcDaClientData.Basics() { SN = Guid.NewGuid().ToString(), SName = "Knight.OPC.Server.Demo", ApiVerType = OpcDaClientData.ApiVerType.COM_DA_20 }))
             {
                 OperateResult operateResult = opcDaClientOperate.On();
                 Console.WriteLine(operateResult.Message);

src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.12" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.14" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Tool.Windows/YSAI.Tool.Windows.csproj

@@ -1,42 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="config\**" />
-    <EmbeddedResource Remove="config\**" />
-    <None Remove="config\**" />
-    <Page Remove="config\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\YSAI.Controls\YSAI.Controls.csproj" />
-    <ProjectReference Include="..\YSAI.WindowMessage\YSAI.WindowMessage.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1988-prerelease" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="modbus\client\" />
-    <Folder Include="modbus\service\" />
-    <Folder Include="mqtt\client\" />
-    <Folder Include="mqtt\service\webScoket\" />
-    <Folder Include="opc\da\client\" />
-    <Folder Include="opc\da\http\" />
-    <Folder Include="opc\ua\client\" />
-    <Folder Include="opc\ua\service\" />
-    <Folder Include="can\" />
-    <Folder Include="kafka\" />
-    <Folder Include="rabbitMQ\" />
-    <Folder Include="s7\client\" />
-    <Folder Include="s7\service\" />
-    <Folder Include="apiOperate\" />
-  </ItemGroup>
-
-</Project>

src/YSAI.DAQ/YSAI.Tool.Windows/aboutUs/AboutUsTool.xaml

@@ -1,11 +0,0 @@
-<UserControl x:Class="YSAI.Tool.Windows.aboutUs.AboutUsTool"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:YSAI.Tool.Windows.aboutUs">
-    <DockPanel>
-        <wv2:WebView2 Source="http://www.yuanshan-ai.com/list/45.html"/>
-    </DockPanel>
-</UserControl>

src/YSAI.DAQ/YSAI.Tool.Windows/aboutUs/AboutUsTool.xaml.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace YSAI.Tool.Windows.aboutUs
-{
-    /// <summary>
-    /// AboutUsTool.xaml 的交互逻辑
-    /// </summary>
-    public partial class AboutUsTool : UserControl
-    {
-        public AboutUsTool()
-        {
-            InitializeComponent();
-        }
-    }
-}

src/YSAI.DAQ/YSAI.Tool.Windows/aboutUs/AboutUsToolController.cs

@@ -1,13 +0,0 @@
-using YSAI.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace YSAI.Tool.Windows.aboutUs
-{
-    public class AboutUsToolController: NotifyObject
-    {
-    }
-}