admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

dev #4

Merged
admin merged 158 commits from dev into master 2025-05-20 05:39:26 +00:00
Conversation 0 Commits 158 Files Changed 301 +10 -10
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7ff709a68 - Show all commits

6
protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs
View File

@ -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