1

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -91,8 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Can.Pack", "YSAI.Can.P
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test", "YSAI.Test\YSAI.Test.csproj", "{7DC11866-9D92-4B0A-AFDA-A841359F38A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Manage.Core", "YSAI.Manage.Core\YSAI.Manage.Core.csproj", "{74EC7B6D-A3E5-470F-AB42-B795B25AD30C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -239,10 +237,6 @@ Global
 		{7DC11866-9D92-4B0A-AFDA-A841359F38A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DC11866-9D92-4B0A-AFDA-A841359F38A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7DC11866-9D92-4B0A-AFDA-A841359F38A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74EC7B6D-A3E5-470F-AB42-B795B25AD30C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74EC7B6D-A3E5-470F-AB42-B795B25AD30C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74EC7B6D-A3E5-470F-AB42-B795B25AD30C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74EC7B6D-A3E5-470F-AB42-B795B25AD30C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -288,7 +282,6 @@ Global
 		{68C1433D-2DB7-499E-9225-CB8191891F8F} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{940983FB-5DDE-4B13-BBA0-FDA1EEED6C02} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{7DC11866-9D92-4B0A-AFDA-A841359F38A0} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
-		{74EC7B6D-A3E5-470F-AB42-B795B25AD30C} = {ECAD410C-2895-4836-BCA7-D4EF340E778E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

src/YSAI.DAQ/YSAI.DaqManage/DaqManageData.cs

@@ -1,8 +1,12 @@
-using System;
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using YSAI.Core.data;
+using YSAI.Core.@enum;
 
 namespace YSAI.DaqManage
 {
@@ -11,6 +15,150 @@ namespace YSAI.DaqManage
     /// </summary>
     public class DaqManageData
     {
+        /// <summary>
+        /// 数采管理
+        /// </summary>
+        public interface IDaqManage : IDisposable
+        {
+            /// <summary>
+            /// 设置库文件
+            /// </summary>
+            /// <param name="FormFiles">文件集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult SettingLib(List<IFormFile> FormFiles);
+
+            /// <summary>
+            /// 删除文件
+            /// </summary>
+            /// <param name="FileNames">文件名集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult DeleteFile(List<string> FileNames);
+
+            /// <summary>
+            /// 设置库配置文件
+            /// </summary>
+            /// <param name="FormFiles">文件集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult SettingLibConfig(List<IFormFile> FormFiles);
+
+            /// <summary>
+            /// 修改库配置文件
+            /// </summary>
+            /// <param name="FormFiles">文件集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult UpdateLibConfig(List<IFormFile> FormFiles);
+
+            /// <summary>
+            /// 程序集唯一标识符集合
+            /// </summary>
+            /// <returns>统一出参</returns>
+            List<string>? TypeSns();
+
+            /// <summary>
+            /// 实例唯一标识符集合
+            /// </summary>
+            /// <returns>统一出参</returns>
+            List<string>? InstanceSns();
+
+            /// <summary>
+            /// 释放指定实例
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult DisposeISn(string ISn);
+
+            /// <summary>
+            /// 移除指定实例
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult RemoveISn(string ISn);
+            /// <summary>
+            /// 打开
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult On(string ISn);
+            /// <summary>
+            /// 关闭
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Off(string ISn);
+
+            /// <summary>
+            /// 读取
+            /// </summary>
+            /// <param name="FormFile">地址文件</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Read(IFormFile FormFile, string ISn);
+            /// <summary>
+            /// 读取
+            /// </summary>
+            /// <param name="address">地址</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Read(Address address, string ISn);
+            /// <summary>
+            /// 单点读取
+            /// </summary>
+            /// <param name="AddressName">地址名称</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Read(string AddressName, string ISn);
+
+            /// <summary>
+            /// 写入
+            /// </summary>
+            /// <typeparam name="V">数据类型</typeparam>
+            /// <param name="Values">键值</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Write<V>(ConcurrentDictionary<string, V> Values, string ISn);
+
+            /// <summary>
+            /// 单点写入
+            /// </summary>
+            /// <param name="AddressName">地址名称</param>
+            /// <param name="Value">值</param>
+            /// <param name="DaType">数据类型</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Write(string AddressName, string Value, DataType DaType, string ISn);
+
+            /// <summary>
+            /// 订阅
+            /// </summary>
+            /// <param name="FormFile">地址文件</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Subscribe(IFormFile FormFile, string ISn);
+            /// <summary>
+            /// 订阅
+            /// </summary>
+            /// <param name="address">地址</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Subscribe(Address address, string ISn);
+
+            /// <summary>
+            /// 取消订阅
+            /// </summary>
+            /// <param name="FormFile">地址文件</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns></returns>
+            OperateResult UnSubscribe(IFormFile FormFile, string ISn);
+
+            /// <summary>
+            /// 取消订阅
+            /// </summary>
+            /// <param name="FormFile">地址</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns></returns>
+            OperateResult UnSubscribe(Address address, string ISn);
+
+        }
         /// <summary>
         /// 基础数据
         /// </summary>

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

@@ -3,11 +3,10 @@ using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 using System.Reflection;
 using YSAI.Core.data;
-using YSAI.Core.@enum;
 using YSAI.Core.@interface;
-using YSAI.Manage.Core.@interface.only;
 using YSAI.Unility;
-
+using static YSAI.DaqManage.DaqManageData;
+using YSAI.Core.@enum;
 namespace YSAI.DaqManage
 {
     /// <summary>

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

@@ -5,10 +5,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.8" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\YSAI.Manage.Core\YSAI.Manage.Core.csproj" />
-  </ItemGroup>	
-
+	<!--<ItemGroup>
+		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
+	</ItemGroup>-->
 
 </Project>

src/YSAI.DAQ/YSAI.Manage.Core/interface/IManage.cs

@@ -83,84 +83,6 @@ namespace YSAI.Manage.Core.@interface.only
 
     }
     /// <summary>
-    /// 数采管理
-    /// </summary>
-    public interface IDaqManage:IManage
-    {
-
-        /// <summary>
-        /// 读取
-        /// </summary>
-        /// <param name="FormFile">地址文件</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns>统一出参</returns>
-        OperateResult Read(IFormFile FormFile, string ISn);
-        /// <summary>
-        /// 读取
-        /// </summary>
-        /// <param name="address">地址</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns>统一出参</returns>
-        OperateResult Read(Address address, string ISn);
-        /// <summary>
-        /// 单点读取
-        /// </summary>
-        /// <param name="AddressName">地址名称</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns>统一出参</returns>
-        OperateResult Read(string AddressName, string ISn);
-
-        /// <summary>
-        /// 写入
-        /// </summary>
-        /// <typeparam name="V">数据类型</typeparam>
-        /// <param name="Values">键值</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns>统一出参</returns>
-        OperateResult Write<V>(ConcurrentDictionary<string, V> Values, string ISn);
-
-        /// <summary>
-        /// 单点写入
-        /// </summary>
-        /// <param name="AddressName">地址名称</param>
-        /// <param name="Value">值</param>
-        /// <param name="DaType">数据类型</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns>统一出参</returns>
-        OperateResult Write(string AddressName, string Value, DataType DaType,string ISn);
-
-        /// <summary>
-        /// 订阅
-        /// </summary>
-        /// <param name="FormFile">地址文件</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns>统一出参</returns>
-        OperateResult Subscribe(IFormFile FormFile, string ISn);
-        /// <summary>
-        /// 订阅
-        /// </summary>
-        /// <param name="address">地址</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns>统一出参</returns>
-        OperateResult Subscribe(Address address, string ISn);
-
-        /// <summary>
-        /// 取消订阅
-        /// </summary>
-        /// <param name="FormFile">地址文件</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns></returns>
-        OperateResult UnSubscribe(IFormFile FormFile, string ISn);
-
-        /// <summary>
-        /// 取消订阅
-        /// </summary>
-        /// <param name="FormFile">地址</param>
-        /// <param name="ISn">实例唯一标识符</param>
-        /// <returns></returns>
-        OperateResult UnSubscribe(Address address, string ISn);
-
-    }
     /// <summary>
     /// 转发管理
     /// </summary>

src/YSAI.DAQ/YSAI.RelayManage/RelayManageData.cs

@@ -1,8 +1,107 @@
 
+using Microsoft.AspNetCore.Http;
+using YSAI.Core.data;
+
 namespace YSAI.RelayManage
 {
     public class RelayManageData
     {
+        /// <summary>
+        /// <summary>
+        /// 转发管理
+        /// </summary>
+        public interface IRelayManage : IDisposable
+        {
+            /// <summary>
+            /// 设置库文件
+            /// </summary>
+            /// <param name="FormFiles">文件集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult SettingLib(List<IFormFile> FormFiles);
+
+            /// <summary>
+            /// 删除文件
+            /// </summary>
+            /// <param name="FileNames">文件名集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult DeleteFile(List<string> FileNames);
+
+            /// <summary>
+            /// 设置库配置文件
+            /// </summary>
+            /// <param name="FormFiles">文件集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult SettingLibConfig(List<IFormFile> FormFiles);
+
+            /// <summary>
+            /// 修改库配置文件
+            /// </summary>
+            /// <param name="FormFiles">文件集合</param>
+            /// <returns>统一出参</returns>
+            OperateResult UpdateLibConfig(List<IFormFile> FormFiles);
+
+            /// <summary>
+            /// 程序集唯一标识符集合
+            /// </summary>
+            /// <returns>统一出参</returns>
+            List<string>? TypeSns();
+
+            /// <summary>
+            /// 实例唯一标识符集合
+            /// </summary>
+            /// <returns>统一出参</returns>
+            List<string>? InstanceSns();
+
+            /// <summary>
+            /// 释放指定实例
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult DisposeISn(string ISn);
+
+            /// <summary>
+            /// 移除指定实例
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult RemoveISn(string ISn);
+            /// <summary>
+            /// 打开
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult On(string ISn);
+            /// <summary>
+            /// 关闭
+            /// </summary>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一出参</returns>
+            OperateResult Off(string ISn);
+            /// <summary>
+            /// 生产
+            /// </summary>
+            /// <param name="Topic">主题</param>
+            /// <param name="Content">内容</param>
+            /// <param name="ISns">实例唯一标识符集合，空则全部发送</param>
+            /// <returns>统一出参</returns>
+            OperateResult Produce(string Topic, string Content, List<string>? ISns = null);
+
+            /// <summary>
+            /// 添加订阅
+            /// </summary>
+            /// <param name="Topic">主题</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一结果</returns>
+            OperateResult Subscribe(string Topic, string ISn);
+
+            /// <summary>
+            /// 移除订阅
+            /// </summary>
+            /// <param name="Topic">主题</param>
+            /// <param name="ISn">实例唯一标识符</param>
+            /// <returns>统一结果</returns>
+            OperateResult UnSubscribe(string Topic, string ISn);
+        }
         /// <summary>
         /// 基础数据
         /// </summary>

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

@@ -12,8 +12,8 @@ using YSAI.Core.@enum;
 using YSAI.Core.@interface;
 using YSAI.Core.reflection;
 using YSAI.Log;
-using YSAI.Manage.Core.@interface.only;
 using YSAI.Unility;
+using static YSAI.RelayManage.RelayManageData;
 
 namespace YSAI.RelayManage
 {

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

@@ -6,8 +6,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\YSAI.Manage.Core\YSAI.Manage.Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.8" />
+	</ItemGroup>
+
+	<!--<ItemGroup>
+		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
+	</ItemGroup>-->
 
 </Project>