1

src/YSAI.DAQ/YSAI.Kafka/KafkaBaseData.cs

@@ -9,16 +9,20 @@ namespace YSAI.Kafka
 {
     public class KafkaBaseData
     {
+        /// <summary>
+        /// 唯一标识符
+        /// </summary>
+        public string? SN { get; set; } = Guid.NewGuid().ToString();    
         /// <summary>
         /// 服务器地址
         /// </summary>
         public string BootstrapServers { get; set; }
 
 
-        public SecurityProtocol SecurityProtocol { get; set; } = SecurityProtocol.Plaintext;
-        public SaslMechanism SaslMechanism { get; set; } = SaslMechanism.Gssapi;
-        public string SaslKerberosServiceName { get; set; }
-        public string SaslKerberosKeytab { get;set; }
-        public string SaslKerberosPrincipal { get; set; }
+        //public SecurityProtocol SecurityProtocol { get; set; } = SecurityProtocol.Plaintext;
+        //public SaslMechanism SaslMechanism { get; set; } = SaslMechanism.Gssapi;
+        //public string SaslKerberosServiceName { get; set; }
+        //public string SaslKerberosKeytab { get;set; }
+        //public string SaslKerberosPrincipal { get; set; }
     }
 }

src/YSAI.DAQ/YSAI.Kafka/KafkaProducerData.cs

@@ -20,7 +20,7 @@ namespace YSAI.Kafka
             /// <summary>
             /// 最多等待时间
             /// </summary>
-            public TimeSpan WaitTime { get; set; } = new TimeSpan(0, 0, 0, 0, 1000);
+            public int WaitTime { get; set; } = 1000;
             /// <summary>
             /// 重写基类中的Equals方法
             /// </summary>
@@ -39,7 +39,7 @@ namespace YSAI.Kafka
                 }
                 else
                 {
-                    if (BootstrapServers == Obj.BootstrapServers)
+                    if (BootstrapServers == Obj.BootstrapServers&& ClientId==Obj.ClientId)
                     {
                         return true;
                     }

src/YSAI.DAQ/YSAI.Kafka/KafkaProducerOperate.cs

@@ -80,12 +80,13 @@ namespace YSAI.Kafka
                         producerConfig = new ProducerConfig()
                         {
                             ClientId = basics.ClientId,
-                            BootstrapServers = basics.BootstrapServers,
-                            SecurityProtocol = basics.SecurityProtocol,
-                            SaslMechanism = basics.SaslMechanism,
-                            SaslKerberosServiceName = basics.SaslKerberosServiceName,
-                            SaslKerberosKeytab = basics.SaslKerberosKeytab,
-                            SaslKerberosPrincipal = basics.SaslKerberosPrincipal
+                            BootstrapServers = basics.BootstrapServers
+                            //,
+                            //SecurityProtocol = basics.SecurityProtocol,
+                            //SaslMechanism = basics.SaslMechanism,
+                            //SaslKerberosServiceName = basics.SaslKerberosServiceName,
+                            //SaslKerberosKeytab = basics.SaslKerberosKeytab,
+                            //SaslKerberosPrincipal = basics.SaslKerberosPrincipal
                         };
                     }
                     using (IProducer<K, V> producer = new ProducerBuilder<K, V>(producerConfig).Build())
@@ -105,7 +106,7 @@ namespace YSAI.Kafka
                             }
                         });
                         //最多等待时间
-                        producer.Flush(basics.WaitTime);
+                        producer.Flush(new TimeSpan(0,0,0,0, basics.WaitTime));
                         if (result == null)
                         {
                             result = Break("Produce", false, $"主题 [ {data.Topic} ] 发送失败");

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

@@ -218,6 +218,10 @@ namespace YSAI.Modbus.client
         /// </summary>
         public class Basics
         {
+            /// <summary>
+            /// 唯一标识符
+            /// </summary>
+            public string? SN { get; set; }
             /// <summary>
             /// 寄存器地址
             /// </summary>