From d35882bf7231c648d7703fa722877cb0ed0a17d1 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Sat, 15 Mar 2025 23:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=87=E4=BB=A4=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E5=A7=94=E6=89=98=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicScheduledMeterReadingService.cs                      | 4 +---
 .../BuildSendDatas/TelemetryPacketBuilder.cs                  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index 7de35f2..3cb1334 100644
--- a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -624,7 +624,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                         {
                             if (TelemetryPacketBuilder.AFNHandlers.TryGetValue(tempItem, out var handler))
                             {
-                                handler(ammeter.FocusAddress, fn, ammeter.MeteringCode);
+                               dataInfos = handler(ammeter.FocusAddress, fn, ammeter.MeteringCode);
                             }
                             else
                             {
@@ -633,8 +633,6 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                         }
                         //TODO:特殊表 
 
-
-
                         if (dataInfos == null || dataInfos.Length <= 0)
                         {
                             _logger.LogWarning($"{nameof(CreatePublishTask)} 集中器{ammeter.FocusAddress}的电表{ammeter.Name}采集项{tempItem}未能正确获取报文。");
diff --git a/src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs b/src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs
index 6772ef1..96bb97f 100644
--- a/src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs
+++ b/src/JiShe.CollectBus.Common/BuildSendDatas/TelemetryPacketBuilder.cs
@@ -22,7 +22,7 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
         /// <param name="address"></param>
         /// <param name="fn"></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>
         /// 编码与方法的映射表