统一时标类型

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
@@ -32,7 +33,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
                     Data = true,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
@@ -31,7 +32,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
                     Data = false,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime =input.ReceivedTime
+                    ReceivedTime =input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H;
 using JiShe.CollectBus.Protocol3761;
@@ -38,7 +39,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                     Data = $"登录帧",
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
@@ -37,7 +38,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                     Data = $"退出登录帧",
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
@@ -37,7 +38,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                     Data = $"心跳帧",
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -38,7 +39,9 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -34,7 +35,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
                     Data = Encoding.ASCII.GetString(string.Join("", input.UnitData.HexMessageList.Skip(30).Take(20).ToList()).HexToByte()).Replace("\0", ""), //SIM卡
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -38,7 +39,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
                     },
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -39,7 +40,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
@@ -32,7 +33,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
                     Data = input.UnitData.HexMessageList[4].Equals("55"),
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.IoTDB.Interface;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.IoTDB.Interface;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -41,7 +42,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                     PSEQ = input.SEQ.PSEQ,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
                 List<AFN12_F129_AnalysisDto> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
@@ -39,7 +40,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                     Data = list,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(unitDataAnalysis);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
@@ -38,7 +39,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                     Data = list,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(unitDataAnalysis);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
@@ -40,7 +41,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                     Data = list,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(unitDataAnalysis);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -41,7 +42,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(unitDataAnalysis);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs

@@ -59,9 +59,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     Data = data,
                     HexMessage=input.BaseHexMessage.HexMessageString,
                     MessageId=input.MessageId,
-                    TimeDensity=1,
+                    ReceivedTime = input.ReceivedTime,
-                    DensityUnit = DensityUnit.Month,
+                    DensityUnit = DensityUnit.Second,
-                    ReceivedTime = input.ReceivedTime
+                    TimeDensity = 0
                 };
                 await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
                 result?.Invoke(unitDataAnalysis);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -42,7 +43,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(dto);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -62,7 +63,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     Data = list,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(unitDataAnalysis);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -40,7 +41,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(dto);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
@@ -42,7 +43,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     Data = await AnalysisDataUnit(input.UnitData.HexMessageList, rationgCount),
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(unitDataAnalysis);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -61,7 +62,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     Data= list,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.Second,
+                    TimeDensity = 0
                 };
                 result?.Invoke(unitDataAnalysis);
                 return await Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -34,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
                 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums))); 
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向无功总电能量");
@@ -66,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向有功总电能示值");
@@ -63,7 +64,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
+
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向无功总电能示值");
@@ -64,7 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
+
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能示值");
@@ -64,7 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向无功总电能示值");
@@ -64,7 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "功率因数");
@@ -64,7 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相功率因数");
@@ -64,7 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相功率因数");
@@ -63,7 +64,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     Data = data,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = density,//密度-间隔分钟数,
+                    TimeDensity = density,//密度,注意这里会兼容存储做判断
                     DensityUnit = DensityUnit.Minute,
                     ReceivedTime = input.ReceivedTime
                 };

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相功率因数");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "一象限无功电能示值");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "四象限无功电能示值");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "二象限无功电能示值");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -33,7 +34,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "三象限无功电能示值");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -34,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "有功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相有功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相有功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -34,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相有功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "无功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相无功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -34,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相无功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相无功功率曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相电压曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相电压曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs

@@ -1,5 +1,6 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
@@ -34,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相电压曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相电流曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相电流曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相电流曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "测量点零序电流曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向有功总电能量曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向无功总电能量曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                 ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
 
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
-                int density = Convert.ToInt32(Enum.GetName(typeof(DensityEnums), Convert.ToInt32(datas[1]))!.Split('_')[1]);//密度-间隔分钟数,
+                int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
                 string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
                 List<AnalysisBaseDto<decimal>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能量曲线");

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
@@ -41,7 +42,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
                     Data = AnalysisDataUnit(input.UnitData.HexMessageList),
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 //  meterData.DataType = "0E_1";
                 result?.Invoke(dto);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F101_Analysis.cs

@@ -1,4 +1,5 @@
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
@@ -33,7 +34,9 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
                     Data = AnalysisDataUnit(input.UnitData.HexMessageList), //SIM卡
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    ReceivedTime = input.ReceivedTime
+                    ReceivedTime = input.ReceivedTime,
+                    DensityUnit = DensityUnit.None,
+                    TimeDensity = -1
                 };
                 result?.Invoke(dto);
                 return Task.FromResult(true);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F98_Analysis.cs

@@ -54,9 +54,9 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
                     Data = (datas[2].Equals("9C") || datas[2].Equals("94")) ? true : false,
                     HexMessage = input.BaseHexMessage.HexMessageString,
                     MessageId = input.MessageId,
-                    TimeDensity = 1,//密度-间隔分钟数,
+                    ReceivedTime = input.ReceivedTime,
-                    DensityUnit = DensityUnit.Second,
+                    DensityUnit = DensityUnit.None,
-                    ReceivedTime = input.ReceivedTime
+                    TimeDensity = -1
                 };
                 //await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
                 result?.Invoke(unitDataAnalysis);

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs

@@ -14,8 +14,10 @@ using JiShe.CollectBus.IotSystems.MeterReadingRecords;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using Microsoft.Extensions.Options;
+using System.Diagnostics.Metrics;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
 {
@@ -87,7 +89,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                 DeviceId = $"{data.MeterId}",
                 DeviceType = $"{data.MeterType}",
                 ProjectId = $"{data.ProjectId}",
-                Timestamps = data.TimeSpan!.Value.GetDateTimeOffset().ToUnixTimeMilliseconds(),  // TODO:这里暂时格式化15分钟数据，需要进行调整
+                Timestamps = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeMilliseconds(), 
                 SingleMeasuring = new Tuple<string, T>(data.FiledName ?? string.Empty, data.DataValue ?? default)
             };
             _runtimeContext.UseTableSessionPool = true; // 使用表模型池
@@ -113,7 +115,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                     DeviceId = $"{data.MeterId}",
                     Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(),
                     DatabaseBusiID = data.DatabaseBusiID,
-                    PendingCopyReadTime = data.TimeSpan.Value.CheckTimePoint(), //  // TODO:这里暂时格式化15分钟数据，需要进行调整
+                    PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), 
                     CreationTime = currentTime,
                     MeterAddress = data.MeterAddress,
                     AFN = analysisBaseDto.AFN,
@@ -153,6 +155,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
         public async Task<bool> SaveMultipleDataToIotDbAsync<T>(UnitDataAnalysis<List<AnalysisBaseDto<T>>> analysisBaseDto)
         {
             var data = analysisBaseDto.Data!;
+            List<MeterReadingTelemetryPacketInfo> meterReadingTelemetryPacketInfos = new List<MeterReadingTelemetryPacketInfo>();
+            List< TreeModelSingleMeasuringEntity<T>> treeModelSingleMeasuringEntities = new List<TreeModelSingleMeasuringEntity<T>>();
             foreach (var item in data)
             {
                 if(!item.TimeSpan.HasValue)
@@ -188,7 +192,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                     DeviceId = $"{item.MeterId}",
                     DeviceType = $"{item.MeterType}",
                     ProjectId = $"{item.ProjectId}",
-                    Timestamps = item.TimeSpan!.Value.CheckTimePoint().GetDateTimeOffset().ToUnixTimeMilliseconds(),  // TODO:这里暂时格式化15分钟数据，需要进行调整
+                    Timestamps = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeMilliseconds(),  // TODO:这里暂时格式化15分钟数据，需要进行调整
                     SingleMeasuring = new Tuple<string, T>(item.FiledName ?? string.Empty, item.DataValue ?? default)
                 };
                 _runtimeContext.UseTableSessionPool = true; // 使用表模型池
@@ -214,7 +218,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                         DeviceId = $"{item.MeterId}",
                         Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(),
                         DatabaseBusiID = item.DatabaseBusiID,
-                        PendingCopyReadTime = item.TimeSpan.Value.CheckTimePoint(),  // TODO:这里暂时格式化15分钟数据，需要进行调整
+                        PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), 
                         CreationTime = currentTime,
                         MeterAddress = item.MeterAddress,
                         AFN = analysisBaseDto.AFN,
@@ -233,18 +237,24 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                         ScoreValue = $"{analysisBaseDto.Code}.{taskMark}".Md5Fun(),
                     };
                 }
-
+                meterReadingTelemetryPacketInfos.Add(taskData);
-                await _dbProvider.InsertAsync(taskData);
                 //如果无字段名，则不保存数据
                 if (!string.IsNullOrWhiteSpace(item.FiledName))
                 {
-                    _runtimeContext.UseTableSessionPool = false; // 使树模型池
+                    treeModelSingleMeasuringEntities.Add(meter);
-                    await _dbProvider.InsertAsync(meter);
                 }
             }
+            // 批量保存数据
+            await _dbProvider.BatchInsertAsync(meterReadingTelemetryPacketInfos);
+            if (treeModelSingleMeasuringEntities.Count > 0)
+            {
+                _runtimeContext.UseTableSessionPool = false; // 使树模型池
+                await _dbProvider.BatchInsertAsync(treeModelSingleMeasuringEntities);
+            }
             return await Task.FromResult(true);
         }
 
         
+
     }
 }

protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs

@@ -180,8 +180,38 @@ namespace JiShe.CollectBus.Protocol.T37612012
             return DateTime.Parse(dataTime);
         }
 
+
         /// <summary>
-        /// 数据时标
+        /// 格式化时间
+        /// </summary>
+        /// <param name="dateTime"></param>
+        /// <param name="densityUnit"></param>
+        /// <param name="timeDensity"></param>
+        /// <returns></returns>
+        public static DateTime GetFormatTime(this DateTime dateTime, DensityUnit densityUnit, int timeDensity)
+        {
+            switch (densityUnit)
+            {
+                case DensityUnit.Minute:
+                    if (timeDensity == 1 || timeDensity == 30)
+                        return DateTime.Parse(dateTime.ToString("yyyy-MM-dd HH:mm:00"));
+                    if (timeDensity == 5)
+                        return dateTime.CheckTimeFivePoint();
+                    if (timeDensity == 15)
+                        return dateTime.CheckTimePoint();
+                    if (timeDensity == 60)
+                        return DateTime.Parse(dateTime.ToString("yyyy-MM-dd HH:00:00"));
+                    break;
+                case DensityUnit.Day:
+                    return DateTime.Parse(dateTime.ToString("yyyy-MM-dd 00:00:00"));
+                case DensityUnit.Month:
+                    return DateTime.Parse(dateTime.ToString("yyyy-MM-01 00:00:00"));
+            }
+            return dateTime;
+        }
+
+        /// <summary>
+        /// 数据时标(曲线类型)
         /// </summary>
         /// <param name="hexMessageList"></param>
         /// <param name="index"></param>
@@ -238,13 +268,13 @@ namespace JiShe.CollectBus.Protocol.T37612012
         }
 
         /// <summary>
-        /// 月冻结
+        /// 月冻结(曲线类型)
         /// </summary>
         /// <param name="data"></param>
         /// <param name="index"></param>
         /// <param name="dataType"></param>
         /// <param name="timeSpan"></param>
-        /// <param name="remark"></param>
+        /// <param name="filedDesc"></param>
         /// <returns></returns>
         public static List<AnalysisBaseDto<decimal>> GenerateFinalResultTd_m(this List<string> data, int index,string dataType,string timeSpan, string filedDesc = "")
         {
@@ -276,7 +306,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
         }
 
         /// <summary>
-        /// 日冻结
+        /// 日冻结(曲线类型)
         /// </summary>
         /// <param name="index"></param>
         /// <param name="data"></param>

shared/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs

@@ -1735,6 +1735,8 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
             return list;
         }
 
+
+
         /// <summary>
         /// 帧序列域
         /// </summary>

shared/JiShe.CollectBus.Common/Enums/376Enums.cs

@@ -376,15 +376,22 @@ namespace JiShe.CollectBus.Common.Enums
 
     /// <summary>
     /// 数据冻结密度
+    /// -1、采集项本身无密度位，0、无冻结，1、15分钟，2、30分钟，3、60分钟，245、5分钟，255、1分钟
     /// </summary>
     public enum DensityEnums
     {
-        Sec_1 = 255,
+        [Description("0")]
-        Sec_5 = 254,
+        Second = 0,
-        Sec_60 = 3,
+        [Description("1")]
-        Sec_30 = 2,
+        OneMinute = 255,
-        Sec_15 = 1,
+        [Description("5")]
-        Sec_0 = 0
+        FiveMinute = 254,
+        [Description("15")]
+        FifteenMinute = 1,
+        [Description("30")]
+        ThirtyMinute = 2,
+        [Description("60")]
+        SixtyMinute = 3,
     }
 
     /// <summary>
@@ -392,6 +399,10 @@ namespace JiShe.CollectBus.Common.Enums
     /// </summary>
     public enum DensityUnit 
     {
+        /// <summary>
+        /// 无
+        /// </summary>
+        None = -1,
         /// <summary>
         /// 秒
         /// </summary>

shared/JiShe.CollectBus.Common/Helpers/CommonHelper.cs

@@ -9,6 +9,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using JiShe.CollectBus.Common.Attributes;
+using System.Collections.Specialized;
 
 namespace JiShe.CollectBus.Common.Helpers
 {
@@ -670,6 +671,31 @@ namespace JiShe.CollectBus.Common.Helpers
         }
 
 
+        /// <summary>
+        /// 根据枚举类型值返回枚举定义Description属性
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="enumType"></param>
+        /// <returns></returns>
+        public static string GetEnumDescription(this int value, Type enumType)
+        {
+            NameValueCollection nameValueCollection = new NameValueCollection();
+            Type typeFromHandle = typeof(DescriptionAttribute);
+            FieldInfo[] fields = enumType.GetFields();
+            foreach (FieldInfo fieldInfo in fields)
+            {
+                if (fieldInfo.FieldType.IsEnum)
+                {
+                    string name = ((int)enumType.InvokeMember(fieldInfo.Name, BindingFlags.GetField, null, null, null)).ToString();
+                    object[] customAttributes = fieldInfo.GetCustomAttributes(typeFromHandle, inherit: true);
+                    string value2 = ((customAttributes.Length == 0) ? "" : ((DescriptionAttribute)customAttributes[0]).Description);
+                    nameValueCollection.Add(name, value2);
+                }
+            }
+
+            return nameValueCollection[value.ToString()];
+        }
+
 
         /// <summary>
         /// 将传入的字符串中间部分字符替换成特殊字符