Shun 2 éve
szülő
commit
9c041b4475
2 módosított fájl, 66 hozzáadás és 78 törlés
  1. 6 6
      src/YSAI.DAQ/YSAI.DAQ.sln
  2. 60 72
      src/YSAI.DAQ/YSAI.Test.All/Program.cs

+ 6 - 6
src/YSAI.DAQ/YSAI.DAQ.sln

@@ -95,7 +95,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool", "YSAI.Tool\YSAI
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Document", "YSAI.Document\YSAI.Document.csproj", "{863DE76E-F597-4624-A6B4-860B97FA06D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Test.All", "YSAI.Test.All\YSAI.Test.All.csproj", "{3CF5DE43-8FBE-4C28-A955-FAA75BF77E0E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Test.All", "YSAI.Test.All\YSAI.Test.All.csproj", "{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -247,10 +247,10 @@ Global
 		{863DE76E-F597-4624-A6B4-860B97FA06D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{863DE76E-F597-4624-A6B4-860B97FA06D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{863DE76E-F597-4624-A6B4-860B97FA06D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CF5DE43-8FBE-4C28-A955-FAA75BF77E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CF5DE43-8FBE-4C28-A955-FAA75BF77E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CF5DE43-8FBE-4C28-A955-FAA75BF77E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CF5DE43-8FBE-4C28-A955-FAA75BF77E0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -297,7 +297,7 @@ Global
 		{E85BF19B-E671-4A1E-BC67-B545700B4BF1} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 		{3C333E39-520D-4183-8E3D-D0FF6628C15E} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 		{863DE76E-F597-4624-A6B4-860B97FA06D0} = {0A264424-1AD7-49FA-B813-D96498066479}
-		{3CF5DE43-8FBE-4C28-A955-FAA75BF77E0E} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
+		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

+ 60 - 72
src/YSAI.DAQ/YSAI.Test.All/Program.cs

@@ -1,89 +1,77 @@
-using Newtonsoft.Json.Linq;
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using YSAI.Core.data;
 using YSAI.Core.@interface;
 using YSAI.Core.subscription;
-using YSAI.Unility;
 
-namespace YSAI.Test.All
+//地址参数
+Address address = new Address()
 {
-    internal class Program
+    SN = Guid.NewGuid().ToString(),
+    AddressArray = new List<AddressDetails>()
+};
+for (int i = 0; i < 1000000; i++)
+{
+    address.AddressArray.Add(new AddressDetails
     {
-        static void Main(string[] args)
-        {
-            //地址参数
-            Address address = new Address()
-            {
-                SN = Guid.NewGuid().ToString(),
-                AddressArray = new List<AddressDetails>()
-            };
-            for (int i = 0; i < 1000000; i++)
-            {
-                address.AddressArray.Add(new AddressDetails
-                {
-                    SN = $"测试{i}号采集",
-                    AddressName = $"TEST{i}"
-                });
-            }
-           
-
-
-
-            TEST tEST = new TEST();
-
-            SubscribeOperate subscribeOperate = SubscribeOperate.Instance(new SubscribeData.Basics()
-            {
-                Address = address,
-                Function = tEST.Read,
-            });
-            subscribeOperate.OnEvent += SubscribeOperate_OnEvent;
-            OperateResult operateResult = subscribeOperate.On();
-
-
-
-            while (true)
-            {
-                Thread.Sleep(1000);
-            }
-        }
+        SN = $"测试{i}号采集",
+        AddressName = $"TEST{i}"
+    });
+}
 
-        private static void SubscribeOperate_OnEvent(object? sender, EventResult e)
-        {
 
-            ConcurrentDictionary<string, AddressValue> param =  e.RData as ConcurrentDictionary<string, AddressValue>;
-            foreach (var item in param)
-            {
-                Console.WriteLine(item.Value.AddressName);
-                Console.WriteLine(item.Value.Value);
-                Console.WriteLine("---------------------");
-            }
-        }
 
-        public class TEST: IBaseAbstract
-        {
-            protected override string LogHead => "[ TEST 操作 ]";
-            protected override string ClassName => "TEST";
-            public OperateResult Read(Address address)
-            {
-                Depart("Read");
-                //节点数据
-                ConcurrentDictionary<string, AddressValue> param = new ConcurrentDictionary<string, AddressValue>();
-                foreach (var item in address.AddressArray) 
-                {
-                    //数据处理
-                    AddressValue addressValue = YSAI.Core.data.AddressHandler.ExecuteDispose(item, new Random().NextDouble().ToString());
 
-                    //AddressValue addressValue = YSAI.Core.data.AddressHandler.ExecuteDispose(item, "1");
+TEST tEST = new TEST();
 
-                    //数据添加
-                    param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);
-                }
-                return Break("Read", true, RData: param, RType: Core.@enum.ResultType.KeyValue);
-            }
+SubscribeOperate subscribeOperate = SubscribeOperate.Instance(new SubscribeData.Basics()
+{
+    Address = address,
+    Function = tEST.Read,
+});
+subscribeOperate.OnEvent += SubscribeOperate_OnEvent;
+OperateResult operateResult = subscribeOperate.On();
 
 
 
+while (true)
+{
+    Thread.Sleep(1000);
+}
+void SubscribeOperate_OnEvent(object? sender, EventResult e)
+{
 
+    ConcurrentDictionary<string, AddressValue> param = e.RData as ConcurrentDictionary<string, AddressValue>;
+    foreach (var item in param)
+    {
+        Console.WriteLine(item.Value.AddressName);
+        Console.WriteLine(item.Value.Value);
+        Console.WriteLine("---------------------");
+    }
+}
+
+class TEST : IBaseAbstract
+{
+    protected override string LogHead => "[ TEST 操作 ]";
+    protected override string ClassName => "TEST";
+    public OperateResult Read(Address address)
+    {
+        Depart("Read");
+        //节点数据
+        ConcurrentDictionary<string, AddressValue> param = new ConcurrentDictionary<string, AddressValue>();
+        foreach (var item in address.AddressArray)
+        {
+            //数据处理
+            AddressValue addressValue = YSAI.Core.data.AddressHandler.ExecuteDispose(item, new Random().NextDouble().ToString());
+
+            //AddressValue addressValue = YSAI.Core.data.AddressHandler.ExecuteDispose(item, "1");
+
+            //数据添加
+            param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);
         }
+        return Break("Read", true, RData: param, RType: Core.@enum.ResultType.KeyValue);
     }
-}
+
+
+
+
+}