diff --git a/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs index 09b23fc..d1249b7 100644 --- a/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs @@ -25,12 +25,12 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H _logger = logger; } - public Task ExecuteAsync(TB3761 tB3761) + public Task> ExecuteAsync(TB3761 tB3761) { try { ArgumentNullException.ThrowIfNull(nameof(tB3761)); - AFN0_F1_AnalysisDto dto = new AFN0_F1_AnalysisDto + UnitDataAnalysis dto = new UnitDataAnalysis { Code = tB3761.A?.Code, AFN = tB3761.AFN_FC?.AFN ?? 0, @@ -47,36 +47,4 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H } } - public class AFN0_F2_Analysis : IAnalysisStrategy - { - private readonly ILogger _logger; - - public AFN0_F2_Analysis(ILogger logger) - { - _logger = logger; - } - public Task> ExecuteAsync(TB3761 input) - { - try - { - ArgumentNullException.ThrowIfNull(input); - UnitDataAnalysis dto = new UnitDataAnalysis - { - Code = input.A.Code, - AFN = input.AFN_FC.AFN, - Fn = input.DT.Fn, - Pn = input.DA.Pn , - Data = true, - }; - return Task.FromResult(dto); - } - catch (Exception ex) - { - _logger.LogError(ex, $"00_1解析失败:{input.A?.Code}-{input.DT?.Fn ?? 0}-{input?.BaseHexMessage?.HexMessageString},{ex.Message}"); - return null; - } - } - } - - } diff --git a/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs index 2801a3c..364542a 100644 --- a/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H } catch (Exception ex) { - _logger.LogError(ex, $"00_2解析失败:{input.A?.Code}-{input.DT?.Fn ?? 0}-{input?.BaseHexMessage?.HexMessageString},{ex.Message}"); + _logger.LogError(ex, $"00_2解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}"); return null; } }