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:
zenghongyao 2025-05-07 08:37:57 +08:00
parent be4c25519d
commit 1718a0afa7
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs
View File

@ -76,7 +76,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
{ {
times.Reverse(); times.Reverse();
time = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{times[0]}-{times[1]}-{times[2]} {times[3]}:{times[4]}:00"; time = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{times[0]}-{times[1]}-{times[2]} {times[3]}:{times[4]}:00";
} }
catch { } catch { }
return time; return time;

6
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F1_Analysis.cs
View File

@ -34,13 +34,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
{ {
ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input);
ArgumentNullException.ThrowIfNull(input.BaseHexMessage.HexMessageList); ArgumentNullException.ThrowIfNull(input.BaseHexMessage.HexMessageList);
ArgumentNullException.ThrowIfNull(input.UnitData.HexMessageList); ArgumentNullException.ThrowIfNull(input.UnitData.HexMessageString);
// TODO: 待定，等确认如何匹配规则 // TODO: 待定，等确认如何匹配规则
string value = string.Join(" ", input.BaseHexMessage.HexMessageList!); string value = input.UnitData.HexMessageString;
if (value.Contains(F10TranspondMatch.ReadNormal)) if (value.Contains(F10TranspondMatch.ReadNormal))
{ {
if (value.Contains(F10TranspondMatch.PowerHz))//电网频率 if (value.Contains(F10TranspondMatch.PowerHz))//电网频率
await _analysisStrategyContext.ExecuteAsync<TB3761>("AFN16_F97_Analysis", input, dto => await _analysisStrategyContext.ExecuteAsync<TB3761>(nameof(AFN16_F97_Analysis), input, dto =>
{ {
result?.Invoke(dto); result?.Invoke(dto);
}); });

2
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs
View File

@ -58,7 +58,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
Data = data, Data = data,
HexMessage = input.BaseHexMessage.HexMessageString, HexMessage = input.BaseHexMessage.HexMessageString,
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔分钟数, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Hour, DensityUnit = DensityUnit.Hour,
ReceivedTime = input.ReceivedTime ReceivedTime = input.ReceivedTime
}; };