Shun 2 лет назад
Родитель
Сommit
2293cab2c7
33 измененных файлов с 46 добавлено и 47 удалено
  1. 1 1
      src/YSAI.DAQ/YSAI.Beckhoff/BeckhoffOperate.cs
  2. 2 2
      src/YSAI.DAQ/YSAI.Beckhoff/YSAI.Beckhoff.csproj
  3. 1 1
      src/YSAI.DAQ/YSAI.Can/CanOperate.cs
  4. 2 2
      src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj
  5. 1 1
      src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj
  6. 1 2
      src/YSAI.DAQ/YSAI.Core/handler/ParamHandler.cs
  7. 1 1
      src/YSAI.DAQ/YSAI.DB/DBOperate.cs
  8. 2 2
      src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj
  9. 1 1
      src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj
  10. 1 1
      src/YSAI.DAQ/YSAI.Kafka/KafkaOperate.cs
  11. 2 2
      src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj
  12. 1 1
      src/YSAI.DAQ/YSAI.Mitsubishi/MitsubishiOperate.cs
  13. 2 2
      src/YSAI.DAQ/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj
  14. 1 1
      src/YSAI.DAQ/YSAI.Modbus/ModbusOperate.cs
  15. 2 2
      src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj
  16. 2 2
      src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj
  17. 1 1
      src/YSAI.DAQ/YSAI.Mqtt/client/MqttClientOperate.cs
  18. 1 1
      src/YSAI.DAQ/YSAI.NetMQ/NetMQOperate.cs
  19. 2 2
      src/YSAI.DAQ/YSAI.NetMQ/YSAI.NetMQ.csproj
  20. 2 2
      src/YSAI.DAQ/YSAI.Netty/YSAI.Netty.csproj
  21. 1 1
      src/YSAI.DAQ/YSAI.Netty/client/NettyClientOperate.cs
  22. 1 1
      src/YSAI.DAQ/YSAI.Omron/OmronOperate.cs
  23. 2 2
      src/YSAI.DAQ/YSAI.Omron/YSAI.Omron.csproj
  24. 2 2
      src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj
  25. 1 1
      src/YSAI.DAQ/YSAI.Opc/da/client/OpcDaClientOperate.cs
  26. 1 1
      src/YSAI.DAQ/YSAI.Opc/da/http/OpcDaHttpOperate.cs
  27. 1 1
      src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientOperate.cs
  28. 1 1
      src/YSAI.DAQ/YSAI.RabbitMQ/RabbitMQOperate.cs
  29. 2 2
      src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj
  30. 1 1
      src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj
  31. 1 1
      src/YSAI.DAQ/YSAI.S7/S7Operate.cs
  32. 2 2
      src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj
  33. 1 1
      src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

+ 1 - 1
src/YSAI.DAQ/YSAI.Beckhoff/BeckhoffOperate.cs

@@ -734,7 +734,7 @@ namespace YSAI.Beckhoff
                 //命名空间
                 string nameSpace = "YSAI.Beckhoff.BeckhoffOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new BeckhoffData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new BeckhoffData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
src/YSAI.DAQ/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.10</Version>
+		<Version>1.0.0.11</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.86" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.87" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

+ 1 - 1
src/YSAI.DAQ/YSAI.Can/CanOperate.cs

@@ -471,7 +471,7 @@ namespace YSAI.Can
                 //命名空间
                 string nameSpace = "YSAI.Can.CanOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new CanData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new CanData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
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.35</Version>
+	  <Version>1.0.0.36</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
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.86</Version>
+    <Version>1.0.0.87</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

+ 1 - 2
src/YSAI.DAQ/YSAI.Core/handler/ParamHandler.cs

@@ -52,12 +52,11 @@ namespace YSAI.Core.handler
         /// <typeparam name="T">数据类型</typeparam>
         /// <param name="obj">类型对象</param>
         /// <param name="name">名称</param>
-        /// <param name="nameSpace">命名空间</param>
         /// <param name="Properties">属性项集合</param>
         /// <param name="RGroups">移除某几组</param>
         /// <param name="subclass">子类</param>
         /// <returns>统一返回</returns>
-        public static OperateResult Get<T>(T obj, string name, string nameSpace, List<ParamStructure.propertie>? Properties = null, List<RGroup>? RGroups = null, List<SubClass>? subclass = null)
+        public static OperateResult Get<T>(T obj, string name, List<ParamStructure.propertie>? Properties = null, List<RGroup>? RGroups = null, List<SubClass>? subclass = null)
         {
             TimeTool timeTool = TimeTool.Instance(Guid.NewGuid().ToUpperNString());
             timeTool.StartRecord();

+ 1 - 1
src/YSAI.DAQ/YSAI.DB/DBOperate.cs

@@ -849,7 +849,7 @@ namespace YSAI.DB
                 //命名空间
                 string nameSpace = "YSAI.DB.DBOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new DBData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new DBData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
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.35</Version>
+	  <Version>1.0.0.36</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.86" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.87" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

+ 1 - 1
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.86" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.87" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

+ 1 - 1
src/YSAI.DAQ/YSAI.Kafka/KafkaOperate.cs

@@ -517,7 +517,7 @@ namespace YSAI.Kafka
                 //命名空间
                 string nameSpace = "YSAI.Kafka.KafkaOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new KafkaData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new KafkaData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
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.36</Version>
+	  <Version>1.0.0.37</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.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

+ 1 - 1
src/YSAI.DAQ/YSAI.Mitsubishi/MitsubishiOperate.cs

@@ -1083,7 +1083,7 @@ namespace YSAI.Mitsubishi
                 //对象实例
                 MitsubishiData.Basics basics = new MitsubishiData.Basics();
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new MitsubishiData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new MitsubishiData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
src/YSAI.DAQ/YSAI.Mitsubishi/YSAI.Mitsubishi.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,7 +13,7 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
src/YSAI.DAQ/YSAI.Modbus/ModbusOperate.cs

@@ -2212,7 +2212,7 @@ namespace YSAI.Modbus
                 //命名空间
                 string nameSpace = "YSAI.Modbus.ModbusOperate";
                 //获取参数
-                OperateResult operateResult = ParamHandler.Get(new ModbusData.Basics(), name, nameSpace, subclass: new List<ParamHandler.SubClass>
+                OperateResult operateResult = ParamHandler.Get(new ModbusData.Basics(), name, subclass: new List<ParamHandler.SubClass>
                 {
                     new ParamHandler.SubClass
                     {

+ 2 - 2
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.36</Version>
+	  <Version>1.0.0.37</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.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
 	<!--<ItemGroup>

+ 2 - 2
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.38</Version>
+	  <Version>1.0.0.39</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.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
 	<!--<ItemGroup>

+ 1 - 1
src/YSAI.DAQ/YSAI.Mqtt/client/MqttClientOperate.cs

@@ -405,7 +405,7 @@ namespace YSAI.Mqtt.client
                 //命名空间
                 string nameSpace = "YSAI.Mqtt.client.MqttClientOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new MqttClientData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new MqttClientData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 1 - 1
src/YSAI.DAQ/YSAI.NetMQ/NetMQOperate.cs

@@ -399,7 +399,7 @@ namespace YSAI.NetMQ
                 //命名空间
                 string nameSpace = "YSAI.Netty.NettyClientOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new NetMQData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new NetMQData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
src/YSAI.DAQ/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.2</Version>
+		<Version>1.0.0.3</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.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
 </Project>

+ 2 - 2
src/YSAI.DAQ/YSAI.Netty/YSAI.Netty.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.10</Version>
+		<Version>1.0.0.11</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.86" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.87" />
 	</ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.DAQ/YSAI.Netty/client/NettyClientOperate.cs

@@ -507,7 +507,7 @@ namespace YSAI.Netty.client
                 //命名空间
                 string nameSpace = "YSAI.Netty.NettyClientOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new NettyClientData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new NettyClientData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 1 - 1
src/YSAI.DAQ/YSAI.Omron/OmronOperate.cs

@@ -946,7 +946,7 @@ namespace YSAI.Omron
                 //命名空间
                 string nameSpace = "YSAI.Omron.OmronOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new OmronData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new OmronData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
src/YSAI.DAQ/YSAI.Omron/YSAI.Omron.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,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="YSAI.Core" Version="1.0.0.86" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.87" />
 	</ItemGroup>
 
 </Project>

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

+ 1 - 1
src/YSAI.DAQ/YSAI.Opc/da/client/OpcDaClientOperate.cs

@@ -1047,7 +1047,7 @@ namespace YSAI.Opc.da.client
                 //命名空间
                 string nameSpace = "YSAI.Opc.da.client.OpcDaClientOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new OpcDaClientData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new OpcDaClientData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 1 - 1
src/YSAI.DAQ/YSAI.Opc/da/http/OpcDaHttpOperate.cs

@@ -536,7 +536,7 @@ namespace YSAI.Opc.da.http
                 //命名空间
                 string nameSpace = "YSAI.DB.DBOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new OpcDaHttpData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new OpcDaHttpData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 1 - 1
src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientOperate.cs

@@ -1867,7 +1867,7 @@ namespace YSAI.Opc.ua.client
                 //命名空间
                 string nameSpace = "YSAI.Opc.ua.client.OpcUaClientOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new OpcUaClientData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new OpcUaClientData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 1 - 1
src/YSAI.DAQ/YSAI.RabbitMQ/RabbitMQOperate.cs

@@ -480,7 +480,7 @@ namespace YSAI.RabbitMQ
                 //命名空间
                 string nameSpace = "YSAI.RabbitMQ.RabbitMQOperate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new RabbitMQData.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new RabbitMQData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
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.37</Version>
+	  <Version>1.0.0.38</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.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
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.3.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.86" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.87" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

+ 1 - 1
src/YSAI.DAQ/YSAI.S7/S7Operate.cs

@@ -494,7 +494,7 @@ namespace YSAI.S7
                 //命名空间
                 string nameSpace = "YSAI.S7.S7Operate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new S7Data.Basics(), name, nameSpace, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new S7Data.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {

+ 2 - 2
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.34</Version>
+	  <Version>1.0.0.35</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.86" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
 	<!--<ItemGroup>

+ 1 - 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.86" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.87" />
   </ItemGroup>
 
   <ItemGroup>