1

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.16" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.17" />
   </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.16</Version>
+    <Version>1.0.0.17</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>
@@ -16,8 +16,8 @@
 		<PackageReference Include="Microsoft.ClearScript" Version="7.4.3" />
 		<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.7" />
-		<PackageReference Include="YSAI.Unility" Version="1.0.0.7" />
+		<PackageReference Include="YSAI.Log" Version="1.0.0.8" />
+		<PackageReference Include="YSAI.Unility" Version="1.0.0.8" />
 	</ItemGroup>
 
 </Project>

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -12,7 +12,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.16" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.17" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/DaqManageOperate.cs

@@ -30,7 +30,7 @@ namespace YSAI.DaqManage
         /// <summary>
         /// 接口名称
         /// </summary>
-        private readonly string? InterfaceFullName = "YSAI.Core.interface.unify.IDaq";
+        private readonly string? InterfaceFullName = "YSAI.Core.interface.IDaq";
 
         /// <summary>
         /// 配置数据
@@ -350,7 +350,7 @@ namespace YSAI.DaqManage
             try
             {
                 //库
-                List<string> libs = Directory.GetFiles(basics.LibFolder, "*.dll", SearchOption.AllDirectories).ToList();
+                List<string> libs = Directory.GetFiles(basics.LibFolder, "YSAI.*.dll", SearchOption.AllDirectories).ToList();
                 //循环文件，添加程序集
                 foreach (var lib in libs)
                 {

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

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.16" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.17" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Log/YSAI.Log.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>

src/YSAI.DAQ/YSAI.Manage/YSAI.Manage.csproj

@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.Param.json

@@ -1,5 +1,8 @@
 {
     "SN": null,
     "BaudRate": 0,
-    "CanChannel": 0
+    "CanChannel": 0,
+    "SleepTime": 500,
+    "DataChangeOut": true,
+    "SameDataOut": false
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.ParamDetails.json

@@ -100,5 +100,26 @@
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
+    },
+    {
+        "Name": "SleepTime",
+        "Describe": "休眠时间",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "DataChangeOut",
+        "Describe": "数据变化抛出",
+        "ParamType": "Boolean",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "SameDataOut",
+        "Describe": "未变项与变化项一同抛出",
+        "ParamType": "Boolean",
+        "EnumArray": null,
+        "ObjArray": null
     }
 ]

src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.Param.json

@@ -2,7 +2,7 @@
     "SN": null,
     "ConnectStr": null,
     "DBType": "SqlServer",
-    "SleepTime": 0,
+    "SleepTime": 500,
     "DataChangeOut": true,
     "SameDataOut": false
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Kafka.Param.json

@@ -1,7 +1,7 @@
 {
-    "SN": "ac0f9544-48f0-433a-946c-15dc6d2b2ae9",
+    "SN": "b7458b7c-5e7a-45fa-8ce3-64c5a7adef51",
     "BootstrapServers": null,
     "WaitTime": 1000,
     "SecurityProtocol": "Plaintext",
-    "AutoOffsetReset": "Earliest"
+    "AutoOffsetReset": "Latest"
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.Param.json

@@ -14,7 +14,7 @@
     "ParityBit": "Even",
     "DataBit": 8,
     "StopBit": "One",
-    "SleepTime": 0,
+    "SleepTime": 500,
     "DataChangeOut": true,
     "SameDataOut": false
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.ParamDetails.json

@@ -75,6 +75,41 @@
             },
             {
                 "Value": 4,
+                "Name": "CharHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为字符数组"
+            },
+            {
+                "Value": 5,
+                "Name": "UshortHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为短数组"
+            },
+            {
+                "Value": 6,
+                "Name": "ShortHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为短数组"
+            },
+            {
+                "Value": 7,
+                "Name": "UintHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为int数组"
+            },
+            {
+                "Value": 8,
+                "Name": "IntHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为int数组"
+            },
+            {
+                "Value": 9,
+                "Name": "FloatHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为浮点数组"
+            },
+            {
+                "Value": 10,
+                "Name": "FloatInputRegisters",
+                "Describe": "读取寄存器并将结果转换为浮点"
+            },
+            {
+                "Value": 11,
                 "Name": "NULL",
                 "Describe": "空"
             }
@@ -108,6 +143,36 @@
             },
             {
                 "Value": 4,
+                "Name": "CharHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为字符数组"
+            },
+            {
+                "Value": 5,
+                "Name": "UshortHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为短数组"
+            },
+            {
+                "Value": 6,
+                "Name": "ShortHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为短数组"
+            },
+            {
+                "Value": 7,
+                "Name": "UintHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为int数组"
+            },
+            {
+                "Value": 8,
+                "Name": "IntHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为int数组"
+            },
+            {
+                "Value": 9,
+                "Name": "FloatHoldingRegisters",
+                "Describe": "读取寄存器并将结果转换为浮点数组"
+            },
+            {
+                "Value": 10,
                 "Name": "NULL",
                 "Describe": "空"
             }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.Param.json

@@ -1,6 +1,6 @@
 {
     "SN": null,
-    "ServiceName": null,
+    "SName": null,
     "ApiVerType": "COM_DA_10",
     "UpdateRate": 100
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.ParamDetails.json

@@ -7,7 +7,7 @@
         "ObjArray": null
     },
     {
-        "Name": "ServiceName",
+        "Name": "SName",
         "Describe": "服务名",
         "ParamType": "String",
         "EnumArray": null,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.Param.json

@@ -4,7 +4,7 @@
     "Port": null,
     "Key": null,
     "RequestType": "http",
-    "SleepTime": 0,
+    "SleepTime": 500,
     "DataChangeOut": true,
     "SameDataOut": false
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "f676e415-5e04-4d66-9cd2-9cf3d8a0217b",
+    "SN": "38cf69dc-14fa-42ec-848a-5052ec466770",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.Param.json

@@ -5,7 +5,7 @@
     "S7CpuType": "S7200",
     "Rack": 0,
     "Slot": 0,
-    "SleepTime": 0,
+    "SleepTime": 500,
     "DataChangeOut": true,
     "SameDataOut": false
 }

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.16" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.17" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -9,7 +9,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.16" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.17" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.56" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.16" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.17" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.16" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.17" />
   </ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.RelayManage/RelayManageOperate.cs

@@ -38,7 +38,7 @@ namespace YSAI.RelayManage
         /// <summary>
         /// 接口名称
         /// </summary>
-        private readonly string InterfaceFullName = "YSAI.Core.interface.unify.IRelay";
+        private readonly string InterfaceFullName = "YSAI.Core.interface.IRelay";
 
         /// <summary>
         /// 配置数据
@@ -387,7 +387,7 @@ namespace YSAI.RelayManage
             try
             {
                 //库
-                List<string> libs = Directory.GetFiles(basics.LibFolder, "*.dll", SearchOption.AllDirectories).ToList();
+                List<string> libs = Directory.GetFiles(basics.LibFolder, "YSAI.*.dll", SearchOption.AllDirectories).ToList();
                 //循环文件，添加程序集
                 foreach (var lib in libs)
                 {

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

@@ -7,8 +7,10 @@
   </PropertyGroup>
 
 	<ItemGroup>
+		<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.16" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.17" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.16" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.17" />
   </ItemGroup>
 
 	<!--<ItemGroup>

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

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