DbClass/BaseObject.cs

@@ -27,22 +27,15 @@ namespace OMS.NET.DbClass
             IsIdentity = isIdentity;
         }
     }
-
+    public class BaseObject
-    public class SqlHelper
     {
-        public static string GetTableName(Type type)
+        private static string GetTableName(Type type)
         {
             var attr = type.GetCustomAttribute<TableAttribute>();
             return attr?.TableName ?? throw new Exception($"{type.Name} 没有指定数据表");
         }
 
-        public static bool IsIdentity(Type type)
+        private static IEnumerable<PropertyInfo> GetProperties(Type type)
-        {
-            var primaryKey = GetPrimaryKeyProperties(type);
-            return primaryKey.GetCustomAttribute<ColumnAttribute>()!.IsIdentity;
-        }
-
-        public static IEnumerable<PropertyInfo> GetProperties(Type type)
         {
             return type.GetProperties()
                        .Where(p => p.GetCustomAttribute<ColumnAttribute>() != null);
@@ -79,7 +72,7 @@ namespace OMS.NET.DbClass
             return (primaryKey.GetCustomAttribute<ColumnAttribute>()!.IsIdentity == true) ? null : primaryKey;
         }
 
-        public static string GetInsertSql(Type type)
+        private static string GetInsertSql(Type type)
         {
             var tableName = GetTableName(type);
             var identityKey = GetIdentityKeyProperty(type);
@@ -98,7 +91,7 @@ namespace OMS.NET.DbClass
             return $"INSERT INTO {tableName} ({string.Join(", ", columns)}) VALUES ({string.Join(", ", values)})";
         }
 
-        public static string GetUpdateSql(Type type)
+        private static string GetUpdateSql(Type type)
         {
             var tableName = GetTableName(type);
             var setClause = string.Join(", ",
@@ -110,7 +103,7 @@ namespace OMS.NET.DbClass
             return $"UPDATE {tableName} SET {setClause} WHERE {whereClause}";
         }
 
-        public static string GetDeleteSql(Type type)
+        private static string GetDeleteSql(Type type)
         {
             var tableName = GetTableName(type);
             var primaryKey = GetPrimaryKeyProperties(type);
@@ -119,7 +112,7 @@ namespace OMS.NET.DbClass
             return $"DELETE FROM {tableName} WHERE {whereClause}";
         }
 
-        public static string GetSelectSql(Type type)
+        private static string GetSelectSql(Type type)
         {
             var tableName = GetTableName(type);
             var columns = string.Join(", ",
@@ -129,7 +122,7 @@ namespace OMS.NET.DbClass
             return $"SELECT {columns} FROM {tableName}";
         }
 
-        public static string GetSelectSqlWithPrimaryKey(Type type)
+        private static string GetSelectSqlWithPrimaryKey(Type type)
         {
             var tableName = GetTableName(type);
             var columns = string.Join(", ",
@@ -141,7 +134,59 @@ namespace OMS.NET.DbClass
             return $"SELECT {columns} FROM {tableName} WHERE {whereClause}";
         }
 
-        public static IEnumerable<T> SelectAll<T>() where T : SqlTable, new()
+        public void Test()
+        {
+            Console.WriteLine("===========this is a test area=================");
+            Console.WriteLine(GetInsertSql(GetType()));
+            Console.WriteLine(GetDeleteSql(GetType()));
+            Console.WriteLine(GetUpdateSql(GetType()));
+            Console.WriteLine(GetSelectSql(GetType()));
+            Console.WriteLine(GetSelectSqlWithPrimaryKey(GetType()));
+            Console.WriteLine("===========this is a test area=================");
+        }
+
+        public virtual void Insert()
+        {
+            var type = GetType();
+            var insertSql = GetInsertSql(GetType());
+            using MySqlConnection connection = new(GlobalArea.ConnectionStringWithDbName);
+            connection.Open(); // 确保在执行命令之前打开连接
+            using var command = new MySqlCommand(insertSql, connection);
+            AddParameters(command);
+            Console.WriteLine($"SQL: {command.CommandText}");
+            foreach (MySqlParameter param in command.Parameters)
+            {
+                Console.WriteLine($"Parameter: {param.ParameterName}, Value: {param.Value}");
+            }
+            command.ExecuteNonQuery();
+            Log.Info($"{GetTableName(type)}数据表插入({string.Join(',', ShowDetail())})");
+        }
+
+        public virtual void Update()
+        {
+            var type = GetType();
+            var updateSql = GetUpdateSql(GetType());
+            using MySqlConnection connection = new(GlobalArea.ConnectionStringWithDbName);
+            connection.Open(); // 确保在执行命令之前打开连接
+            using var command = new MySqlCommand(updateSql, connection);
+            AddParameters(command);
+            command.ExecuteNonQuery();
+            Log.Info($"{GetTableName(type)}数据表修改({string.Join(',', ShowDetail())})");
+        }
+
+        public virtual void Delete()
+        {
+            var type = GetType();
+            var deleteSql = GetDeleteSql(GetType());
+            using MySqlConnection connection = new(GlobalArea.ConnectionStringWithDbName);
+            connection.Open(); // 确保在执行命令之前打开连接
+            using var command = new MySqlCommand(deleteSql, connection);
+            AddParameters(command);
+            command.ExecuteNonQuery();
+            Log.Info($"{GetTableName(type)}数据表删除({string.Join(',', ShowDetail())})");
+        }
+
+        public static IEnumerable<T> SelectAll<T>() where T : BaseObject, new()
         {
             var type = typeof(T);
             var selectSql = GetSelectSql(type);
@@ -160,21 +205,7 @@ namespace OMS.NET.DbClass
             return results;
         }
 
-        private static void PopulateObject(MySqlDataReader reader, SqlTable obj)
+        public static T? Get<T>(object key) where T : BaseObject, new()
-        {
-            var type = obj.GetType();
-            foreach (var property in GetProperties(type))
-            {
-                var columnAttr = property.GetCustomAttribute<ColumnAttribute>()!;
-                var value = reader[columnAttr.ColumnName];
-                if (value != DBNull.Value)
-                {
-                    property.SetValue(obj, Convert.ChangeType(value, property.PropertyType));
-                }
-            }
-        }
-
-        public static T? Get<T>(object key) where T : SqlTable, new()
         {
             var type = typeof(T);
             var selectSql = GetSelectSqlWithPrimaryKey(type);
@@ -192,5 +223,33 @@ namespace OMS.NET.DbClass
             }
             return null;
         }
+
+        private void AddParameters(MySqlCommand command)
+        {
+            foreach (var property in GetProperties(GetType()))
+            {
+                //var columnAttr = property.GetCustomAttribute<ColumnAttribute>()!;
+                command.Parameters.AddWithValue("@" + property.Name, property.GetValue(this));
+            }
+        }
+
+        private IEnumerable<string> ShowDetail()
+        {
+            return GetProperties(GetType()).Select(p => $"{p.Name}={p.GetValue(this)}");
+        }
+
+        private static void PopulateObject(MySqlDataReader reader, BaseObject obj)
+        {
+            var type = obj.GetType();
+            foreach (var property in GetProperties(type))
+            {
+                var columnAttr = property.GetCustomAttribute<ColumnAttribute>()!;
+                var value = reader[columnAttr.ColumnName];
+                if (value != DBNull.Value)
+                {
+                    property.SetValue(obj, Convert.ChangeType(value, property.PropertyType));
+                }
+            }
+        }
     }
 }

DbClass/Map.cs

@@ -1,7 +1,7 @@
 namespace OMS.NET.DbClass
 {
     [Table("map_data")]
-    public class Map : SqlTable
+    public class Map : BaseObject
     {
         [Column("id", true)] // Primary Key and Identity false
         public string Id { get; set; }

DbClass/SqlTable.cs

@@ -1,81 +0,0 @@
-using System.Reflection;
-using MySql.Data.MySqlClient;
-using OMS.NET.Common;
-namespace OMS.NET.DbClass
-{
-    public class SqlTable
-    {
-        public void Test()
-        {
-            Console.WriteLine("===========this is a test area=================");
-            Console.WriteLine(SqlHelper.GetInsertSql(GetType()));
-            Console.WriteLine(SqlHelper.GetDeleteSql(GetType()));
-            Console.WriteLine(SqlHelper.GetUpdateSql(GetType()));
-            Console.WriteLine(SqlHelper.GetSelectSql(GetType()));
-            Console.WriteLine(SqlHelper.GetSelectSqlWithPrimaryKey(GetType()));
-            Console.WriteLine("===========this is a test area=================");
-        }
-
-        /// <summary>
-        /// 将对象本身插入到数据库中
-        /// </summary>
-        public virtual void Insert()
-        {
-            var type = GetType();
-            var insertSql = SqlHelper.GetInsertSql(GetType());
-            using MySqlConnection connection = new(GlobalArea.ConnectionStringWithDbName);
-            connection.Open(); //确保在执行命令之前打开连接
-            using var command = new MySqlCommand(insertSql, connection);
-            AddParameters(command);
-            Console.WriteLine($"SQL: {command.CommandText}");
-            foreach (MySqlParameter param in command.Parameters)
-            {
-                Console.WriteLine($"Parameter: {param.ParameterName}, Value: {param.Value}");
-            }
-            command.ExecuteNonQuery();
-            Log.Info($"{SqlHelper.GetTableName(type)}数据表插入({string.Join(',', ShowDetail())})");
-        }
-
-        public virtual void Update()
-        {
-            var type = GetType();
-            var updateSql = SqlHelper.GetUpdateSql(GetType());
-            using MySqlConnection connection = new(GlobalArea.ConnectionStringWithDbName);
-            connection.Open();
-            using var command = new MySqlCommand(updateSql, connection);
-            AddParameters(command);
-            command.ExecuteNonQuery();
-            Log.Info($"{SqlHelper.GetTableName(type)}数据表修改({string.Join(',', ShowDetail())})");
-        }
-
-        public virtual void Delete()
-        {
-            var deleteSql = SqlHelper.GetDeleteSql(GetType());
-            using MySqlConnection connection = new(GlobalArea.ConnectionStringWithDbName);
-            connection.Open();
-            using var command = new MySqlCommand(deleteSql, connection);
-            AddParameters(command);
-            command.ExecuteNonQuery();
-            Log.Info($"{SqlHelper.GetTableName(GetType())}数据表删除({string.Join(',', ShowDetail())})");
-        }
-
-        private void AddParameters(MySqlCommand command)
-        {
-            //bool IsIdentity = SqlHelper.IsIdentity(GetType());
-            foreach (var property in SqlHelper.GetProperties(GetType()))
-            {
-                if (property.GetCustomAttribute<ColumnAttribute>()!.IsIdentity)
-                {
-                    continue;
-                }
-                command.Parameters.AddWithValue("@" + property.Name, property.GetValue(this));
-            }
-        }
-
-        public IEnumerable<string> ShowDetail()
-        {
-            return SqlHelper.GetProperties(GetType()).Select(p => $"{p.Name}={p.GetValue(this)}");
-        }
-
-    }
-}

Instructs/GetMapDataInstruct.cs

@@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
     {
         public GetMapDataInstruct()
         {
-            Type = "get_mapData";
+            this.Type = "get_mapData";
         }
 
         public override Task Handler(string wsid)
@@ -25,7 +25,7 @@ namespace OMS.NET.Instructs
     {
         public SendMapDataInstruct()
         {
-            Type = "send_mapData";
+            this.Type = "send_mapData";
         }
     }
 }

Instructs/GetMapLayerInstruct.cs

@@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
     {
         public GetMapLayerInstruct()
         {
-            Type = "get_mapLayer";
+            this.Type = "get_mapLayer";
         }
 
         public override Task Handler(string wsid)
@@ -25,7 +25,7 @@ namespace OMS.NET.Instructs
     {
         public SendMapLayerInstruct()
         {
-            Type = "send_mapLayer";
+            this.Type = "send_mapLayer";
         }
     }
 }

Instructs/GetPublickeyInstruct.cs

@@ -6,14 +6,14 @@ namespace OMS.NET.Instructs
     {
         public GetPublickeyInstruct()
         {
-            Type = "get_publickey";
+            this.Type = "get_publickey";
         }
 
         public override Task Handler(string wsid)
         {
             return Task.Run(() =>
             {
-                ResponseOrBroadcastInstructs.Add(new PublickeyInstruct()
+                this.ResponseOrBroadcastInstructs.Add(new PublickeyInstruct()
                 {
                     Data = GlobalArea.GetRsaPublickKey(),
                     IsResponse = true
@@ -27,7 +27,7 @@ namespace OMS.NET.Instructs
     {
         public PublickeyInstruct()
         {
-            Type = "publickey";
+            this.Type = "publickey";
         }
 
     }

Instructs/GetUserDataInstruct.cs

@@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
     {
         public GetUserDataInstruct()
         {
-            Type = "get_userData";
+            this.Type = "get_userData";
         }
 
         public override Task Handler(string wsid)
@@ -25,7 +25,7 @@ namespace OMS.NET.Instructs
     {
         public SendUserDataInstruct()
         {
-            Type = "send_userData";
+            this.Type = "send_userData";
         }
     }
 }

Instructs/Instruct.cs

@@ -112,7 +112,7 @@ namespace OMS.NET.Instructs
 
         public Instruct()
         {
-            Type = "";
+            this.Type = "";
         }
 
         /// <summary>
@@ -130,7 +130,7 @@ namespace OMS.NET.Instructs
             stopWatch.Start();
             await Handler(wsid);
             stopWatch.Stop();
-            Log.Debug($"处理{GetType()}耗时：{stopWatch.ElapsedMilliseconds}ms");
+            Log.Debug($"处理{this.GetType()}耗时：{stopWatch.ElapsedMilliseconds}ms");
         }
 
         public string ToJsonString()

Instructs/LoginInstruct.cs

@@ -11,17 +11,17 @@ namespace OMS.NET.Instructs
     {
         public LoginInstruct()
         {
-            Type = "login";
+            this.Type = "login";
         }
 
         public override Task Handler(string wsid)
         {
             return Task.Run(() =>
             {
-                if (Data?.GetType() == typeof(JsonElement))
+                if (this.Data?.GetType() == typeof(JsonElement))
                 {
-                    string email = Data.GetProperty("email").GetString();
+                    string email = this.Data.GetProperty("email").GetString();
-                    string password = Data.GetProperty("password").GetString();
+                    string password = this.Data.GetProperty("password").GetString();
                     if (string.IsNullOrEmpty(email) || string.IsNullOrEmpty(password))
                     {
                         Log.Warn("登录信息不能为空！");
@@ -36,7 +36,7 @@ namespace OMS.NET.Instructs
     {
         public LoginStatusInstuct()
         {
-            Type = "loginStatus";
+            this.Type = "loginStatus";
         }
     }
 }

Instructs/TestInstuct.cs

@@ -1,7 +1,4 @@
-using System.Text.Json;
 using OMS.NET.Common;
-using OMS.NET.DbClass;
-using ZstdSharp.Unsafe;
 
 namespace OMS.NET.Instructs
 {
@@ -12,7 +9,7 @@ namespace OMS.NET.Instructs
     {
         public TestInstruct()
         {
-            Type = "test";
+            this.Type = "test";
         }
 
         public override Task Handler(string wsid)
@@ -20,47 +17,8 @@ namespace OMS.NET.Instructs
             return Task.Run(() =>
             {
                 //GlobalArea.UserConnects.Where(x => x.ID == wsid).First().UserEmail = "xxx@xx.com";//login
-                // Log.Info("当前客户端连接数：" + GlobalArea.ConnectClientsCount);
+                Log.Info("当前客户端连接数：" + GlobalArea.ConnectClientsCount);
-                // Log.Info("当前登录用户数：" + GlobalArea.LoginUserCount);
+                Log.Info("当前登录用户数：" + GlobalArea.LoginUserCount);
-                //测试数据表连接
-                if (Data?.GetType() != typeof(JsonElement)) return;//Data 非空和JsonElement类型检查
-                try
-                {
-                    int op = Data.GetInt32();
-                    Map map = new()
-                    {
-                        Id = "map1",
-                        Name = "test",
-                        Description = "haksjhdkasd"
-                    };
-                    switch (op)
-                    {
-                        case 0:
-                            map.Test();
-                            break;
-                        case 1:
-                            map.Insert();
-                            Log.Debug($"插入测试成功,新的id为{map.Id}");
-                            break;
-                        case 2:
-                            Log.Debug(string.Join(',', map.ShowDetail()));
-                            break;
-                        case 3:
-                            map.Description = "随便写一个有意义的字符串";
-                            map.Update();
-                            break;
-                        case 4:
-                            map.Delete();
-                            Log.Debug($"删除测试成功");
-                            break;
-                        default:
-                            throw new Exception("do nothing");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Log.Warn($"处理{Type}指令出错：" + ex.Message);
-                }
             });
         }
     }

MapServer.cs

@@ -11,11 +11,11 @@ namespace OMS.NET
         private IPEndPoint iPEndPoint = new(IPAddress.Any, 0);
         protected override async void OnMessage(MessageEventArgs e)
         {
-            Log.Debug(ID + " " + Context.UserEndPoint.ToString() + ":" + e.Data);
+            Log.Debug(this.ID + " " + this.Context.UserEndPoint.ToString() + ":" + e.Data);
             Instruct? instruct = Instruct.JsonStringParse(e.Data);
             if (instruct != null)
             {
-                await instruct.HandlerAndMeasure(ID);
+                await instruct.HandlerAndMeasure(this.ID);
                 if (instruct.ResponseOrBroadcastInstructs.Count > 0)
                 {
                     instruct.ResponseOrBroadcastInstructs.ForEach(res =>
@@ -28,7 +28,7 @@ namespace OMS.NET
                         if (res.IsBroadcast)
                         {
                             string str = res.ToJsonString();
-                            foreach (IWebSocketSession session in Sessions.Sessions)
+                            foreach (IWebSocketSession session in this.Sessions.Sessions)
                             {
                                 //看起来只有登录后的连接才能收到广播，这里添加下过滤
                                 if (GlobalArea.LoginCheckByID(session.ID))
@@ -44,23 +44,23 @@ namespace OMS.NET
 
         protected override void OnOpen()
         {
-            iPEndPoint = Context.UserEndPoint;
+            this.iPEndPoint = this.Context.UserEndPoint;
-            GlobalArea.AddUserConnect(ID, iPEndPoint);
+            GlobalArea.AddUserConnect(this.ID, this.iPEndPoint);
-            Log.Info(ID + " " + iPEndPoint.ToString() + " Conection Open");
+            // Console.WriteLine(this.ID + " " + this.iPEndPoint.ToString() + " Conection Open");
             // Console.WriteLine($"当前连接客户端数量: {GlobalArea.ConnectClientsCount}");
         }
 
         protected override void OnClose(CloseEventArgs e)
         {
-            GlobalArea.RemoveUserConnectByID(ID);
+            GlobalArea.RemoveUserConnectByID(this.ID);
-            Log.Info(this.ID + " " + this.iPEndPoint.ToString() + " Conection Close" + e.Reason);
+            // Console.WriteLine(this.ID + " " + this.iPEndPoint.ToString() + " Conection Close" + e.Reason);
             // Console.WriteLine($"当前连接客户端数量: {GlobalArea.ConnectClientsCount}");
         }
 
         protected override void OnError(ErrorEventArgs e)
         {
-            GlobalArea.RemoveUserConnectByID(ID);
+            GlobalArea.RemoveUserConnectByID(this.ID);
-            Log.Info(this.ID + " " + this.iPEndPoint.ToString() + " Conection Error Close" + e.Message);
+            // Console.WriteLine(this.ID + " " + this.iPEndPoint.ToString() + " Conection Error Close" + e.Message);
             // Console.WriteLine($"当前连接客户端数量: {GlobalArea.ConnectClientsCount}");
         }
     }