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:
陈益 2025-04-23 23:42:35 +08:00
parent 310ae97a6b
commit 57021e2b9c
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs
View File

@ -373,12 +373,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// 组装透明转发报文 /// 组装透明转发报文
/// </summary> /// </summary>
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <param name="entity"></param> /// <param name="entity">设备数据实体</param>
/// <returns></returns> /// <returns></returns>
public virtual List<string> GenerateAFN10HContent<T>(T entity) public abstract Task<List<string>> GenerateAFN10HContent<T>(T entity) where T : class;
{
throw new Exception();
}
} }
} }

2
protocols/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs
View File

@ -22,7 +22,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Interfaces
/// 组装透明转发报文 /// 组装透明转发报文
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
List<string> GenerateAFN10HContent<T>(T entity); Task<List<string>> GenerateAFN10HContent<T>(T entity) where T : class;
//Task LoginAsync(MessageReceivedLogin messageReceived); //Task LoginAsync(MessageReceivedLogin messageReceived);

11
protocols/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
View File

@ -262,7 +262,16 @@ namespace JiShe.CollectBus.Protocol
/// <summary>
/// 组装透明转发报文
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="entity">设备数据实体</param>
/// <returns></returns>
public override async Task<List<string>> GenerateAFN10HContent<T>(T entity) where T : class
{
return await Task.FromResult(new List<string>());
}
#region 上行命令 #region 上行命令

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

@ -952,13 +952,13 @@ namespace JiShe.CollectBus.ScheduledMeterReading
} }
else else
{ {
_logger.LogWarning($"{nameof(WatermeterCreatePublishTaskAction)} 集中器{watermeter.FocusAddress}的电表{watermeter.Name}采集项{tempItem}无效编码。"); _logger.LogWarning($"{nameof(WatermeterCreatePublishTaskAction)} 集中器{watermeter.FocusAddress}的水表{watermeter.Name}采集项{tempItem}无效编码。");
continue; continue;
} }
if (builderResponse == null || builderResponse.Data.Length <= 0) 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; continue;
} }