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

UserClass/AsyncTcpClient.cs

@@ -3,6 +3,7 @@ using SunlightAggregationManager.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
@@ -119,9 +120,9 @@ namespace SunlightAggregationManager.UserClass
                             myDict.Add("LastActionTime", DateTime.Now);
                             myDict.Add("Note", dataAES ?? "unknown");
 
-                            MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" + 
+                            MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" +
                                 deserializedPerson?.User + "'", myDict);
-                                                      
+
                             CommandC(dataAES ?? "NOT", deserializedPerson!);
                         }
                         else
@@ -129,6 +130,28 @@ namespace SunlightAggregationManager.UserClass
                             client.SendAsync("Account Deactivated");
                         }
                     }
+                    else if (password== MainWindowViewModel.SERRVERPASWORD && deserializedPerson?.User== MainWindowViewModel.SERVERUSER) 
+                    {
+                        //行为
+                        Dictionary<string, object> myDict = new Dictionary<string, object>();
+                        //myDict.Add("LinkID", client.Id);
+
+                        //AES解密
+                        string dataAES = AES.AesDecrypt(deserializedPerson!.Terminal, deserializedPerson.Dat);
+                        Console.WriteLine("[Log on]User[" + deserializedPerson?.User + "]COMMAND[" +
+                            Regex.Replace(dataAES, @"\\u[0-9A-Fa-f]{4}", match =>
+                            { return Regex.Unescape(match.Value); }) + "]");
+
+                        //记录
+                        myDict.Add("LastLoginIP", deserializedPerson?.IP ?? client.IP);
+                        myDict.Add("LastActionTime", DateTime.Now);
+                        myDict.Add("Note", dataAES ?? "unknown");
+
+                        MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" +
+                            deserializedPerson?.User + "'", myDict);
+
+                        CommandC(dataAES ?? "NOT", deserializedPerson!);
+                    }
                     else
                     { //无效账号关闭连接
                         client.SendAsync("Invalid Account");
@@ -207,7 +230,11 @@ namespace SunlightAggregationManager.UserClass
                 Dictionary<string, object> data_ = new Dictionary<string, object>();
                 var deserialized = JsonSerializer.Deserialize<Dictionary<string, object>>(dat)!;
                 if (deserialized.TryGetValue("Command", out var val) && val != null) Command = val.ToString()!;
-                if (Command == "Log")//回复请求的信息
+                if (Command == "SysCom")//回复指令的信息
+                {
+                    ret = JsonSerializer.Serialize(data_);
+                }
+                else if (Command == "Log")//回复请求的信息
                 {
                     DataRow? _user = MainWindowViewModel.Selet_Row(MainWindowViewModel._userData, "User='" +
                                  person?.User + "'");
@@ -218,17 +245,33 @@ namespace SunlightAggregationManager.UserClass
                     data_.Add("UserId", _user?.Field<object>("UserID") ?? "");
                     data_.Add("UserName", _user?.Field<object>("Name") ?? "");
                     ret = JsonSerializer.Serialize(data_);
-                }
-                if (Command == "SysData")//回复请求的信息
+                } 
+                else if (Command == "SysData")//特殊指令数据库查询
                 {
+                    string com_ = deserialized.GetValue("Comm").ToString()!;
+                    string da_ = deserialized.GetValue("Data").ToString()!;
+                    if (com_ == "SYSDB")//本机sqlite数据库
+                    {
+                        DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(da_, null)?.Tables[0] ?? new DataTable();
+                        data_.Add("DB", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable));
+                        data_.Add("Comm", "SYSDB");
+                        data_.Add("Enterprise", MainWindowViewModel.Enterprise);
+                    }
+                    else if (com_ == "DBCDB")//系统dbc数据库
+                    {
+                        DataTable resultTable = await MainWindowViewModel.dataBase.ExecuteQueryAsync(da_);
+                        data_.Add("DB", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable));
+                        data_.Add("Comm", "DBCDB");
+                        data_.Add("Enterprise", MainWindowViewModel.Enterprise);
+                    }
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "ChemicalStatistics")//回复请求的信息
+                else if (Command == "ChemicalStatistics")//回复请求的信息
                 {
                     data_.Add("ChemicalStatistics", Newtonsoft.Json.JsonConvert.SerializeObject(MainWindowViewModel.ChemicalStatistics));
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "Info")//回复info请求的信息
+                else if (Command == "Info")//回复info请求的信息
                 {
                     var t = ToList(MainWindowViewModel._machines).ToJsonString();
                     //格式化返回信息
@@ -239,7 +282,7 @@ namespace SunlightAggregationManager.UserClass
                     data_.Add("DyeDissolveNumber", MainWindowViewModel.DyeDissolveNumber.ToString());
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "Query")//回复Query请求的信息
+                else if (Command == "Query")//回复Query请求的信息
                 {
                     string s_ = deserialized.GetValue("StartTime").ToString()!;
                     string e_ = deserialized.GetValue("EndTime").ToString()!;
@@ -251,7 +294,7 @@ namespace SunlightAggregationManager.UserClass
                     data_.Add("Query", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable));
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "QueryDyelot")//回复QueryDyelot请求的信息
+                else if (Command == "QueryDyelot")//回复QueryDyelot请求的信息
                 {
                     string d_ = deserialized.GetValue("DyelotName").ToString()!;
                     string f_ = deserialized.GetValue("Field").ToString()!;
@@ -262,7 +305,7 @@ namespace SunlightAggregationManager.UserClass
                     data_.Add("Query", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable));
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "QueryDetail")//回复QueryDetail请求的信息
+                else if (Command == "QueryDetail")//回复QueryDetail请求的信息
                 {
                     string d_ = deserialized.GetValue("Dyelot").ToString()!;
                     string r_ = deserialized.GetValue("ReDye").ToString()!;
@@ -274,7 +317,7 @@ namespace SunlightAggregationManager.UserClass
                     data_.Add("QueryDetail", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable));
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "Notification")//回复Notification请求的信息
+                else if (Command == "Notification")//回复Notification请求的信息
                 {
                     string s_; try { s_ = deserialized.GetValue("StartTime").ToString()!; } catch(Exception) { s_ = "0"; }
                     string e_ = deserialized.GetValue("EndTime").ToString()!;
@@ -293,7 +336,7 @@ namespace SunlightAggregationManager.UserClass
                     data_.Add("Notification", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable));
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "InfoMachine")//回复InfoMachine请求的信息
+                else if (Command == "InfoMachine")//回复InfoMachine请求的信息
                 {
                     string t_ = deserialized.GetValue("Type").ToString()!;
                     string? m_ =null, f_ = "*";
@@ -330,7 +373,7 @@ namespace SunlightAggregationManager.UserClass
                     //格式化返回信息
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "InfoMachineHistory")//回复InfoMachineHistory请求的信息
+                else if (Command == "InfoMachineHistory")//回复InfoMachineHistory请求的信息
                 {
                     string t_ = deserialized.GetValue("Type").ToString()!;
                     string? m_ = null, f_ = "*";
@@ -369,7 +412,7 @@ namespace SunlightAggregationManager.UserClass
                     //格式化返回信息
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "InfoMachinePipes")//回复Notification请求的信息
+                else if (Command == "InfoMachinePipes")//回复Notification请求的信息
                 {
                     string? m_ = null, f_ = "*";
 
@@ -383,7 +426,7 @@ namespace SunlightAggregationManager.UserClass
                     //格式化返回信息
                     ret = JsonSerializer.Serialize(data_);
                 }
-                if (Command == "SETUSER")//回复请求的信息
+                else if (Command == "SETUSER")//回复请求的信息
                 {
                     MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, 
                         "User='" + deserialized.GetValue("USER").ToString()! + "'" ,

ViewModel/MainWindowViewModel.cs

@@ -324,9 +324,14 @@ namespace SunlightAggregationManager.ViewModel
             {
                 lock (DB)
                 {
-                    DataRow drEmployee = DB.Select(key).First();
-                    object? index = drEmployee.Field<object>(name);
-                    return index;
+                    DataRow[] dataRows = DB.Select(key);
+                    if (dataRows.Count() > 0)
+                    {
+                        DataRow drEmployee = dataRows.First();
+                        object? index = drEmployee.Field<object>(name);
+                        return index;
+                    }
+                    else { return null; }
                 }
             }
             catch (Exception ex)