diff --git a/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs
index da99681..9144c55 100644
--- a/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs
@@ -373,12 +373,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// 组装透明转发报文
///
///
- ///
+ /// 设备数据实体
///
- public virtual List GenerateAFN10HContent(T entity)
- {
- throw new Exception();
- }
+ public abstract Task> GenerateAFN10HContent(T entity) where T : class;
}
}
diff --git a/protocols/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs
index 074fa48..8da228e 100644
--- a/protocols/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs
@@ -22,7 +22,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Interfaces
/// 组装透明转发报文
///
///
- List GenerateAFN10HContent(T entity);
+ Task> GenerateAFN10HContent(T entity) where T : class;
//Task LoginAsync(MessageReceivedLogin messageReceived);
diff --git a/protocols/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
index 27f7466..b2e7a58 100644
--- a/protocols/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
@@ -262,7 +262,16 @@ namespace JiShe.CollectBus.Protocol
-
+ ///
+ /// 组装透明转发报文
+ ///
+ ///
+ /// 设备数据实体
+ ///
+ public override async Task> GenerateAFN10HContent(T entity) where T : class
+ {
+ return await Task.FromResult(new List());
+ }
#region 上行命令
diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index 849f570..a9b1953 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -952,13 +952,13 @@ namespace JiShe.CollectBus.ScheduledMeterReading
}
else
{
- _logger.LogWarning($"{nameof(WatermeterCreatePublishTaskAction)} 集中器{watermeter.FocusAddress}的电表{watermeter.Name}采集项{tempItem}无效编码。");
+ _logger.LogWarning($"{nameof(WatermeterCreatePublishTaskAction)} 集中器{watermeter.FocusAddress}的水表{watermeter.Name}采集项{tempItem}无效编码。");
continue;
}
if (builderResponse == null || builderResponse.Data.Length <= 0)
{
- _logger.LogWarning($"{nameof(WatermeterCreatePublishTaskAction)} 集中器{watermeter.FocusAddress}的电表{watermeter.Name}采集项{tempItem}未能正确获取报文。");
+ _logger.LogWarning($"{nameof(WatermeterCreatePublishTaskAction)} 集中器{watermeter.FocusAddress}的水表{watermeter.Name}采集项{tempItem}未能正确获取报文。");
continue;
}