1

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.2</Version>
+	  <Version>1.0.0.3</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.18" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.19" />
   </ItemGroup>
 
   <!--<ItemGroup>

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.18</Version>
+    <Version>1.0.0.19</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>
@@ -17,7 +17,7 @@
 		<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />
 		<PackageReference Include="YSAI.Log" Version="1.0.0.8" />
-		<PackageReference Include="YSAI.Unility" Version="1.0.0.8" />
+		<PackageReference Include="YSAI.Unility" Version="1.0.0.9" />
 	</ItemGroup>
 
 </Project>

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.2</Version>
+	  <Version>1.0.0.3</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.18" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.19" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

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

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.18" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.19" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

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.3</Version>
+	  <Version>1.0.0.4</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.18" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.19" />
   </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.2</Version>
+	  <Version>1.0.0.3</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.18" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.19" />
   </ItemGroup>
 
 	<!--<ItemGroup>

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

@@ -18,6 +18,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Mail;
 using System.Net.Sockets;
+using System.Runtime.Intrinsics.X86;
 using System.Text;
 using System.Threading.Tasks;
 using YSAI.Core.data;
@@ -1777,14 +1778,30 @@ namespace YSAI.Modbus.client
                     {
                         (int startAddress, int numberOfPoints) Dvalue = DisposeAddress(add.AddressName);
                         ushort[] retvalue = modbusMaster.ReadInputRegisters((byte)basics.SlaveAddress, (ushort)Dvalue.startAddress, (ushort)Dvalue.numberOfPoints);
+                        if (retvalue.Length > 2)
+                        {
+                            List<RetValue> DValue = new List<RetValue>();
+                            for (int i = 1; i < retvalue.Length; i++)
+                            {
+                                if (i % 2 == 1)
+                                {
+                                    int low = i - 1;
+                                    int high = i;
+                                    DValue.Add(new RetValue { Address = $"{low},2", Value = ModbusUtility.GetSingle(retvalue[high], retvalue[low]).ToString() });
+                                }
+                            }
+                            Value = DValue.ToJson();
+                        }
+                        else
+                        {
+                            Value = ModbusUtility.GetSingle(retvalue[1], retvalue[0]).ToString();
+                        }
 
-                        Value = ModbusUtility.GetSingle(retvalue[1], retvalue[0]).ToString();
+                        //数据处理
+                        AddressValue addressValue = Core.data.AddressHandler.ExecuteDispose(add, Value);
+                        //数据添加
+                        param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
                     }
-                    //数据处理
-                    AddressValue addressValue = Core.data.AddressHandler.ExecuteDispose(add, Value);
-
-                    //数据添加
-                    param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
                 }
                 if (param.Count > 0)
                 {

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.3</Version>
+	  <Version>1.0.0.4</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.18" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.19" />
   </ItemGroup>
 
 	<!--<ItemGroup>

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.2</Version>
+	  <Version>1.0.0.3</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -27,7 +27,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.56" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.18" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.19" />
   </ItemGroup>
 
 

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.3</Version>
+	  <Version>1.0.0.4</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.18" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.19" />
   </ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

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

@@ -10,7 +10,7 @@
 		<PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.18" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.19" />
 	</ItemGroup>
 
 	<!--<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.2</Version>
+	  <Version>1.0.0.3</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.18" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.19" />
   </ItemGroup>
 
 	<!--<ItemGroup>

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

@@ -161,14 +161,14 @@ address.AddressArray = new List<AddressDetails>();
 //    AddressName = "0,2",
 //    AddressDataType = YSAI.Core.@enum.DataType.Double,
 //    AddressType = AddressType.Reality,
-//    AddressDescribe = "上一次的湿度"
+//    AddressDescribe = "湿度"
 //});
 //address.AddressArray.Add(new AddressDetails()
 //{
 //    AddressName = "2,2",
 //    AddressDataType = YSAI.Core.@enum.DataType.Double,
 //    AddressType = AddressType.Reality,
-//    AddressDescribe = "上一次的密度"
+//    AddressDescribe = "密度"
 //});
 //address.AddressArray.Add(new AddressDetails()
 //{
@@ -184,19 +184,19 @@ address.AddressArray = new List<AddressDetails>();
 //    AddressType = AddressType.Reality,
 //    AddressDescribe = "实时湿度"
 //});
+//address.AddressArray.Add(new AddressDetails()
+//{
+//    AddressName = "8,2",
+//    AddressDataType = YSAI.Core.@enum.DataType.Double,
+//    AddressType = AddressType.Reality,
+//    AddressDescribe = "实时密度"
+//});
 address.AddressArray.Add(new AddressDetails()
 {
-    AddressName = "8,2",
-    AddressDataType = YSAI.Core.@enum.DataType.Double,
-    AddressType = AddressType.Reality,
-    AddressDescribe = "实时密度"
-});
-address.AddressArray.Add(new AddressDetails()
-{
-    AddressName = "10,2",
+    AddressName = "0,2",
     AddressDataType = YSAI.Core.@enum.DataType.Double,
     AddressType = AddressType.Reality,
-    AddressDescribe = "实时温度"
+    AddressDescribe = "湿度，密度，长度"
 });
 ModbusClientOperate modbusClientOperate = ModbusClientOperate.Instance(new ModbusClientData.Basics
 {
@@ -211,8 +211,8 @@ OperateResult operateResult = modbusClientOperate.On();
 Console.WriteLine(operateResult.ToJson());
 
 
-//operateResult = modbusClientOperate.Read(address);
-//Console.WriteLine(operateResult.ToJson());
+operateResult = modbusClientOperate.Read(address);
+Console.WriteLine(operateResult.ToJson());
 
 modbusClientOperate.OnEvent += ModbusClientOperate_OnEvent;
 

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

src/YSAI.DAQ/YSAI.Unility.Windows/YSAI.Unility.Windows.csproj

@@ -15,7 +15,7 @@
 	<ItemGroup>
 		<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.2" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NPOI" Version="2.6.1" />
+		<PackageReference Include="NPOI" Version="2.6.2" />
 		<PackageReference Include="System.Speech" Version="7.0.0" />
 	</ItemGroup>
 </Project>

src/YSAI.DAQ/YSAI.Unility/YSAI.Unility.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.8</Version>
+		<Version>1.0.0.9</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.32.3" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.0.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>