1

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -49,10 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.WindowMessage", "YSAI.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Unility.Windows", "YSAI.Unility.Windows\YSAI.Unility.Windows.csproj", "{257F1474-B220-4C61-88C6-5B83BEF7B3A7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool.Windows", "YSAI.Tool.Windows\YSAI.Tool.Windows.csproj", "{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Manage.Windows", "YSAI.Manage.Windows\YSAI.Manage.Windows.csproj", "{2221CE78-FA24-40E3-8453-9C66E32F9C0C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "relay", "relay", "{9D8EDBBA-7A97-4D84-9B12-7FCC2F834046}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{D60224CF-7F12-453B-851E-B5C01F9D2BBE}"
@@ -69,7 +65,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test.Console", "YSAI.T
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{7EB5153B-7702-4D7B-8592-FE6D992682AB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{1856E9E1-33C4-45C1-832C-854F9BE1ACC4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tool", "tool", "{1856E9E1-33C4-45C1-832C-854F9BE1ACC4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pack", "pack", "{1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}"
 EndProject
@@ -91,6 +87,10 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool", "YSAI.Tool\YSAI.Tool.csproj", "{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool.Core", "YSAI.Tool.Core\YSAI.Tool.Core.csproj", "{4CB15594-A04E-4D32-B3C8-A3578DFA1552}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -181,14 +181,6 @@ Global
 		{257F1474-B220-4C61-88C6-5B83BEF7B3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{257F1474-B220-4C61-88C6-5B83BEF7B3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{257F1474-B220-4C61-88C6-5B83BEF7B3A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41AB3A5A-5372-4A75-898C-9A4F9454F8A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41AB3A5A-5372-4A75-898C-9A4F9454F8A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41AB3A5A-5372-4A75-898C-9A4F9454F8A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -237,6 +229,14 @@ 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
+		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CB15594-A04E-4D32-B3C8-A3578DFA1552}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -255,7 +255,7 @@ Global
 		{0A264424-1AD7-49FA-B813-D96498066479} = {7EB5153B-7702-4D7B-8592-FE6D992682AB}
 		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F} = {9D8EDBBA-7A97-4D84-9B12-7FCC2F834046}
 		{6E9667C0-303C-472D-949B-60F812E6C659} = {ECAD410C-2895-4836-BCA7-D4EF340E778E}
-		{6F526F44-A5B0-49D5-8E04-DBFDB5F8E6C6} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
+		{6F526F44-A5B0-49D5-8E04-DBFDB5F8E6C6} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
 		{8B8BF505-7A00-4868-939F-EB5056083E49} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{CCF267B2-ABB4-4B42-8351-103D59FA4B3B} = {6F526F44-A5B0-49D5-8E04-DBFDB5F8E6C6}
 		{2FC39615-7195-4A0D-9959-E49630AB41D6} = {6F526F44-A5B0-49D5-8E04-DBFDB5F8E6C6}
@@ -265,8 +265,6 @@ Global
 		{6A255A65-3198-44AA-A281-62F721D49CEF} = {6F526F44-A5B0-49D5-8E04-DBFDB5F8E6C6}
 		{0EA9373C-B55A-4400-82AC-7681AA996229} = {6F526F44-A5B0-49D5-8E04-DBFDB5F8E6C6}
 		{257F1474-B220-4C61-88C6-5B83BEF7B3A7} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
-		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
-		{2221CE78-FA24-40E3-8453-9C66E32F9C0C} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 		{9D8EDBBA-7A97-4D84-9B12-7FCC2F834046} = {7EB5153B-7702-4D7B-8592-FE6D992682AB}
 		{41AB3A5A-5372-4A75-898C-9A4F9454F8A5} = {ECAD410C-2895-4836-BCA7-D4EF340E778E}
 		{DD9020DC-A51F-48F2-83FA-A3F10A43220F} = {ECAD410C-2895-4836-BCA7-D4EF340E778E}
@@ -281,6 +279,8 @@ 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}
+		{7C1C2D17-86D9-4BBF-8866-AAFF85BB9DFF} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
+		{4CB15594-A04E-4D32-B3C8-A3578DFA1552} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

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

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <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.Core\YSAI.Core.csproj" />
-	</ItemGroup>-->
-</Project>

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

@@ -1,116 +0,0 @@
-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.Manage.Core.@interface.only
-{
-    /// <summary>
-    /// 统一管理接口
-    /// </summary>
-    public interface IManage: 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>
-    /// 转发管理
-    /// </summary>
-    public interface IRelayManage : IManage
-    {
-        /// <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);
-    }
-}

src/YSAI.DAQ/YSAI.Tool.Core/Class1.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace YSAI.Tool.Core
+{
+    public class Class1
+    {
+    }
+}

src/YSAI.DAQ/YSAI.Tool.Core/YSAI.Tool.Core.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\YSAI.Controls\YSAI.Controls.csproj" />
+		<ProjectReference Include="..\YSAI.WindowMessage\YSAI.WindowMessage.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1988-prerelease" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="apiOperate\" />
+	  <Folder Include="can\" />
+	  <Folder Include="kafka\" />
+	  <Folder Include="modbus\client\" />
+	  <Folder Include="modbus\service\" />
+	  <Folder Include="mqtt\client\" />
+	  <Folder Include="mqtt\service\webScoket\" />
+	  <Folder Include="opc\da\client\" />
+	  <Folder Include="opc\da\http\" />
+	  <Folder Include="opc\ua\client\" />
+	  <Folder Include="opc\ua\service\" />
+	  <Folder Include="rabbitMQ\" />
+	  <Folder Include="s7\client\" />
+	  <Folder Include="s7\service\" />
+	</ItemGroup>
+</Project>

src/YSAI.DAQ/YSAI.Tool.Core/aboutUs/AboutUsTool.xaml

@@ -0,0 +1,11 @@
+<UserControl x:Class="YSAI.Tool.Core.aboutUs.AboutUsTool"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:YSAI.Tool.Core.aboutUs">
+    <DockPanel>
+        <wv2:WebView2 Source="http://www.yuanshan-ai.com/list/45.html"/>
+    </DockPanel>
+</UserControl>

src/YSAI.DAQ/YSAI.Tool.Core/aboutUs/AboutUsTool.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace YSAI.Tool.Core.aboutUs
+{
+    /// <summary>
+    /// AboutUsTool.xaml 的交互逻辑
+    /// </summary>
+    public partial class AboutUsTool : UserControl
+    {
+        public AboutUsTool()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/YSAI.DAQ/YSAI.Tool.Core/aboutUs/AboutUsToolController.cs

@@ -0,0 +1,13 @@
+using YSAI.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace YSAI.Tool.Core.aboutUs
+{
+    public class AboutUsToolController: NotifyObject
+    {
+    }
+}

src/YSAI.DAQ/YSAI.Manage.Windows/App.xaml

@@ -1,7 +1,7 @@
-<Application x:Class="YSAI.Manage.Windows.App"
+<Application x:Class="YSAI.Tool.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:YSAI.Manage.Windows"
+             xmlns:local="clr-namespace:YSAI.Tool"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>

src/YSAI.DAQ/YSAI.Manage.Windows/App.xaml.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace YSAI.Manage.Windows
+namespace YSAI.Tool
 {
     /// <summary>
     /// Interaction logic for App.xaml

src/YSAI.DAQ/YSAI.Manage.Windows/MainWindow.xaml

@@ -1,10 +1,8 @@
-<base:WindowBase x:Class="YSAI.Manage.Windows.MainWindow"
+<base:WindowBase x:Class="YSAI.Tool.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:YSAI.Manage.Windows"
         xmlns:base="clr-namespace:YSAI.Window;assembly=YSAI.Window"
+        xmlns:local="clr-namespace:YSAI.Tool"
         xmlns:hm="clr-namespace:YSAI.Controls.hamburgermenu;assembly=YSAI.Controls"
         xmlns:tc="clr-namespace:YSAI.Controls.transition;assembly=YSAI.Controls"
         Icon="YSAI_One.ico" 

src/YSAI.DAQ/YSAI.Manage.Windows/MainWindow.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using YSAI.Window;
 
-namespace YSAI.Manage.Windows
+namespace YSAI.Tool
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml

src/YSAI.DAQ/YSAI.Manage.Windows/MainWindowController.cs

@@ -1,21 +1,15 @@
-using YSAI.Langs;
-using YSAI.Mvvm;
-using YSAI.Window;
-using YSAI.WindowMessage;
-using System;
+using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MessageBox = YSAI.WindowMessage.MessageBox;
-using YSAI.Tool.Windows.aboutUs;
+using YSAI.Langs;
+using YSAI.Mvvm;
+using YSAI.Tool.Core.aboutUs;
+using YSAI.Window;
 
-namespace YSAI.Manage.Windows
+namespace YSAI.Tool
 {
     public class MainWindowController : NotifyObject
     {
@@ -39,7 +33,7 @@ namespace YSAI.Manage.Windows
         /// </summary>
         private void LangsHelper_OnLangSwitchEvent(object? sender, EventArgs e)
         {
-            
+
         }
 
         /// <summary>
@@ -47,7 +41,7 @@ namespace YSAI.Manage.Windows
         /// </summary>
         private void WindowHelper_OnSkinSwitchEvent(object? sender, object e)
         {
-            
+
         }
 
 

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

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YSAI.Tool.Windows\YSAI.Tool.Windows.csproj" />
+    <ProjectReference Include="..\YSAI.Tool.Core\YSAI.Tool.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>