版本更新

README.md

@@ -451,4 +451,6 @@ while(true)
 
 #### 2023-11-10
 1. 自定义订阅细节修改，移除不必要的事件
-2. 新增松下PLC
+2. 新增松下PLC
+3. 修改获取参数函数细节
+4. 移除不必要的事件跳转

src/YSAI.AllenBradley/YSAI.AllenBradley.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.3</Version>
+		<Version>1.0.0.4</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -13,6 +13,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
 	</ItemGroup>
 </Project>

src/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.13</Version>
+		<Version>1.0.0.14</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.Can/YSAI.Can.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.39</Version>
+	  <Version>1.0.0.40</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.Core/YSAI.Core.csproj

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

src/YSAI.Core/handler/ParamHandler.cs

@@ -224,8 +224,6 @@ namespace YSAI.Core.handler
 
                                 Regex = verifyAttribute?.Regex ?? null,
                                 FailTips = verifyAttribute?.FailTips ?? null,
-
-                                Default = Default
                             };
                             switch (displayAttribute?.DataCate)
                             {
@@ -258,6 +256,12 @@ namespace YSAI.Core.handler
                                         Key = "否",
                                         Value = false,
                                     });
+
+                                    propertie.Default = Default;
+                                    break;
+
+                                default:
+                                    propertie.Default = Default;
                                     break;
                             }
                             paramStructure.Subset[i].Propertie.Add(propertie);

src/YSAI.DB/YSAI.DB.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.39</Version>
+	  <Version>1.0.0.40</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -18,7 +18,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.90" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DaqManage/YSAI.DaqManage.csproj

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

src/YSAI.Kafka/YSAI.Kafka.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.39</Version>
+	  <Version>1.0.0.40</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.Mewtocol/MewtocolOperate.cs

@@ -847,15 +847,15 @@ namespace YSAI.Mewtocol
                         },
                         RGroups=new List<ParamHandler.RGroup>
                         {
-                            new ParamHandler.RGroup
-                            {
-                                RIndex=2,
-                                RCount=1
-                            },
                              new ParamHandler.RGroup
                             {
                                 RIndex=6,
                                 RCount=5
+                            },
+                              new ParamHandler.RGroup
+                            {
+                                RIndex=2,
+                                RCount=1
                             }
                         }
                     },new ParamHandler.SubClass
@@ -875,15 +875,15 @@ namespace YSAI.Mewtocol
                         },
                         RGroups=new List<ParamHandler.RGroup>
                         {
-                            new ParamHandler.RGroup
-                            {
-                                RIndex=2,
-                                RCount=1
-                            },
                              new ParamHandler.RGroup
                             {
                                 RIndex=4,
                                 RCount=2
+                            },
+                              new ParamHandler.RGroup
+                            {
+                                RIndex=2,
+                                RCount=1
                             }
                         }
                     }

src/YSAI.Mewtocol/YSAI.Mewtocol.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Mewtocol.NET" Version="0.8.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
 	</ItemGroup>
 
 </Project>

src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.7</Version>
+		<Version>1.0.0.8</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
 </Project>

src/YSAI.Modbus/ModbusOperate.cs

@@ -2227,15 +2227,15 @@ namespace YSAI.Modbus
                         },
                         RGroups=new List<ParamHandler.RGroup>
                         {
-                            new ParamHandler.RGroup
-                            {
-                                RIndex=2,
-                                RCount=1
-                            },
                              new ParamHandler.RGroup
                             {
                                 RIndex=10,
                                 RCount=5
+                            },
+                              new ParamHandler.RGroup
+                            {
+                                RIndex=2,
+                                RCount=1
                             }
                         }
                     },new ParamHandler.SubClass
@@ -2255,15 +2255,15 @@ namespace YSAI.Modbus
                         },
                         RGroups=new List<ParamHandler.RGroup>
                         {
-                            new ParamHandler.RGroup
-                            {
-                                RIndex=2,
-                                RCount=1
-                            },
                              new ParamHandler.RGroup
                             {
                                 RIndex=10,
                                 RCount=5
+                            },
+                               new ParamHandler.RGroup
+                            {
+                                RIndex=2,
+                                RCount=1
                             }
                         }
                     },

src/YSAI.Modbus/YSAI.Modbus.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.40</Version>
+	  <Version>1.0.0.41</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -15,7 +15,7 @@
 	<ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.81" />
     <PackageReference Include="NModbus.Serial" Version="3.0.81" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.41</Version>
+	  <Version>1.0.0.42</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.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.5</Version>
+		<Version>1.0.0.6</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -16,7 +16,7 @@
 
 	<ItemGroup>
     <PackageReference Include="NetMQ" Version="4.0.1.13" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
 </Project>

src/YSAI.Netty/YSAI.Netty.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.13</Version>
+		<Version>1.0.0.14</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -14,6 +14,6 @@
 	<ItemGroup>
 		<PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
 		<PackageReference Include="DotNetty.Transport" Version="0.7.5" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
 	</ItemGroup>
 </Project>

src/YSAI.Omron/YSAI.Omron.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.7</Version>
+		<Version>1.0.0.8</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
 	</ItemGroup>
 
 </Project>

src/YSAI.Opc/YSAI.Opc.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.51</Version>
+	  <Version>1.0.0.52</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.76" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.90" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
 

src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.40</Version>
+	  <Version>1.0.0.41</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.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.RelayManage/YSAI.RelayManage.csproj

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

src/YSAI.S7/YSAI.S7.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.38</Version>
+	  <Version>1.0.0.39</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.90" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.Test.Console/Program.cs

@@ -21,55 +21,55 @@ using YSAI.S7;
 using YSAI.Unility;
 
 OperateResult operateResult = new BeckhoffOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"BeckhoffOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"BeckhoffOperate.log");
 
 operateResult = new CanOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"CanOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"CanOperate.log");
 
 operateResult = new DBOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"DBOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"DBOperate.log");
 
 operateResult = new ModbusOperate().GetParam();
 LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"ModbusOperate.log");
 
 operateResult = new OpcUaClientOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcUaClientOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcUaClientOperate.log");
 
 operateResult = new OpcDaClientOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaClientOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaClientOperate.log");
 
 operateResult = new OpcDaHttpOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaHttpOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OpcDaHttpOperate.log");
 
 operateResult = new S7Operate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"S7Operate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"S7Operate.log");
 
 operateResult = new KafkaOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"KafkaOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"KafkaOperate.log");
 
 operateResult = new MqttClientOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MqttClientOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MqttClientOperate.log");
 
 operateResult = new NettyClientOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"NettyClientOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"NettyClientOperate.log");
 
 operateResult = new RabbitMQOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"RabbitMQOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"RabbitMQOperate.log");
 
 operateResult = new MitsubishiOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MitsubishiOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MitsubishiOperate.log");
 
 operateResult = new OmronOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OmronOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"OmronOperate.log");
 
 operateResult = new NetMQOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"NetMQOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"NetMQOperate.log");
 
 operateResult = new AllenBradleyOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"AllenBradleyOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"AllenBradleyOperate.log");
 
 operateResult = new MewtocolOperate().GetParam();
-LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MewtocolOperate.log");
+//LogHelper.Verbose(operateResult.RData.ToJson().JsonFormatting(), $"MewtocolOperate.log");
 
 //using System.Collections.Concurrent;
 //using YSAI.Beckhoff;

src/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.90" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.91" />
   </ItemGroup>
 
   <ItemGroup>