test 修改

README.md

@@ -436,4 +436,5 @@ while(true)
 #### 2023-11-08
 1. 新增 NETMQ 传输协议（不保证消息质量模式）
 2. 优化函数运行时间，使用 struct 直接操作底层，性能提升
-3. 细节优化，版本更新
+3. 细节优化，版本更新
+4. 修改所有协议获取参数重复代码，移植至Core

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

@@ -1,4 +1,5 @@
 Console.WriteLine();
+
 //Console.WriteLine(DateTime.Parse($"{0}:{0}:{0}.{123}").ToString("HH:mm:ss:fff"));
 
 //using YSAI.Unility;
@@ -723,7 +724,6 @@
 //using YSAI.Core.data;
 //using YSAI.Log;
 //using YSAI.Opc.ua.client;
-//using YSAI.Opc.ua.client.unility;
 //using YSAI.Unility;
 
 ///// <summary>
@@ -781,7 +781,7 @@
 //    CustomName = "YSAI 性能测试",
 //    TaskNumber = 10,
 //    TaskHandleInterval = 1,
-//    SubscribeSingleGroupMaxCount = 300,
+//    SubscribeSingleGroupMaxCount = 1000,
 //});
 //Console.WriteLine(opcUaClientOperate.On().ToJson().JsonFormatting());
 //opcUaClientOperate.OnEvent += OpcUaClientOperate_OnEvent;
@@ -804,15 +804,17 @@
 //            {
 //                if (item.Value.AddressName.Equals("ns=2;s=6022.6022.LAP5_DP2112_STATE_RUN") || item.Value.AddressName.Equals("ns=2;s=6022.6022.LAP5_DP2113_AUTO"))
 //                {
-//                    String str = String.Format("{0,-100}{1,-100}", item.Key, item.Value.Value);
-
-//                    LogHelper.Verbose(str);
+//                    //String str = String.Format("{0,-100}{1,-100}", item.Key, item.Value.Value);
+//                    //LogHelper.Verbose(str);
 //                }
+
+//                String str = String.Format("{0,-100}{1,-100}", item.Key, item.Value.Value);
+//                LogHelper.Verbose(str);
 //            }
 //            break;
 
 //        default:
-//            Console.WriteLine(e.Message);
+//            //Console.WriteLine(e.Message);
 //            break;
 //    }
 //}

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

@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\YSAI.NetMQ\YSAI.NetMQ.csproj" />
+    <ProjectReference Include="..\YSAI.Opc\YSAI.Opc.csproj" />
   </ItemGroup>
 
 

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

@@ -1,56 +1,67 @@
 
-Console.WriteLine();
-//using YSAI.Beckhoff;
-//using YSAI.Can;
-//using YSAI.Core.data;
-//using YSAI.DB;
-//using YSAI.Kafka;
-//using YSAI.Log;
-//using YSAI.Modbus;
-//using YSAI.Mqtt.client;
-//using YSAI.Netty.client;
-//using YSAI.Opc.da.client;
-//using YSAI.Opc.da.http;
-//using YSAI.Opc.ua.client;
-//using YSAI.RabbitMQ;
-//using YSAI.S7;
-//using YSAI.Unility;
+using YSAI.Beckhoff;
+using YSAI.Can;
+using YSAI.Core.data;
+using YSAI.DB;
+using YSAI.Kafka;
+using YSAI.Log;
+using YSAI.Mitsubishi;
+using YSAI.Modbus;
+using YSAI.Mqtt.client;
+using YSAI.NetMQ;
+using YSAI.Netty.client;
+using YSAI.Omron;
+using YSAI.Opc.da.client;
+using YSAI.Opc.da.http;
+using YSAI.Opc.ua.client;
+using YSAI.RabbitMQ;
+using YSAI.S7;
+using YSAI.Unility;
+
+OperateResult operateResult = new BeckhoffOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"BeckhoffOperate.log");
+
+operateResult = new CanOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"CanOperate.log");
+
+operateResult = new DBOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"DBOperate.log");
 
-//OperateResult operateResult = new BeckhoffOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"BeckhoffOperate.log");
+operateResult = new ModbusOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"ModbusOperate.log");
 
-//operateResult = new CanOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"CanOperate.log");
+operateResult = new OpcUaClientOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcUaClientOperate.log");
 
-//operateResult = new DBOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"DBOperate.log");
+operateResult = new OpcDaClientOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaClientOperate.log");
 
-//operateResult = new ModbusOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"ModbusOperate.log");
+operateResult = new OpcDaHttpOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaHttpOperate.log");
 
-//operateResult = new OpcUaClientOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcUaClientOperate.log");
+operateResult = new S7Operate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"S7Operate.log");
 
-//operateResult = new OpcDaClientOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaClientOperate.log");
+operateResult = new KafkaOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"KafkaOperate.log");
 
-//operateResult = new OpcDaHttpOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaHttpOperate.log");
+operateResult = new MqttClientOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MqttClientOperate.log");
 
-//operateResult = new S7Operate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"S7Operate.log");
+operateResult = new NettyClientOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"NettyClientOperate.log");
 
-//operateResult = new KafkaOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"KafkaOperate.log");
+operateResult = new RabbitMQOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"RabbitMQOperate.log");
 
-//operateResult = new MqttClientOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MqttClientOperate.log");
+operateResult = new MitsubishiOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MitsubishiOperate.log");
 
-//operateResult = new NettyClientOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"NettyClientOperate.log");
+operateResult = new OmronOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OmronOperate.log");
 
-//operateResult = new RabbitMQOperate().GetParam();
-//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"RabbitMQOperate.log");
+operateResult = new NetMQOperate().GetParam();
+LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"NetMQOperate.log");
 
 //using System.Collections.Concurrent;
 //using YSAI.Beckhoff;

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

@@ -5,6 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	  <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
   </PropertyGroup>
 
 	<ItemGroup>
@@ -12,9 +13,12 @@
 		<ProjectReference Include="..\YSAI.Can\YSAI.Can.csproj" />
 		<ProjectReference Include="..\YSAI.DB\YSAI.DB.csproj" />
 		<ProjectReference Include="..\YSAI.Kafka\YSAI.Kafka.csproj" />
+		<ProjectReference Include="..\YSAI.Mitsubishi\YSAI.Mitsubishi.csproj" />
 		<ProjectReference Include="..\YSAI.Modbus\YSAI.Modbus.csproj" />
 		<ProjectReference Include="..\YSAI.Mqtt\YSAI.Mqtt.csproj" />
+		<ProjectReference Include="..\YSAI.NetMQ\YSAI.NetMQ.csproj" />
 		<ProjectReference Include="..\YSAI.Netty\YSAI.Netty.csproj" />
+		<ProjectReference Include="..\YSAI.Omron\YSAI.Omron.csproj" />
 		<ProjectReference Include="..\YSAI.Opc\YSAI.Opc.csproj" />
 		<ProjectReference Include="..\YSAI.RabbitMQ\YSAI.RabbitMQ.csproj" />
 		<ProjectReference Include="..\YSAI.S7\YSAI.S7.csproj" />