1. 修改 override bool Equals 方法

2. 版本更新

README.md

@@ -299,5 +299,7 @@ while(true)
 1. 解决RMQ内存增加问题
 2. 新增微秒延时
 3. 版本更新
+4. 新增对象比对方法
+5. 修改 override bool Equals 方法
 
 

src/YSAI.DAQ/YSAI.Can/CanData.cs

@@ -36,28 +36,7 @@ namespace YSAI.Can
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                if (o == null)
-                {
-                    return false;
-                }
-                Basics? Obj = o as Basics;
-                if (Obj == null)
-                {
-                    return false;
-                }
-                else
-                {
-                    if (HandleInterval == Obj.HandleInterval && AllOut == Obj.AllOut && ChangeOut == Obj.ChangeOut && TaskNumber == Obj.TaskNumber && TaskHandleInterval == Obj.TaskHandleInterval && BaudRate == Obj.BaudRate &&
-                        CanChannel == Obj.CanChannel &&
-                        SN == Obj.SN)
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
+                return this.Comparer(o as Basics).result;
             }
         }
         /// <summary>

src/YSAI.DAQ/YSAI.Can/CanOperator.cs

@@ -4,7 +4,6 @@ using YSAI.Core.data;
 using YSAI.Core.@interface;
 using YSAI.Core.subscription;
 using YSAI.Core.virtualAddress;
-using YSAI.Log;
 using YSAI.Unility;
 
 namespace YSAI.Can
@@ -31,8 +30,8 @@ namespace YSAI.Can
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<CanOperator> ThisObjList = new List<CanOperator>(); 
-       
+        private static List<CanOperator> ThisObjList = new List<CanOperator>();
+
         /// <summary>
         /// 单例模式
         /// </summary>

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.21</Version>
+	  <Version>1.0.0.22</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Core/communication/net/tcp/client/TcpClientOperate.cs

@@ -29,7 +29,7 @@ namespace YSAI.Core.communication.net.tcp.client
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<TcpClientOperate> ThisObjList = new List<TcpClientOperate>(); 
+        private static List<TcpClientOperate> ThisObjList = new List<TcpClientOperate>();
         /// <summary>
         /// 单例模式
         /// </summary>

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

@@ -101,7 +101,7 @@ namespace YSAI.Core.subscription
         List<ConcurrentDictionary<string, AddressValue>> UpParamArray;
 
 
-        
+
 
         /// <summary>
         /// 现场安全字典比对，是否一致

src/YSAI.DAQ/YSAI.DB/DBData.cs

@@ -36,19 +36,7 @@ namespace YSAI.DB
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (HandleInterval == basics.HandleInterval &&
-                    AllOut == basics.AllOut &&
-                    ChangeOut == basics.ChangeOut &&
-                    TaskNumber == basics.TaskNumber &&
-                    TaskHandleInterval == basics.TaskHandleInterval &&
-                    ConnectStr == basics.ConnectStr &&
-                    DBType == basics.DBType &&
-                    SN == basics.SN)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
         /// <summary>

src/YSAI.DAQ/YSAI.DB/DBOperate.cs

@@ -631,7 +631,7 @@ namespace YSAI.DB
             GC.SuppressFinalize(this);
             ThisObjList.Remove(this);
         }
-        
+
         public Task<OperateResult> ReadAsync(Address address)
         {
             return Task.Run(() => Read(address));

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.20</Version>
+	  <Version>1.0.0.21</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -13,12 +13,12 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Dapper" Version="2.1.4" />
+		<PackageReference Include="Dapper" Version="2.1.11" />
 		<PackageReference Include="MySql.Data" Version="8.1.0" />
 		<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.47" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.48" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

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

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.48" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/KafkaData.cs

@@ -59,16 +59,7 @@ namespace YSAI.Kafka
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (SN == basics.SN &&
-                    BootstrapServers == basics.BootstrapServers &&
-                    WaitTime == basics.WaitTime &&
-                    SecurityProtocol == basics.SecurityProtocol &&
-                     AutoOffsetReset == basics.AutoOffsetReset)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
     }

src/YSAI.DAQ/YSAI.Kafka/KafkaOperate.cs

@@ -23,7 +23,7 @@ namespace YSAI.Kafka
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<KafkaOperate> ThisObjList = new List<KafkaOperate>(); 
+        private static List<KafkaOperate> ThisObjList = new List<KafkaOperate>();
         /// <summary>
         /// 单例模式
         /// </summary>

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.22</Version>
+	  <Version>1.0.0.23</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.20</Version>
+	  <Version>1.0.0.22</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -15,7 +15,7 @@
 	<ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.80" />
     <PackageReference Include="NModbus.Serial" Version="3.0.80" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Modbus/client/ModbusClientData.cs

@@ -167,27 +167,7 @@ namespace YSAI.Modbus.client
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (PortName == basics.PortName &&
-                BaudRate == basics.BaudRate &&
-                ParityBit == basics.ParityBit &&
-                DataBit == basics.DataBit &&
-                StopBit == basics.StopBit &&
-                Ip == basics.Ip &&
-                Port == basics.Port &&
-                ConnectTimeOut == basics.ConnectTimeOut &&
-                HandleInterval == basics.HandleInterval &&
-                AllOut == basics.AllOut &&
-                ChangeOut == basics.ChangeOut &&
-                TaskNumber == basics.TaskNumber &&
-                TaskHandleInterval == basics.TaskHandleInterval &&
-                ProtocolType == basics.ProtocolType &&
-                ReadTimeOut == basics.ReadTimeOut &&
-                WriteTimeOut == basics.WriteTimeOut)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
 

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.24</Version>
+	  <Version>1.0.0.25</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/client/MqttClientData.cs

@@ -68,17 +68,7 @@ namespace YSAI.Mqtt.client
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (SN == basics.SN &&
-                    Ip == basics.Ip &&
-                    Port == basics.Port &&
-                    UserName == basics.UserName &&
-                    ClientID == basics.ClientID &&
-                    Password == basics.Password)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
     }

src/YSAI.DAQ/YSAI.Mqtt/client/MqttClientOperate.cs

@@ -29,7 +29,7 @@ namespace YSAI.Mqtt.client
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<MqttClientOperate> ThisObjList = new List<MqttClientOperate>(); 
+        private static List<MqttClientOperate> ThisObjList = new List<MqttClientOperate>();
         /// <summary>
         /// 单例模式
         /// </summary>

src/YSAI.DAQ/YSAI.Mqtt/service/MqttServiceData.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using YSAI.Unility;
 
 namespace YSAI.Mqtt.service
 {
@@ -42,15 +43,7 @@ namespace YSAI.Mqtt.service
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (UserName == basics.UserName &&
-                Password == basics.Password &&
-                Port == basics.Port &&
-                MaxNumber == basics.MaxNumber)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
 

src/YSAI.DAQ/YSAI.Mqtt/service/MqttServiceOperate.cs

@@ -29,7 +29,7 @@ namespace YSAI.Mqtt.service
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<MqttServiceOperate> ThisObjList = new List<MqttServiceOperate>(); 
+        private static List<MqttServiceOperate> ThisObjList = new List<MqttServiceOperate>();
         /// <summary>
         /// 单例模式
         /// </summary>

src/YSAI.DAQ/YSAI.Mqtt/service/websocket/MqttWebSocketServiceData.cs

@@ -1,4 +1,5 @@
 using YSAI.Core.@interface;
+using YSAI.Unility;
 
 namespace YSAI.Mqtt.service.websocket
 {
@@ -44,16 +45,7 @@ namespace YSAI.Mqtt.service.websocket
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (UserName == basics.UserName &&
-                Password == basics.Password &&
-                Port == basics.Port &&
-                WsPort == basics.WsPort &&
-                Uri == basics.Uri)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
 

src/YSAI.DAQ/YSAI.Mqtt/service/websocket/MqttWebSocketServiceOperate.cs

@@ -36,7 +36,7 @@ namespace YSAI.Mqtt.service.websocket
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<MqttWebSocketServiceOperate> ThisObjList = new List<MqttWebSocketServiceOperate>(); 
+        private static List<MqttWebSocketServiceOperate> ThisObjList = new List<MqttWebSocketServiceOperate>();
         /// <summary>
         /// 单例模式
         /// </summary>
@@ -109,10 +109,10 @@ namespace YSAI.Mqtt.service.websocket
             GC.SuppressFinalize(this);
             ThisObjList.Remove(this);
         }
-       
 
-        
-        
+
+
+
 
         /// <summary>
         /// 信息传递

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.28</Version>
+	  <Version>1.0.0.29</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.56" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 
 

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

@@ -55,14 +55,7 @@ namespace YSAI.Opc.da.client
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (basics.SN == this.SN &&
-                    basics.SName == this.SName &&
-                    basics.ApiVerType == this.ApiVerType)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
 

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

@@ -28,7 +28,7 @@ namespace YSAI.Opc.da.client
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<OpcDaClientOperate> ThisObjList = new List<OpcDaClientOperate>(); 
+        private static List<OpcDaClientOperate> ThisObjList = new List<OpcDaClientOperate>();
 
         /// <summary>
         /// 单例模式
@@ -212,7 +212,7 @@ namespace YSAI.Opc.da.client
             ThisObjList.Remove(this);
         }
 
-       
+
         /// <summary>
         /// 添加组
         /// </summary>

src/YSAI.DAQ/YSAI.Opc/da/http/OpcDaHttpData.cs

@@ -52,21 +52,7 @@ namespace YSAI.Opc.da.http
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (HandleInterval == basics.HandleInterval &&
-                    AllOut == basics.AllOut &&
-                    ChangeOut == basics.ChangeOut &&
-                    TaskNumber == basics.TaskNumber &&
-                    TaskHandleInterval == basics.TaskHandleInterval &&
-                    basics.SN == this.SN &&
-                    basics.Ip == this.Ip &&
-                    basics.Port == this.Port &&
-                    basics.Key == this.Key &&
-                    basics.RequestType == this.RequestType)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
         /// <summary>

src/YSAI.DAQ/YSAI.Opc/da/http/OpcDaHttpOperate.cs

@@ -15,7 +15,7 @@ namespace YSAI.Opc.da.http
     public sealed class OpcDaHttpOperate : IBaseAbstract, IDaq
     {
         protected override string TAG => "OpcDaHttpOperate";
-       
+
         /// <summary>
         /// 锁
         /// </summary>
@@ -31,7 +31,7 @@ namespace YSAI.Opc.da.http
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<OpcDaHttpOperate> ThisObjList = new List<OpcDaHttpOperate>(); 
+        private static List<OpcDaHttpOperate> ThisObjList = new List<OpcDaHttpOperate>();
         /// <summary>
         /// 单例模式
         /// </summary>
@@ -168,7 +168,7 @@ namespace YSAI.Opc.da.http
             GC.SuppressFinalize(this);
             ThisObjList.Remove(this);
         }
-       
+
         /// <summary>
         /// 请求
         /// </summary>

src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientData.cs

@@ -89,23 +89,7 @@ namespace YSAI.Opc.ua.client
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (UserName == basics.UserName &&
-                Password == basics.Password &&
-                ServerUrl == basics.ServerUrl &&
-                CustomName == basics.CustomName &&
-                SN == basics.SN &&
-                SamplingInterval == basics.SamplingInterval &&
-                TaskNumber == basics.TaskNumber &&
-                TaskHandleInterval == basics.TaskHandleInterval &&
-                PublishingInterval == basics.PublishingInterval &&
-                Timeout == basics.Timeout &&
-                Cer == basics.Cer &&
-                SecreKey == basics.SecreKey)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
         /// <summary>

src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientOperate.cs

@@ -35,7 +35,7 @@ namespace YSAI.Opc.ua.client
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<OpcUaClientOperate> ThisObjList = new List<OpcUaClientOperate>(); 
+        private static List<OpcUaClientOperate> ThisObjList = new List<OpcUaClientOperate>();
         /// <summary>
         /// 单例模式
         /// </summary>
@@ -774,7 +774,7 @@ namespace YSAI.Opc.ua.client
             ThisObjList.Remove(this);
         }
 
-       
+
         /// <summary>
         /// 批量添加订阅
         /// </summary>
@@ -907,7 +907,7 @@ namespace YSAI.Opc.ua.client
                             subscription.PublishingEnabled = true;//是否启用发布
                             subscription.PublishingInterval = basics.PublishingInterval; //出版间隔
                             subscription.KeepAliveCount = uint.MaxValue;  //保活计数
-                            subscription.LifetimeCount =  uint.MaxValue;  //寿命计数
+                            subscription.LifetimeCount = uint.MaxValue;  //寿命计数
                             subscription.MaxNotificationsPerPublish = uint.MaxValue;  //每个发布请求的最大通知数
                             subscription.Priority = 1;  //分配给订阅的优先级
                             subscription.DisplayName = Tag;  //订阅的显示名称

src/YSAI.DAQ/YSAI.Opc/ua/service/OpcUaServiceData.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using YSAI.Unility;
 
 namespace YSAI.Opc.ua.service
 {
@@ -37,14 +38,7 @@ namespace YSAI.Opc.ua.service
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (AutoAccept == basics.AutoAccept && 
-                    UserName == basics.UserName && 
-                    Password == basics.Password)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
     }

src/YSAI.DAQ/YSAI.Opc/ua/service/OpcUaServiceOperate.cs

@@ -220,7 +220,7 @@ namespace YSAI.Opc.ua.service
             ThisObjList.Remove(this);
         }
 
-        
+
 
         /// <summary>
         /// 打开

src/YSAI.DAQ/YSAI.Pack.Param/Program.cs

@@ -1,10 +1,5 @@
-using Google.Protobuf.WellKnownTypes;
-using Microsoft.AspNetCore.DataProtection.KeyManagement;
-using Microsoft.Win32.SafeHandles;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using OpcDaNetApi;
-using System.Collections.Generic;
 using YSAI.Can;
 using YSAI.DB;
 using YSAI.Kafka;
@@ -16,7 +11,6 @@ using YSAI.Opc.ua.client;
 using YSAI.RabbitMQ;
 using YSAI.S7.client;
 using YSAI.Unility;
-using static YSAI.Pack.Param.Program;
 using static YSAI.Pack.Param.Program.BodyParam.subset;
 using static YSAI.Unility.ReflexTool;
 
@@ -34,7 +28,7 @@ namespace YSAI.Pack.Param
             }
 
 
-            BodyHandler body1 = new BodyHandler { Body = new CanData.Basics(), FileName = "Can.json",Namespace= "YSAI.Can.CanOperator" };
+            BodyHandler body1 = new BodyHandler { Body = new CanData.Basics(), FileName = "Can.json", Namespace = "YSAI.Can.CanOperator" };
             BodyHandler body2 = new BodyHandler { Body = new DBData.Basics(), FileName = "DB.json", Namespace = "YSAI.DB.DBOperate" };
             BodyHandler body3 = new BodyHandler { Body = new KafkaData.Basics(), FileName = "Kafka.json", Namespace = "YSAI.Kafka.KafkaOperate" };
             BodyHandler body4 = new BodyHandler { Body = new ModbusClientData.Basics(), FileName = "Modbus.json", Namespace = "YSAI.Modbus.client.ModbusClientOperate" };
@@ -88,7 +82,7 @@ namespace YSAI.Pack.Param
                         break;
                 }
 
-               
+
 
                 if (message.Equals("Modbus"))
                 {
@@ -208,7 +202,7 @@ namespace YSAI.Pack.Param
 
                     foreach (var lib in libInstanceParams)
                     {
-                     
+
                         BodyParam.subset.propertie propertie = new BodyParam.subset.propertie
                         {
                             PropertyName = lib.Name,
@@ -254,20 +248,20 @@ namespace YSAI.Pack.Param
                                 Value = false,
                             });
                         }
-                       
+
 
                         bodyParam.Subset[0].Propertie.Add(propertie);
                     }
 
                     if (message.Equals("RabbitMQ") || message.Equals("Mqtt") || message.Equals("Kafka"))
                     {
-                        bodyParam.Subset[0].Propertie.Add(new propertie 
+                        bodyParam.Subset[0].Propertie.Add(new propertie
                         {
                             PropertyName = "Topic",
                             Description = "主题",
                             IsShow = true,
-                            IsMust=true,
-                            DataCate=propertie.dataCate.text
+                            IsMust = true,
+                            DataCate = propertie.dataCate.text
                         });
                     }
 
@@ -277,7 +271,7 @@ namespace YSAI.Pack.Param
                         Description = "实现类名",
                         IsShow = false,
                         IsMust = false,
-                        Value= item.Namespace,
+                        Value = item.Namespace,
                         DataCate = propertie.dataCate.text
                     });
                 }
@@ -291,7 +285,7 @@ namespace YSAI.Pack.Param
         /// 处理的结构
         /// </summary>
         /// <typeparam name="T">泛型对象</typeparam>
-        public class BodyHandler 
+        public class BodyHandler
         {
             public object Body { get; set; }
             public string FileName { get; set; }

src/YSAI.DAQ/YSAI.RabbitMQ/RabbitMQData.cs

@@ -53,17 +53,7 @@ namespace YSAI.RabbitMQ
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (basics.ExChangeName == this.ExChangeName &&
-                    basics.SN == this.SN &&
-                    basics.HostName == this.HostName &&
-                    basics.Port == this.Port &&
-                    basics.UserName == this.UserName &&
-                    basics.Password == this.Password)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
     }

src/YSAI.DAQ/YSAI.RabbitMQ/RabbitMQOperate.cs

@@ -30,7 +30,7 @@ namespace YSAI.RabbitMQ
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<RabbitMQOperate> ThisObjList = new List<RabbitMQOperate>(); 
+        private static List<RabbitMQOperate> ThisObjList = new List<RabbitMQOperate>();
 
         /// <summary>
         /// 单例模式

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.23</Version>
+	  <Version>1.0.0.24</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.48" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.20</Version>
+	  <Version>1.0.0.21</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
     <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.47" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 
 	<!--<ItemGroup>

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

@@ -57,22 +57,7 @@ namespace YSAI.S7.client
             /// <returns></returns>
             public override bool Equals(object o)
             {
-                Basics? basics = o as Basics;
-                if (basics == null) return false;
-                if (HandleInterval == basics.HandleInterval && 
-                    AllOut == basics.AllOut && 
-                    ChangeOut == basics.ChangeOut && 
-                    TaskNumber == basics.TaskNumber && 
-                    TaskHandleInterval == basics.TaskHandleInterval &&
-                    basics.SN == SN &&
-                    basics.Ip == Ip &&
-                    basics.Port == Port &&
-                    basics.S7CpuType == S7CpuType &&
-                    basics.Rack == Rack &&
-                    basics.Slot == Slot)
-                    return true;
-                else
-                    return false;
+                return this.Comparer(o as Basics).result;
             }
         }
 

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

@@ -32,7 +32,7 @@ namespace YSAI.S7.client
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<S7ClientOperate> ThisObjList = new List<S7ClientOperate>(); 
+        private static List<S7ClientOperate> ThisObjList = new List<S7ClientOperate>();
 
         /// <summary>
         /// 单例模式

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

@@ -3,10 +3,10 @@ using YSAI.Unility;
 
 DateTime dateTime = DateTime.Now;
 
-A a=new A();
+A a = new A();
 a.Id = 1;
 
-A b=new A();
+A b = new A();
 b.Id = 1;
 
 

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.47" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.48" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Tool.Core/opc/ua/client/OpcUaClientToolController.cs

@@ -1,13 +1,10 @@
-using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Opc.Ua;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -437,7 +434,7 @@ namespace YSAI.Tool.Core.opc.ua.client
             }
         }
 
-        
+
         /// <summary>
         /// 导出节点
         /// </summary>