alimu
/
OMS.NET
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接受代码简化建议，移除this.

Browse Source
dev
nxiaoxiao 1 year ago
parent 0d7cc2df5f
commit f4006f8c7d
24 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File

20
Common/LayerData.cs
Unescape Escape View File

@ -32,16 +32,16 @@ namespace OMS.NET.Common
public void AppendElement(long itemId, string ItemType) public void AppendElement(long itemId, string ItemType)
{ {
if (this.Type == "order") if (Type == "order")
{ {
GlobalArea.Log.Error($"order图层不能添加{ItemType}元素"); GlobalArea.Log.Error($"order图层不能添加{ItemType}元素");
return; return;
} }
if (this.Members![itemId.ToString()] == null) if (Members![itemId.ToString()] == null)
{ {
this.Members![itemId.ToString()] = ItemType; Members![itemId.ToString()] = ItemType;
this.Structure!.AsArray().Add(itemId); Structure!.AsArray().Add(itemId);
this.HasChange = true; HasChange = true;
//上传图层到数据库 //上传图层到数据库
MapLayer mapLayer = ConvertToMapLayer(); MapLayer mapLayer = ConvertToMapLayer();
MapLayer.Update(mapLayer); MapLayer.Update(mapLayer);
@ -52,11 +52,11 @@ namespace OMS.NET.Common
{ {
return new MapLayer() return new MapLayer()
{ {
Id = this.LayerId, Id = LayerId,
Type = this.Type, Type = Type,
Members = (this.Type == "order") ? this.Members!.ToString() : Util.JsonToBase64(this.Members!.ToString()), Members = (Type == "order") ? Members!.ToString() : Util.JsonToBase64(Members!.ToString()),
Structure = (this.Structure == null) ? "" : Util.JsonToBase64(this.Structure!.ToString()), Structure = (Structure == null) ? "" : Util.JsonToBase64(Structure!.ToString()),
Phase = this.Phase Phase = Phase
}; };
} }
} }

10
Common/Logger.cs
Unescape Escape View File

@ -11,7 +11,7 @@ namespace OMS.NET.Common
{ {
lock (LogLock) lock (LogLock)
{ {
using var writer = new StreamWriter(this.logPath, true); using var writer = new StreamWriter(logPath, true);
writer.WriteLine(message); writer.WriteLine(message);
} }
} }
@ -19,12 +19,12 @@ namespace OMS.NET.Common
public Logger(int level) public Logger(int level)
{ {
_logLevel = level; _logLevel = level;
this.logPath = GetNewLogFile(); logPath = GetNewLogFile();
} }
private string GetNewLogFile() private string GetNewLogFile()
{ {
this.logCount = 0; logCount = 0;
string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log", $"{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.log"); string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log", $"{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.log");
if (!Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log"))) if (!Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log")))
{ {
@ -36,7 +36,7 @@ namespace OMS.NET.Common
private void Log(string message, int level) private void Log(string message, int level)
{ {
if (level <= this._logLevel) if (level <= _logLevel)
{ {
string logtime = DateTime.Now.ToString("[yyyy-MM-dd HH:mm:ss]"); string logtime = DateTime.Now.ToString("[yyyy-MM-dd HH:mm:ss]");
string leveltext = level switch string leveltext = level switch
@ -51,7 +51,7 @@ namespace OMS.NET.Common
Console.WriteLine(logtext); Console.WriteLine(logtext);
if (logCount > 100000) if (logCount > 100000)
{ {
this.logPath = GetNewLogFile(); logPath = GetNewLogFile();
} }
//File.AppendAllTextAsync(this.logPath, logtext); //File.AppendAllTextAsync(this.logPath, logtext);
WriteLog(logtext); WriteLog(logtext);

10
DbClass/AccountData.cs
Unescape Escape View File

@ -19,11 +19,11 @@ namespace OMS.NET.DbClass
public AccountData() public AccountData()
{ {
this.UserEmail = ""; UserEmail = "";
this.UserName = ""; UserName = "";
this.Password = ""; Password = "";
this.Mode = 1; Mode = 1;
this.Phase = 1; Phase = 1;
//this.Custom = ""; //this.Custom = "";
} }
#endregion #endregion

10
DbClass/MapData.cs
Unescape Escape View File

@ -21,11 +21,11 @@ namespace OMS.NET.DbClass
public MapData() public MapData()
{ {
this.Id = -1; Id = -1;
this.Type = ""; Type = "";
this.Points = ""; Points = "";
this.Point = ""; Point = "";
this.Phase = 1; Phase = 1;
} }
#endregion #endregion

10
DbClass/MapLayer.cs
Unescape Escape View File

@ -13,11 +13,11 @@ namespace OMS.NET.DbClass
public MapLayer() public MapLayer()
{ {
this.Id = 0; Id = 0;
this.Type = ""; Type = "";
this.Members = ""; Members = "";
this.Structure = ""; Structure = "";
this.Phase = 1; Phase = 1;
} }
public MapLayer(long id, string type, string members, string structure, int phase) public MapLayer(long id, string type, string members, string structure, int phase)
{ {

2
Instructs/AddElementInstruct.cs
Unescape Escape View File

@ -66,7 +66,7 @@ namespace OMS.NET.Instructs
{ {
IsBroadcast = true, IsBroadcast = true,
Type = "broadcast", Type = "broadcast",
Class = this.Class, Class = Class,
Conveyor = conveyor, Conveyor = conveyor,
Time = time, Time = time,
Data = mapData, Data = mapData,

2
Instructs/DeleteElementInstuct.cs
Unescape Escape View File

@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
{ {
public DeleteElementInstruct() public DeleteElementInstruct()
{ {
this.Class = "deleteElement"; Class = "deleteElement";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)

4
Instructs/GetActiveDataInstruct.cs
Unescape Escape View File

@ -4,7 +4,7 @@ namespace OMS.NET.Instructs
{ {
public GetActiveDataInstruct() public GetActiveDataInstruct()
{ {
this.Type = "get_activeData"; Type = "get_activeData";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
@ -12,7 +12,7 @@ namespace OMS.NET.Instructs
return Task.Run(() => return Task.Run(() =>
{ {
if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出 if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出
this.ResponseOrBroadcastInstructs.Add(new Instruct() ResponseOrBroadcastInstructs.Add(new Instruct()
{ {
IsResponse = true, IsResponse = true,
Type = "send_activeData", Type = "send_activeData",

4
Instructs/GetMapDataInstruct.cs
Unescape Escape View File

@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
{ {
public GetMapDataInstruct() public GetMapDataInstruct()
{ {
this.Type = "get_mapData"; Type = "get_mapData";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
@ -15,7 +15,7 @@ namespace OMS.NET.Instructs
{ {
if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出 if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出
List<MapData> mapDatas = MapData.GetMapDataList().Where(m => m.Phase != 2).ToList(); List<MapData> mapDatas = MapData.GetMapDataList().Where(m => m.Phase != 2).ToList();
this.ResponseOrBroadcastInstructs.Add(new Instruct() ResponseOrBroadcastInstructs.Add(new Instruct()
{ {
IsResponse = true, IsResponse = true,
Type = "send_mapData", Type = "send_mapData",

4
Instructs/GetMapLayerInstruct.cs
Unescape Escape View File

@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
{ {
public GetMapLayerInstruct() public GetMapLayerInstruct()
{ {
this.Type = "get_mapLayer"; Type = "get_mapLayer";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
@ -15,7 +15,7 @@ namespace OMS.NET.Instructs
{ {
if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出 if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出
List<MapLayer> mapLayers = MapLayer.GetMapLayerList().Where(m => m.Phase != 2).ToList(); List<MapLayer> mapLayers = MapLayer.GetMapLayerList().Where(m => m.Phase != 2).ToList();
this.ResponseOrBroadcastInstructs.Add(new Instruct() ResponseOrBroadcastInstructs.Add(new Instruct()
{ {
IsResponse = true, IsResponse = true,
Type = "send_mapLayer", Type = "send_mapLayer",

4
Instructs/GetPresenceInstruct.cs
Unescape Escape View File

@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
{ {
public GetPresenceInstruct() public GetPresenceInstruct()
{ {
this.Type = "get_presence"; Type = "get_presence";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
@ -30,7 +30,7 @@ namespace OMS.NET.Instructs
headColor = accountData.HeadColor, headColor = accountData.HeadColor,
}); });
}); });
this.ResponseOrBroadcastInstructs.Add(new Instruct() ResponseOrBroadcastInstructs.Add(new Instruct()
{ {
IsResponse = true, IsResponse = true,
Type = "send_presence", Type = "send_presence",

4
Instructs/GetPublickeyInstruct.cs
Unescape Escape View File

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

4
Instructs/GetServerConfigInstruct.cs
Unescape Escape View File

@ -4,14 +4,14 @@ namespace OMS.NET.Instructs
{ {
public GetServerConfigInstruct() public GetServerConfigInstruct()
{ {
this.Type = "get_serverConfig"; Type = "get_serverConfig";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
{ {
return Task.Run(() => return Task.Run(() =>
{ {
this.ResponseOrBroadcastInstructs.Add(new Instruct() ResponseOrBroadcastInstructs.Add(new Instruct()
{ {
IsResponse = true, IsResponse = true,
Type = "send_serverConfig", Type = "send_serverConfig",

8
Instructs/GetServerImgInstruct.cs
Unescape Escape View File

@ -7,18 +7,18 @@ namespace OMS.NET.Instructs
{ {
public GetServerImgInstruct() public GetServerImgInstruct()
{ {
this.Type = "get_serverImg"; Type = "get_serverImg";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
{ {
return Task.Run(() => return Task.Run(() =>
{ {
if (this.Time != null) if (Time != null)
{ {
//时间解析 //时间解析
string format = "yyyy-MM-dd HH:mm:ss"; string format = "yyyy-MM-dd HH:mm:ss";
DateTime clientDateTime = DateTime.ParseExact(this.Time, format, CultureInfo.InvariantCulture); DateTime clientDateTime = DateTime.ParseExact(Time, format, CultureInfo.InvariantCulture);
//Console.WriteLine("Converted DateTime: " + clientDateTime); //Console.WriteLine("Converted DateTime: " + clientDateTime);
string serverImgPath = GlobalArea.ServerConfig.Img; string serverImgPath = GlobalArea.ServerConfig.Img;
if (File.Exists(serverImgPath)) if (File.Exists(serverImgPath))
@ -48,7 +48,7 @@ namespace OMS.NET.Instructs
@string = "" @string = ""
}; };
} }
this.ResponseOrBroadcastInstructs.Add(res); ResponseOrBroadcastInstructs.Add(res);
} }
} }
}); });

4
Instructs/GetUserDataInstruct.cs
Unescape Escape View File

@ -6,7 +6,7 @@ namespace OMS.NET.Instructs
{ {
public GetUserDataInstruct() public GetUserDataInstruct()
{ {
this.Type = "get_userData"; Type = "get_userData";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
@ -16,7 +16,7 @@ namespace OMS.NET.Instructs
if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出 if (!GlobalArea.LoginCheckByID(wsid)) return;//登录检查,不通过则直接退出
string userEmail = GlobalArea.UserConnects.First(u => u.ID == wsid).UserEmail!; string userEmail = GlobalArea.UserConnects.First(u => u.ID == wsid).UserEmail!;
AccountData accountData = GlobalArea.GetLoginAccountData(userEmail)!; AccountData accountData = GlobalArea.GetLoginAccountData(userEmail)!;
this.ResponseOrBroadcastInstructs.Add(new Instruct() ResponseOrBroadcastInstructs.Add(new Instruct()
{ {
IsResponse = true, IsResponse = true,
Type = "send_userData", Type = "send_userData",

4
Instructs/Instruct.cs
Unescape Escape View File

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

2
Instructs/PickEndElementInstruct.cs
Unescape Escape View File

@ -42,7 +42,7 @@ namespace OMS.NET.Instructs
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalArea.Log.Warn($"处理{this.Class}广播指令出错：" + ex.Message); GlobalArea.Log.Warn($"处理{Class}广播指令出错：" + ex.Message);
} }
}); });
} }

6
Instructs/PickIngElementInstruct.cs
Unescape Escape View File

@ -8,8 +8,8 @@ namespace OMS.NET.Instructs
{ {
public PickIngElementInstruct() public PickIngElementInstruct()
{ {
this.Type = "broadcast"; Type = "broadcast";
this.Class = "pickIngElement"; Class = "pickIngElement";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
@ -63,7 +63,7 @@ namespace OMS.NET.Instructs
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalArea.Log.Warn($"处理{this.Class}广播指令出错：" + ex.Message); GlobalArea.Log.Warn($"处理{Class}广播指令出错：" + ex.Message);
} }
}); });
} }

4
Instructs/PingInstuct.cs
Unescape Escape View File

@ -4,14 +4,14 @@ namespace OMS.NET.Instructs
{ {
public PingInstuct() public PingInstuct()
{ {
this.Type = "ping"; Type = "ping";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
{ {
return Task.Run(() => return Task.Run(() =>
{ {
this.ResponseOrBroadcastInstructs.Add(new Instruct() ResponseOrBroadcastInstructs.Add(new Instruct()
{ {
IsResponse = true, IsResponse = true,
Type = "pong" Type = "pong"

2
Instructs/SelectEndElementInstruct.cs
Unescape Escape View File

@ -42,7 +42,7 @@ namespace OMS.NET.Instructs
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalArea.Log.Warn($"处理{this.Class}广播指令出错：" + ex.Message); GlobalArea.Log.Warn($"处理{Class}广播指令出错：" + ex.Message);
} }
}); });
} }

6
Instructs/SelectIngElementInstruct.cs
Unescape Escape View File

@ -8,8 +8,8 @@ namespace OMS.NET.Instructs
{ {
public SelectIngElementInstruct() public SelectIngElementInstruct()
{ {
this.Type = "broadcast"; Type = "broadcast";
this.Class = "selectIngElement"; Class = "selectIngElement";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)
@ -63,7 +63,7 @@ namespace OMS.NET.Instructs
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalArea.Log.Warn($"处理{this.Class}广播指令出错：" + ex.Message); GlobalArea.Log.Warn($"处理{Class}广播指令出错：" + ex.Message);
} }
}); });
} }

2
Instructs/TestInstuct.cs
Unescape Escape View File

@ -7,7 +7,7 @@ namespace OMS.NET.Instructs
{ {
public TestInstruct() public TestInstruct()
{ {
this.Type = "test"; Type = "test";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)

4
Instructs/TextMessageInstruct.cs
Unescape Escape View File

@ -6,8 +6,8 @@ namespace OMS.NET.Instructs
{ {
public TextMessageInstruct() public TextMessageInstruct()
{ {
this.Type = "broadcast"; Type = "broadcast";
this.Class = "textMessage"; Class = "textMessage";
} }
public override Task Handler(string wsid) public override Task Handler(string wsid)

20
MapServer.cs
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save