Compare commits

..

2 Commits

Author SHA1 Message Date
ChenYi
13f055a3e5 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-27 15:44:17 +08:00
ChenYi
e7ff709a68 修改代码 2025-04-27 15:44:13 +08:00

View File

@ -46,7 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
T3761AFNHandlers = Telemetry3761PacketBuilder.T3761AFNHandlers; T3761AFNHandlers = Telemetry3761PacketBuilder.T3761AFNHandlers;
} }
public override ProtocolInfo Info => new(nameof(T37612012ProtocolPlugin), "376.1", "TCP", "376.1协议", "DTS1980"); public override ProtocolInfo Info => new(nameof(T37612012ProtocolPlugin), "376.1", "TCP", "376.1协议", "DTS1980");
public override async Task<T> AnalyzeAsync<T>(ITcpSessionClient client, string messageReceived, Action<T>? sendAction = null) public override async Task<T> AnalyzeAsync<T>(ITcpSessionClient client, string messageReceived, Action<T>? sendAction = null)
{ {
@ -106,7 +106,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
// MessageId = NewId.NextGuid().ToString() // MessageId = NewId.NextGuid().ToString()
//}); //});
if (tB3761.AFN_FC.BaseHexMessage == null || tB3761.DT.BaseHexMessage == null || tB3761.BaseHexMessage.HexMessageString==null) if (tB3761.AFN_FC.BaseHexMessage == null || tB3761.DT.BaseHexMessage == null || tB3761.BaseHexMessage.HexMessageString == null)
{ {
_logger.LogError("376.1协议解析AFN失败"); _logger.LogError("376.1协议解析AFN失败");
return; return;
@ -180,7 +180,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
MessageHexString = messageReceived, MessageHexString = messageReceived,
DeviceNo = code, DeviceNo = code,
MessageId = Guid.NewGuid().ToString(), MessageId = Guid.NewGuid().ToString(),
ReceivedTime=DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") ReceivedTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
}; };
await _producerService.ProduceAsync(ProtocolConst.SubscriberLoginReceivedEventName, messageReceivedLoginEvent); await _producerService.ProduceAsync(ProtocolConst.SubscriberLoginReceivedEventName, messageReceivedLoginEvent);
var reqParam = new ReqParameter2 var reqParam = new ReqParameter2
@ -536,7 +536,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
AFN_FC aFN_FC = new AFN_FC(); AFN_FC aFN_FC = new AFN_FC();
try try
{ {
if (hexStringList.Count == 0) if (hexStringList.Count > 0)
{ {
BaseHexMessage baseHexMessage = new BaseHexMessage BaseHexMessage baseHexMessage = new BaseHexMessage