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

完善指令构建委托封装

Browse Source
This commit is contained in:
ChenYi 2025-03-15 23:06:27 +08:00
parent 0a3b37d80d
commit d35882bf72
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
View File

@ -624,7 +624,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
{ {
if (TelemetryPacketBuilder.AFNHandlers.TryGetValue(tempItem, out var handler)) if (TelemetryPacketBuilder.AFNHandlers.TryGetValue(tempItem, out var handler))
{ {
handler(ammeter.FocusAddress, fn, ammeter.MeteringCode); dataInfos = handler(ammeter.FocusAddress, fn, ammeter.MeteringCode);
} }
else else
{ {
@ -633,8 +633,6 @@ namespace JiShe.CollectBus.ScheduledMeterReading
} }
//TODO:特殊表 //TODO:特殊表
if (dataInfos == null || dataInfos.Length <= 0) if (dataInfos == null || dataInfos.Length <= 0)
{ {
_logger.LogWarning($"{nameof(CreatePublishTask)} 集中器{ammeter.FocusAddress}的电表{ammeter.Name}采集项{tempItem}未能正确获取报文。"); _logger.LogWarning($"{nameof(CreatePublishTask)} 集中器{ammeter.FocusAddress}的电表{ammeter.Name}采集项{tempItem}未能正确获取报文。");

2
src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs
View File

@ -22,7 +22,7 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
/// <param name="address"></param> /// <param name="address"></param>
/// <param name="fn"></param> /// <param name="fn"></param>
/// <param name="pn"></param> /// <param name="pn"></param>
public delegate void AFNDelegate(string address, int fn, int pn = 0); public delegate byte[] AFNDelegate(string address, int fn, int pn = 0);
/// <summary> /// <summary>
/// 编码与方法的映射表 /// 编码与方法的映射表