Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

UserClass/AsyncTcpClient.cs

@@ -1,4 +1,5 @@
-using SunlightAggregationManager.ViewModel;
+using SunlightAggregationManager.UserWindow;
+using SunlightAggregationManager.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -199,11 +200,21 @@ namespace SunlightAggregationManager.UserClass
                     data_.Add("UserName", _user?.Field<object>("Name") ?? "");
                     ret = JsonSerializer.Serialize(data_);
                 }
+                if (Command == "SysData")//回复请求的信息
+                {
+                  //  data_.Add("SysData", MainWindowViewModel.MachineVer);
+                    //   data_.Add("ChemicalStatistics", MainWindowViewModel.ChemicalStatistics.ToJsonString());
+                    ret = JsonSerializer.Serialize(data_);
+                }
                 if (Command == "Info")//回复info请求的信息
                 {
                     var t = ToList(MainWindowViewModel._machines).ToJsonString();
                     //格式化返回信息
                     data_.Add("Info", t);
+                    data_.Add("DyeMeasurementNumber", MainWindowViewModel.DyeMeasurementNumber.ToString());
+                    data_.Add("ChemicalNumber", MainWindowViewModel.ChemicalNumber.ToString());
+                    data_.Add("PowderNumber", MainWindowViewModel.PowderNumber.ToString());
+                    data_.Add("DyeDissolveNumber", MainWindowViewModel.DyeDissolveNumber.ToString());
                     ret = JsonSerializer.Serialize(data_);
                 }
                 if (Command == "Query")//回复Query请求的信息

UserClass/DataBase.cs

@@ -119,6 +119,53 @@ namespace SunlightAggregationManager.UserClass
             return dataTable;
         }
 
+        public async Task<int> ExecuteQueryAsyncCount(string sql)
+        {
+            // 创建一个空的 DataTable 用于存放查询结果
+            DataTable dataTable = new DataTable();
+
+            // 数据库连接字符串构建逻辑
+            var builder = new SqlConnectionStringBuilder
+            {
+                DataSource = DB_IP,
+                InitialCatalog = DB_NAME,
+                IntegratedSecurity = DB_TYPE == "Windows Authentication",
+                TrustServerCertificate = true,
+                ConnectTimeout = 5
+            };
+
+            if (!builder.IntegratedSecurity)
+            {
+                builder.UserID = DB_ID;
+                builder.Password = DB_PASSWORD;
+            }
+
+            try
+            {
+                using var conn = new SqlConnection(builder.ConnectionString);
+                await conn.OpenAsync(); // 使用异步方式打开连接<websource>source_group_web_2</websource>
+
+                using (var cmd = new SqlCommand(sql, conn))
+                {
+                    // 执行查询并将结果直接加载到 DataTable 中
+                    using (var reader = await cmd.ExecuteReaderAsync())
+                    {
+                        dataTable.Load(reader);
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                LogGing.ERRDATA(ex);
+                Console.WriteLine("DataBase Query failed\n" + ex.ToString());
+                // 将异常抛出给调用方，或者返回一个空的 DataTable
+                throw;
+            }
+
+            return dataTable.Rows.Count;
+        }
+
         public void Database(string dat) 
         {