diff --git a/src/X1.WebSocket/Handlers/ProtocolMessageHandler.cs b/src/X1.WebSocket/Handlers/ProtocolMessageHandler.cs index 74157eb..be320b4 100644 --- a/src/X1.WebSocket/Handlers/ProtocolMessageHandler.cs +++ b/src/X1.WebSocket/Handlers/ProtocolMessageHandler.cs @@ -96,7 +96,7 @@ namespace CellularManagement.WebSocket.Handlers /// 处理协议日志数组 /// /// 协议日志数组 - private void ProcessProtocolLogs(TransferProtocolLog[] protocolLogs) + private void ProcessProtocolLogs(MessageTransferProtocolLog[] protocolLogs) { var processedCount = 0; var errorCount = 0; @@ -130,7 +130,7 @@ namespace CellularManagement.WebSocket.Handlers /// 处理单个协议日志 /// /// 协议日志 - private void ProcessSingleProtocolLog(TransferProtocolLog log) + private void ProcessSingleProtocolLog(MessageTransferProtocolLog log) { var logInfo = new { diff --git a/src/X1.WebSocket/Models/TransferProtocolLog.cs b/src/X1.WebSocket/Models/MessageTransferProtocolLog.cs similarity index 87% rename from src/X1.WebSocket/Models/TransferProtocolLog.cs rename to src/X1.WebSocket/Models/MessageTransferProtocolLog.cs index 74e1f6a..1827adb 100644 --- a/src/X1.WebSocket/Models/TransferProtocolLog.cs +++ b/src/X1.WebSocket/Models/MessageTransferProtocolLog.cs @@ -6,7 +6,12 @@ using System.Threading.Tasks; namespace X1.WebSocket.Models { - public class TransferProtocolLog + /// + /// 消息传输协议日志模型 + /// 用于在WebSocket传输层中传输协议日志数据 + /// 与CoreAgent.ProtocolClient中的TransferProtocolLog区分开 + /// + public class MessageTransferProtocolLog { /// /// 主键ID @@ -16,7 +21,7 @@ namespace X1.WebSocket.Models /// /// 协议层类型 /// - public ProtocolLayer LayerType { get; set; } + public string LayerType { get; set; } = string.Empty; /// /// 消息详情集合(JSON格式存储) @@ -89,5 +94,7 @@ namespace X1.WebSocket.Models get => TimeSpan.FromMilliseconds(TimeMs); set => TimeMs = (long)value.TotalMilliseconds; } + + } } diff --git a/src/X1.WebSocket/Models/ProtocolMessage.cs b/src/X1.WebSocket/Models/ProtocolMessage.cs index 0b2c5bb..adeb1f8 100644 --- a/src/X1.WebSocket/Models/ProtocolMessage.cs +++ b/src/X1.WebSocket/Models/ProtocolMessage.cs @@ -29,7 +29,7 @@ namespace CellularManagement.WebSocket.Models /// 初始化协议消息的新实例 /// /// 协议日志消息数组 - public ProtocolMessage(TransferProtocolLog[] messages) + public ProtocolMessage(MessageTransferProtocolLog[] messages) { Payload = new ProtocolPayload(messages); } @@ -45,13 +45,13 @@ namespace CellularManagement.WebSocket.Models /// 协议日志消息数组 /// 存储要传输的协议日志数据 /// - public TransferProtocolLog[] Message { get; set; } = Array.Empty(); + public MessageTransferProtocolLog[] Message { get; set; } = Array.Empty(); /// /// 初始化协议载荷的新实例 /// /// 协议日志消息数组 - public ProtocolPayload(TransferProtocolLog[] messages) + public ProtocolPayload(MessageTransferProtocolLog[] messages) { Message = messages; }