From 0de5177472b36c76408d8b03d8cf4bb8cb4b8425 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 09:25:17 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs index c6026d6..c6f7fae 100644 --- a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs +++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs @@ -65,7 +65,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto /// /// 表地址 /// - public string MeterAddress { get; set; } = null!; + public string DeviceAddress { get; set; } = null!; } From 7a18dc4df9dd1cd333b58d98a36100f2860f09e6 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 09:25:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnalysisData/AFN_02H/AFN2_F1_Analysis.cs | 2 +- .../AnalysisData/AFN_02H/AFN2_F2_Analysis.cs | 2 +- .../AnalysisData/AFN_02H/AFN2_F3_Analysis.cs | 2 +- .../AFN_0CH/AFN12_F149_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F100_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F101_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F102_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F103_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F104_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F105_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F106_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F107_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F108_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F11_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F145_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F146_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F147_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F148_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F161_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F162_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F163_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F164_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F165_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F166_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F167_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F168_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F177_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F178_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F179_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F180_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F181_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F182_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F183_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F184_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F189_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F190_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F193_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F195_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F19_Analysis.cs | 2 +- .../AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs | 2 +- .../AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F81_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F82_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F83_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F84_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F85_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F86_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F87_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F88_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F89_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F90_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F91_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F92_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F93_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F94_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F95_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F97_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F98_Analysis.cs | 2 +- .../AFN_0DH/AFN13_F99_Analysis.cs | 2 +- .../AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs | 73 +++++++++++++---- .../AFN_10H/AFN16_F97_Analysis.cs | 2 +- .../AnalysisData/DataStorage.cs | 81 ++++++++++++++++++- .../Protocol3761/Dto/AnalysisBaseDto.cs | 2 +- 63 files changed, 196 insertions(+), 80 deletions(-) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs index b287391..e7e6655 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.FocusId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - data.MeterAddress = ammeterInfo.AmmerterAddress; + data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; } UnitDataAnalysis> dto = new UnitDataAnalysis> diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs index 5d940f6..fe3efcc 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs @@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.FocusId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - data.MeterAddress = ammeterInfo.AmmerterAddress; + data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; } UnitDataAnalysis> dto = new UnitDataAnalysis> diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs index f4342f8..ce982b3 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs @@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.FocusId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - data.MeterAddress = ammeterInfo.AmmerterAddress; + data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; } UnitDataAnalysis> dto = new UnitDataAnalysis> diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs index c5afb48..53b0e23 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs @@ -46,7 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID=ammeterInfo.DatabaseBusiID; - data.MeterAddress= ammeterInfo.AmmerterAddress; + data.DeviceAddress= ammeterInfo.AmmerterAddress; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs index 65e3b28..084338b 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs index 17750b8..5457f1d 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs index 12d0136..9a10a3d 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs index f72e60c..790f871 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs index a258b18..c19133c 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs index 5caebd9..2b0b1e8 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs index b138b3f..76cb330 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs index bcaf15c..b774044 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs index f8d185a..89b569b 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs index 48fb9ae..9502506 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs index b674500..5348f46 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs index 2d80010..aa7e1b3 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs index fd60c25..f253797 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs index 797eaf9..abeaa33 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs index 0702077..c8c0709 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs index 4aca266..37586a4 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs index b040842..2eca6e7 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs index a1b8084..5f65463 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs index b4de0ab..ba7ea40 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs index ce97c66..a9e3dfe 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs index a383cb5..b30f48c 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs index 2ed4694..e6c2143 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs index 4589d46..a5aafb0 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs @@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs index 793a2ec..33597da 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs index 326ce3e..e1cf7c9 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs index fd69e70..7c9dc8a 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs @@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs index 01464e6..c799490 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs index d0e3e3e..7e1fd3f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs index f1d8bda..9f00652 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs @@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs index fed55e1..732af70 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs index f353949..4c5461d 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs index e9e56e2..2f5723b 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs @@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - data.MeterAddress = ammeterInfo.AmmerterAddress; + data.DeviceAddress = ammeterInfo.AmmerterAddress; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs index b0cdbf2..9805b15 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs @@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - data.MeterAddress = ammeterInfo.AmmerterAddress; + data.DeviceAddress = ammeterInfo.AmmerterAddress; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs index 0bee263..229c4cd 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs @@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - data.MeterAddress = ammeterInfo.AmmerterAddress; + data.DeviceAddress = ammeterInfo.AmmerterAddress; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs index 818309f..7fd8ea4 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs @@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs index c461225..9342427 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs index 84c3532..8b7e7eb 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs index 50b6cd4..4f917de 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs index 4a5c8d7..1854237 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs index 69b2fa1..a35f66f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs index 976e500..4c70465 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs index 19dbbc5..4b85f94 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs index b09ea25..cc86276 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs index 73d4804..8aeaef4 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs index 2e39463..3f1cdb7 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs index eabab57..227418b 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs index a5be397..428eeae 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs index c0d7fa5..3a7f5c0 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs @@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs index 2e0fbdc..6c7f733 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs index 10bddfa..5176d2f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs index 4f722e8..60e0820 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs index 295e6fd..391f375 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs index e880d2a..e31ea6f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs index 1969c24..7e863aa 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs index e2a5922..b3763db 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.ProjectId = ammeterInfo.ProjectID; item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - item.MeterAddress = ammeterInfo.AmmerterAddress; + item.DeviceAddress = ammeterInfo.AmmerterAddress; }); } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs index b2177a6..39b36c8 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs @@ -1,9 +1,13 @@ using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; +using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH { @@ -15,13 +19,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH public class AFN14_F1_Analysis : IAnalysisStrategy { private readonly ILogger _logger; - - public AFN14_F1_Analysis(ILogger logger) + private readonly DataStorage _dataStorage; + public AFN14_F1_Analysis(ILogger logger, DataStorage dataStorage) { _logger = logger; + _dataStorage= dataStorage; } - public Task ExecuteAsync(TB3761 input, Action? result = null) + public async Task ExecuteAsync(TB3761 input, Action? result = null) { try { @@ -31,15 +36,35 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH bool isOnOffPower = erc.Equals(14) ? true : false; if (!isOnOffPower) { - throw new Exception($"ERC{erc}非上掉电事件"); + // TODO：非终端停/上电事件直接确认 + _logger.LogWarning($"0E_1解析ERC{erc}非终端停/上电事件:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString}"); + return await Task.FromResult(true); } - UnitDataAnalysis> dto = new UnitDataAnalysis> + + List> data = AnalysisDataUnit(input.UnitData.HexMessageList); + if (data.Count > 0) + { + // 查询电表信息 + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); + if (ammeterInfo != null) + { + data.ForEach(item => + { + item.ProjectId = ammeterInfo.ProjectID; + item.DeviceId = ammeterInfo.FocusId; + item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; + item.DeviceAddress = ammeterInfo.Address; + item.DeviceType = MeterTypeEnum.Focus; + }); + } + } + UnitDataAnalysis>> dto = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, Fn = input.DT.Fn, Pn = input.DA.Pn, - Data = AnalysisDataUnit(input.UnitData.HexMessageList), + Data = data, HexMessage = input.BaseHexMessage.HexMessageString, MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, @@ -48,37 +73,55 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH }; // meterData.DataType = "0E_1"; result?.Invoke(dto); - return Task.FromResult(true); + await _dataStorage.SaveMultipleStatusToIotDbAsync(dto); + return await Task.FromResult(true); } catch (Exception ex) { _logger.LogError(ex, $"0E_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}"); } - return Task.FromResult(false); + return await Task.FromResult(false); } - private Tuple AnalysisDataUnit(List hexMessageList) + private List> AnalysisDataUnit(List hexMessageList) { /// Item1=停电事件 /// Item2=上电事件 - return Tuple.Create(HandlerTime(hexMessageList.GetRange(10, 5)), HandlerTime(hexMessageList.GetRange(15, 5))); + List > values = new List> + { + new AnalysisBaseDto + { + FiledDesc = "停电事件", + FiledName = "Type", + DataValue = "PowerDownEvent", + TimeSpan=HandlerTime(hexMessageList.GetRange(10, 5)) + }, + new AnalysisBaseDto + { + FiledDesc = "上电事件", + FiledName = "Type", + DataValue = "PowerOnEvent", + TimeSpan=HandlerTime(hexMessageList.GetRange(15, 5)) + } + }; + return values; } /// /// /解析时间 /// /// - /// 时间验证失败是否默认为当前时间 /// - private string HandlerTime(List times) + private DateTime? HandlerTime(List times) { - var time = string.Empty; try { times.Reverse(); - time = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{times[0]}-{times[1]}-{times[2]} {times[3]}:{times[4]}:00"; + string time = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{times[0]}-{times[1]}-{times[2]} {times[3]}:{times[4]}:00"; + DateTime.TryParse(time, out DateTime dateTime); + return dateTime; } catch { } - return time; + return null; } } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs index 4681548..3d17fd7 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs @@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H data.ProjectId = ammeterInfo.ProjectID; data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; - data.MeterAddress = ammeterInfo.AmmerterAddress; + data.DeviceAddress = ammeterInfo.AmmerterAddress; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs index 8b13ac0..46be873 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs @@ -123,7 +123,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DatabaseBusiID = data.DatabaseBusiID, PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), CreationTime = currentTime, - MeterAddress = data.MeterAddress, + MeterAddress = data.DeviceAddress, AFN = analysisBaseDto.AFN, Fn = analysisBaseDto.Fn, Seq = analysisBaseDto.PSEQ, @@ -226,7 +226,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DatabaseBusiID = item.DatabaseBusiID, PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), CreationTime = currentTime, - MeterAddress = item.MeterAddress, + MeterAddress = item.DeviceAddress, AFN = analysisBaseDto.AFN, Fn = analysisBaseDto.Fn, Seq = analysisBaseDto.PSEQ, @@ -269,8 +269,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData public async Task SaveStatusToIotDbAsync(UnitDataAnalysis> analysisBaseDto) { ArgumentNullException.ThrowIfNull(nameof(analysisBaseDto.Data)); - ArgumentNullException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.FiledName)); - ArgumentNullException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.DataValue)); + ArgumentException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.FiledName)); + ArgumentException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.DataValue)); var data = analysisBaseDto.Data!; if (!data.TimeSpan.HasValue) data.TimeSpan = analysisBaseDto.ReceivedTime; @@ -329,5 +329,78 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData return await Task.FromResult(true); } + /// + /// 保存状态到IotDb + /// + /// + /// + /// + public async Task SaveMultipleStatusToIotDbAsync(UnitDataAnalysis>> analysisBaseDto) + { + ArgumentNullException.ThrowIfNull(nameof(analysisBaseDto.Data)); + + var data = analysisBaseDto.Data!; + foreach (var item in data) + { + ArgumentException.ThrowIfNullOrWhiteSpace(nameof(item.FiledName)); + ArgumentException.ThrowIfNullOrWhiteSpace(nameof(item.DataValue)); + + if (!item.TimeSpan.HasValue) + item.TimeSpan = analysisBaseDto.ReceivedTime; + // 类型(心跳，登录，上电，掉电) + long timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(); + var treeData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{item.DeviceId}", + DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{item.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(item.FiledName!, item.DataValue!) + }; + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeData); + // 数据帧 + var treeFrameData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{item.DeviceId}", + DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{item.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.FrameData, analysisBaseDto.HexMessage ?? string.Empty) + }; + + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeFrameData); + + // 时间 + var treeRecordingTimeData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{item.DeviceId}", + DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{item.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.RecordingTime, (data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds()) + }; + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeRecordingTimeData); + // 备注 + var treeRemarkData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{item.DeviceId}", + DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{item.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.Remark, data.FiledDesc ?? string.Empty) + }; + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeRemarkData); + + } + return await Task.FromResult(true); + } } } diff --git a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs index c6f7fae..8d693e3 100644 --- a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs +++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs @@ -63,7 +63,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto public int DatabaseBusiID { get; set; } /// - /// 表地址 + /// 设备地址(电表地址,水表地址，气表地址，集中器地址等) /// public string DeviceAddress { get; set; } = null!; From a5ed0a37a041c9720338369abc806b9fb13e5160 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 09:29:31 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnalysisData/DataStorage.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs index 46be873..00c5c63 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs @@ -382,7 +382,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}", ProjectId = $"{item.ProjectId}", Timestamps = timestamps, - SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.RecordingTime, (data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds()) + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.RecordingTime, (item.TimeSpan.HasValue ? item.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds()) }; _runtimeContext.UseTableSessionPool = false; // 使树模型池 await _dbProvider.InsertAsync(treeRecordingTimeData); @@ -394,7 +394,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}", ProjectId = $"{item.ProjectId}", Timestamps = timestamps, - SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.Remark, data.FiledDesc ?? string.Empty) + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.Remark, item.FiledDesc ?? string.Empty) }; _runtimeContext.UseTableSessionPool = false; // 使树模型池 await _dbProvider.InsertAsync(treeRemarkData); From 245c91c9e34ef5170c79673c7aa49a7f773b4bd3 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 11:25:08 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Samples/SampleDto.cs | 9 ++++ .../Plugins/TcpMonitor.cs | 21 +++++---- .../Samples/SampleAppService.cs | 47 ++++++++++++++++++- .../Consts/ProtocolConst.cs | 5 ++ .../Pages/Monitor.cshtml | 1 - 5 files changed, 71 insertions(+), 12 deletions(-) diff --git a/services/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs b/services/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs index 12f46d1..c32d892 100644 --- a/services/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs +++ b/services/JiShe.CollectBus.Application.Contracts/Samples/SampleDto.cs @@ -14,3 +14,12 @@ public class SampleDto2 { public int Value { get; set; } } + + +public class KafkaSendDto +{ + public string Address { get; set; } + + public string Frame { get; set; } + +} diff --git a/services/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs b/services/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs index 25d16f3..049db1f 100644 --- a/services/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs +++ b/services/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs @@ -100,16 +100,17 @@ namespace JiShe.CollectBus.Plugins { //todo: 删除Redis缓存 var tcpSessionClient = (ITcpSessionClient)client; - var entity = await _deviceRepository.FindAsync(a => a.ClientId == tcpSessionClient.Id); - if (entity != null) - { - entity.UpdateByOnClosed(); - await _deviceRepository.UpdateAsync(entity); - } - else - { - _logger.LogWarning($"[TCP] ID:{tcpSessionClient.Id} IP:{client.GetIPPort()}已关闭连接,但采集程序检索失败"); - } + //var entity = await _deviceRepository.FindAsync(a => a.ClientId == tcpSessionClient.Id); + //if (entity != null) + //{ + // entity.UpdateByOnClosed(); + // await _deviceRepository.UpdateAsync(entity); + //} + //else + //{ + //_logger.LogWarning($"[TCP] ID:{tcpSessionClient.Id} IP:{client.GetIPPort()}已关闭连接,但采集程序检索失败"); + //} + _logger.LogWarning($"[TCP] ID:{tcpSessionClient.Id} IP:{client.GetIPPort()}已关闭连接"); await e.InvokeNext(); } diff --git a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs index ea2415e..4cb325c 100644 --- a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs +++ b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs @@ -14,6 +14,7 @@ using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.PrepayModel; using JiShe.CollectBus.Kafka.Attributes; using JiShe.CollectBus.Kafka.Internal; +using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Protocol.Interfaces; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -24,6 +25,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Threading.Tasks; +using TouchSocket.Sockets; namespace JiShe.CollectBus.Samples; @@ -35,14 +37,18 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS private readonly IoTDbOptions _options; private readonly IRedisDataCacheService _redisDataCacheService; + private readonly IProducerService _producerService; + private readonly ITcpService _tcpService; public SampleAppService(IIoTDbProvider iotDBProvider, IOptions options, - IoTDBRuntimeContext dbContext, ILogger logger, IRedisDataCacheService redisDataCacheService) + IoTDBRuntimeContext dbContext, ILogger logger, IRedisDataCacheService redisDataCacheService, IProducerService producerService, ITcpService tcpService) { _iotDBProvider = iotDBProvider; _options = options.Value; _dbContext = dbContext; _logger = logger; _redisDataCacheService = redisDataCacheService; + _producerService =producerService; + _tcpService=tcpService; } /// @@ -399,5 +405,44 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS _logger.LogWarning($"收到订阅消息： {obj}"); return SubscribeAck.Success(); } + + /// + /// 测试Kafka下发报文 + /// + /// + /// + [AllowAnonymous] + public async Task KafkaSendAsync(KafkaSendDto input) + { + ArgumentException.ThrowIfNullOrWhiteSpace(input.Address); + ArgumentException.ThrowIfNullOrWhiteSpace(input.Frame); + input.Frame = input.Frame.Replace(" ", ""); + await _producerService.ProduceAsync(ProtocolConst.TESTSENDTOPIC, input); + return await Task.FromResult(true); + } + + + /// + /// 订阅下发的数据 + /// + /// + /// + [KafkaSubscribe(ProtocolConst.TESTSENDTOPIC)] + + public async Task KafkaSubscribeTestSendAsync(KafkaSendDto dto) + { + if (_tcpService.ClientExists(dto.Address)) + { + // 发送给设备 + await _tcpService.SendAsync(dto.Address, dto.Frame); + _logger.LogWarning($"{dto.Address}下发消息报文：{dto.Frame}"); + } + else + { + _logger.LogWarning($"{dto.Address}集中器未上线： {dto.Serialize()}"); + } + // 测试不管是否上线都ACK + return SubscribeAck.Success(); + } } diff --git a/shared/JiShe.CollectBus.Common/Consts/ProtocolConst.cs b/shared/JiShe.CollectBus.Common/Consts/ProtocolConst.cs index 95c2c44..0758899 100644 --- a/shared/JiShe.CollectBus.Common/Consts/ProtocolConst.cs +++ b/shared/JiShe.CollectBus.Common/Consts/ProtocolConst.cs @@ -170,5 +170,10 @@ namespace JiShe.CollectBus.Common.Consts /// 测试主题格式 /// public const string TESTTOPIC = "test-topic"; + + /// + /// 测试下发主题格式 + /// + public const string TESTSENDTOPIC = "test-send-topic"; } } diff --git a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml index 30e91e8..a58ded5 100644 --- a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml +++ b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml @@ -16,7 +16,6 @@ 后端服务 - From 91386007ae053a41672cf765cee7755780357095 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 11:58:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=91=E4=B8=BA=E5=AD=97=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Protocol3761Extensions.cs | 2 +- .../JiShe.CollectBus.Application/Samples/SampleAppService.cs | 3 ++- web/JiShe.CollectBus.Host/Pages/Monitor.cshtml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs index f9f3801..caa6793 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs @@ -257,7 +257,7 @@ namespace JiShe.CollectBus.Protocol.T37612012 else decimal.TryParse(data[i], out value); meter.DataValue = value; - meter.DataType = dataType; + meter.DataType = dataType.ToUpper(); meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; if (DateTime.TryParse(CalculateTimeSpan(i - 3, data[0], density), out DateTime readingDate)) diff --git a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs index 4cb325c..56e895a 100644 --- a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs +++ b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs @@ -25,6 +25,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Threading.Tasks; +using TouchSocket.Core; using TouchSocket.Sockets; namespace JiShe.CollectBus.Samples; @@ -434,7 +435,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS if (_tcpService.ClientExists(dto.Address)) { // 发送给设备 - await _tcpService.SendAsync(dto.Address, dto.Frame); + await _tcpService.SendAsync(dto.Address, Convert.FromHexString(dto.Frame)); _logger.LogWarning($"{dto.Address}下发消息报文：{dto.Frame}"); } else diff --git a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml index a58ded5..30e91e8 100644 --- a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml +++ b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml @@ -16,6 +16,7 @@ 后端服务 + From 3488b0012a16fa23c156bc535c7fd51f35c01ded Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 15:12:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98NULL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AFN_0CH/AFN12_F129_Analysis.cs | 30 ++++-- .../AFN_0CH/AFN12_F130_Analysis.cs | 27 ++++-- .../AFN_0CH/AFN12_F131_Analysis.cs | 29 ++++-- .../AFN_0CH/AFN12_F132_Analysis.cs | 32 +++++-- .../AFN_0CH/AFN12_F145_Analysis.cs | 26 ++++-- .../AFN_0CH/AFN12_F149_Analysis.cs | 15 +-- .../AFN_0CH/AFN12_F188_Analysis.cs | 20 ++-- .../AFN_0CH/AFN12_F25_Analysis.cs | 22 +++-- .../AFN_0CH/AFN12_F49_Analysis.cs | 23 +++-- .../AFN_0DH/AFN13_F100_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F101_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F102_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F103_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F104_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F105_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F106_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F107_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F108_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F11_Analysis.cs | 38 ++++---- .../AFN_0DH/AFN13_F145_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F146_Analysis.cs | 9 +- .../AFN_0DH/AFN13_F147_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F148_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F161_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F162_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F163_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F164_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F165_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F166_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F167_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F168_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F177_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F178_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F179_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F180_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F181_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F182_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F183_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F184_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F189_Analysis.cs | 12 +-- .../AFN_0DH/AFN13_F190_Analysis.cs | 44 ++++----- .../AFN_0DH/AFN13_F193_Analysis.cs | 37 ++++---- .../AFN_0DH/AFN13_F195_Analysis.cs | 37 ++++---- .../AFN_0DH/AFN13_F19_Analysis.cs | 37 ++++---- .../AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs | 91 +++++++++---------- .../AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs | 33 ++++--- .../AFN_0DH/AFN13_F81_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F82_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F83_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F84_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F85_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F86_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F87_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F88_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F89_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F90_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F91_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F92_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F93_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F94_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F95_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F97_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F98_Analysis.cs | 6 +- .../AFN_0DH/AFN13_F99_Analysis.cs | 6 +- .../AFN_10H/AFN16_F97_Analysis.cs | 21 +++-- .../AnalysisData/DataStorage.cs | 2 +- .../Protocol3761Extensions.cs | 82 ++++++++++------- .../Protocol3761/Dto/AnalysisBaseDto.cs | 8 +- .../Extensions/StringExtensions.cs | 4 +- .../Pages/Monitor.cshtml | 1 - 70 files changed, 520 insertions(+), 436 deletions(-) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs index 4eb05ad..a7538ca 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs @@ -33,7 +33,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); ArgumentNullException.ThrowIfNull(input.A.A3?.D1_D7); - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH TimeDensity = 0 }; List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); - List> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn); + List> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn); unitDataAnalysis.Data= list; result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); @@ -90,22 +90,32 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH } #endregion - public List> GenerateFinalResult(int index, List data, string filedDesc = "", int afn = 0, int fn = 0) + public List> GenerateFinalResult(int index, List data, string filedDesc = "", int afn = 0, int fn = 0) { - List> list = new List>(); + List> list = new List>(); for (int i = index; i < data.Count; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto(); - - decimal value = 0; + AnalysisBaseDto meter = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCode = data[i].CheckErrorCode(); if (errorCode != null) + { + meter.ErrorCodeMsg= errorCode.Item2; meter.ValidData = false; + } else - decimal.TryParse(data[i], out value); - meter.DataValue = value; + { + if(decimal.TryParse(data[i], out decimal value)) + meter.DataValue = value; + } meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; - meter.TimeSpan = Convert.ToDateTime($"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"); + string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; + if (DateTime.TryParse(timeSpan, out DateTime readingDate)) + { + meter.TimeSpan = readingDate; + } meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs index cce2df4..d67d8d1 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs @@ -31,8 +31,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); - List> list = GenerateFinalResult(2, datas, "正向无功电能示值", input.AFN_FC.AFN, input.DT.Fn); - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + List> list = GenerateFinalResult(2, datas, "正向无功电能示值", input.AFN_FC.AFN, input.DT.Fn); + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -78,21 +78,30 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH } return values; } - public List> GenerateFinalResult(int index, List data, string filedDesc = "", int afn = 0, int fn = 0) + public List> GenerateFinalResult(int index, List data, string filedDesc = "", int afn = 0, int fn = 0) { - List> list = new List>(); + List> list = new List>(); for (int i = index; i < data.Count; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto(); - decimal value = 0; + AnalysisBaseDto meter = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCode = data[i].CheckErrorCode(); if (errorCode != null) + { + meter.ErrorCodeMsg = errorCode.Item2; meter.ValidData = false; + } else - decimal.TryParse(data[i], out value); - meter.DataValue = value; + { + if(decimal.TryParse(data[i], out decimal value)) + meter.DataValue = value; + } meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; - meter.TimeSpan = Convert.ToDateTime($"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"); + string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00" + if(DateTime.TryParse(timeSpan, out DateTime readingDate)) + meter.TimeSpan = readingDate; meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs index 4cbb5b5..9b57ea1 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs @@ -6,6 +6,8 @@ using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using Newtonsoft.Json.Linq; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH { @@ -30,8 +32,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); - List> list = GenerateFinalResult(2, datas, "反向有功总电能示值", input.AFN_FC.AFN, input.DT.Fn); - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + List> list = GenerateFinalResult(2, datas, "反向有功总电能示值", input.AFN_FC.AFN, input.DT.Fn); + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -78,21 +80,30 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH } return values; } - public List> GenerateFinalResult(int index, List data, string filedDesc = "", int afn = 0, int fn = 0) + public List> GenerateFinalResult(int index, List data, string filedDesc = "", int afn = 0, int fn = 0) { - List> list = new List>(); + List> list = new List>(); for (int i = index; i < data.Count; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto(); - decimal value = 0; + AnalysisBaseDto meter = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCode = data[i].CheckErrorCode(); if (errorCode != null) + { + meter.ErrorCodeMsg = errorCode.Item2; meter.ValidData = false; + } else - decimal.TryParse(data[i], out value); - meter.DataValue = value; + { + if(decimal.TryParse(data[i], out decimal value)) + meter.DataValue = value; + } meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; - meter.TimeSpan = Convert.ToDateTime($"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"); + string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; + if(DateTime.TryParse(timeSpan, out DateTime readTime)) + meter.TimeSpan = readTime; meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs index 59096de..70db824 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs @@ -7,6 +7,7 @@ using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH { @@ -34,9 +35,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - - List> list = GenerateFinalResult(2, datas, "反向无功电能示值", dataType); - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + List> list = GenerateFinalResult(2, datas, "反向无功电能示值", dataType); + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -82,21 +82,33 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH } return values; } - public List> GenerateFinalResult(int index, List data, string dataType, string filedDesc = "") + public List> GenerateFinalResult(int index, List data, string dataType, string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); for (int i = index; i < data.Count; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto(); - decimal value = 0; + AnalysisBaseDto meter = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCode = data[i].CheckErrorCode(); if (errorCode != null) + { + meter.ErrorCodeMsg = errorCode.Item2; meter.ValidData = false; + } else - decimal.TryParse(data[i], out value); - meter.DataValue = value; + { + if(decimal.TryParse(data[i], out decimal value)) + meter.DataValue = value; + } + meter.DataType = $"{dataType}_{i - index}"; - meter.TimeSpan = Convert.ToDateTime($"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"); + string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; + if (DateTime.TryParse(timeSpan,out DateTime readingDate)) + { + meter.TimeSpan = readingDate; + } meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs index e0d143b..ecbaef0 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs @@ -35,8 +35,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - AnalysisBaseDto data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", dataType); - UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> + AnalysisBaseDto data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", dataType); + UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -96,19 +96,25 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH return values; } - public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc,string dataType) + public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc,string dataType) { - AnalysisBaseDto dto = new AnalysisBaseDto(); - - decimal value = 0; + AnalysisBaseDto dto = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCode = data[2].CheckErrorCode(); if (errorCode != null) + { + dto.ErrorCodeMsg = errorCode.Item2; dto.ValidData = false; + } else - decimal.TryParse(data[2], out value); - - dto.DataValue = value; - string timeSpan = $"{DateTime.Now.Year}-{data[3].Substring(0, 2)}-{data[3].Substring(2, 2)} {data[3].Substring(4, 2)}:{data[3].Substring(6, 2)}:00";//$"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)}"; + { + if(decimal.TryParse(data[2], out decimal value)) + dto.DataValue = value; + } + + string timeSpan = $"{DateTime.Now.Year}-{data[3].Substring(0, 2)}-{data[3].Substring(2, 2)} {data[3].Substring(4, 2)}:{data[3].Substring(6, 2)}:00"; if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { dto.TimeSpan = readingDate; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs index 53b0e23..671e625 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH List datas = await AnalysisDataUnit(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - AnalysisBaseDto data = GenerateFinalResult(datas, dataType,"上月（上一结算日）正向有功最大需量及发生时间"); + AnalysisBaseDto data = GenerateFinalResult(datas, dataType,"上月（上一结算日）正向有功最大需量及发生时间"); // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH data.DatabaseBusiID=ammeterInfo.DatabaseBusiID; data.DeviceAddress= ammeterInfo.AmmerterAddress; } - UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> + UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -63,7 +63,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH DensityUnit = DensityUnit.Second, TimeDensity = 0 }; - await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -110,10 +110,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH } return values; } - public AnalysisBaseDto GenerateFinalResult(List data,string dataType, string filedDesc = "") + public AnalysisBaseDto GenerateFinalResult(List data,string dataType, string filedDesc = "") { - AnalysisBaseDto dto = new AnalysisBaseDto(); - + AnalysisBaseDto dto = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCodeInfo = data[2].CheckErrorCode(); if (errorCodeInfo != null) { @@ -133,7 +135,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH else { string timeSpan = $"{DateTime.Now.Year}-{data[3].Substring(0, 2)}-{data[3].Substring(2, 2)} {data[3].Substring(4, 2)}:{data[3].Substring(6, 2)}:00"; - //TODO:时间标 if (!DateTime.TryParse(timeSpan, out DateTime dataTime)) dto.ValidData = false; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs index 5758459..e48cdc4 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs @@ -6,6 +6,7 @@ using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -34,8 +35,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH ArgumentNullException.ThrowIfNull(input.AFN_FC.AFN); ArgumentNullException.ThrowIfNull(input.DT.Fn); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - AnalysisBaseDto data = GenerateFinalResult(input.UnitData.HexMessageList, dataType); - UnitDataAnalysis> dto = new UnitDataAnalysis> + AnalysisBaseDto data = GenerateFinalResult(input.UnitData.HexMessageList, dataType); + UnitDataAnalysis> dto = new UnitDataAnalysis> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -58,10 +59,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH } return await Task.FromResult(false); } - public AnalysisBaseDto GenerateFinalResult(List hexMessageList,string dataType) + public AnalysisBaseDto GenerateFinalResult(List hexMessageList,string dataType) { - AnalysisBaseDto dto = new AnalysisBaseDto(); - decimal value = 0; + AnalysisBaseDto dto = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.WaterMeter + }; var arr = hexMessageList.GetRange(11, 4); var errorCodeInfo = arr.CheckErrorCode(); if (errorCodeInfo != null) @@ -70,9 +73,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH dto.ErrorCodeMsg = errorCodeInfo.Item2; } else - decimal.TryParse($"{arr[11]}{arr[12]}{arr[13]}.{arr[14]}", out value); - - dto.DataValue = value; + { + if (decimal.TryParse($"{arr[11]}{arr[12]}{arr[13]}.{arr[14]}", out decimal value)) + dto.DataValue = value; + } dto.DataType = dataType; dto.FiledDesc = "水示值"; dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs index a58c574..4c754e3 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs @@ -1,11 +1,14 @@ using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; +using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using Newtonsoft.Json.Linq; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -32,13 +35,15 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List remarks = new List() { "当前总有功功率", "当前A相有功功率", "当前B相有功功率", "当前C相有功功率", "当前总无功功率", "当前A相无功功率", "当前B相无功功率", "当前C相无功功率", "当前总功率因数", "当前A相功率因数", "当前B相功率因数", "当前C相功率因数", "当前A相电压", "当前B相电压", "当前C相电压", "当前A相电流", "当前C相电流", "当前 C相电流", "当前零序电流", "当前总视在功率", "当前A相视在功率", "当前B相视在功率", "当前C相视在功率" }; - List> list = new List>(); + List> list = new List>(); List data = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); for (int i = 1; i < data.Count; i++) { - AnalysisBaseDto dto = new AnalysisBaseDto(); - decimal value = 0; + AnalysisBaseDto dto = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCodeInfo = data[i].CheckErrorCode(); if (errorCodeInfo != null) { @@ -46,15 +51,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH dto.ErrorCodeMsg = errorCodeInfo.Item2; } else - decimal.TryParse(data[i], out value); - dto.DataValue = value; + { + if(decimal.TryParse(data[i], out decimal value)) + dto.DataValue = value; + } + dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i-1]}"; - dto.FiledName = DataType[i - 1]; + dto.FiledName = DataType[i - 1].GetDataFieldByGatherDataType() ?? string.Empty; dto.TimeSpan = Convert.ToDateTime($"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"); dto.FiledDesc = remarks[i - 1]; list.Add(dto); } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs index b639f0d..c54d058 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs @@ -1,11 +1,13 @@ using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; +using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -33,27 +35,30 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH List data = await AnalysisDataUnitAsync(input.UnitData?.HexMessageList!); List remarks = new List() { "Uab/Ua 相位角", "Ub 相位角", "Ucb/Uc 相位角", "Ia 相位角", "Ib 相位角", "Ic 相位角" }; - List> list = new List>(); + List> list = new List>(); for (int i = 0; i < data.Count; i++) { - AnalysisBaseDto dto = new AnalysisBaseDto(); - decimal value = 0; + AnalysisBaseDto dto = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCodeInfo = data[i].CheckErrorCode(); if (errorCodeInfo != null) { dto.ValidData = false; dto.ErrorCodeMsg = errorCodeInfo.Item2; - } + } else - decimal.TryParse(data[i], out value); - dto.DataValue = value; - + { + if(decimal.TryParse(data[i], out decimal value)) + dto.DataValue = value; + } dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i]}"; - dto.FiledName = DataType[i]; + dto.FiledName = DataType[i].GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledDesc= remarks[i]; list.Add(dto); } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs index 084338b..3df913f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向无功总电能量"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向无功总电能量"); if (data.Count > 0) { @@ -56,7 +56,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -71,7 +71,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs index 5457f1d..f4d4c0a 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向有功总电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向有功总电能示值"); if (data.Count > 0) { // 查询电表信息 @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs index 9a10a3d..4e02149 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向无功总电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向无功总电能示值"); if (data.Count > 0) { @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs index 790f871..94faa02 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能示值"); if (data.Count > 0) { @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs index c19133c..a76189a 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向无功总电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向无功总电能示值"); if (data.Count > 0) { @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs index 2b0b1e8..05fa701 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "功率因数"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "功率因数"); if (data.Count > 0) { @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs index 76cb330..ce50726 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相功率因数"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相功率因数"); if (data.Count > 0) { @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs index b774044..a07cce6 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相功率因数"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相功率因数"); if (data.Count > 0) { // 查询电表信息 @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs index 89b569b..520970c 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相功率因数"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相功率因数"); if (data.Count > 0) { @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs index 9502506..661dce8 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs @@ -8,6 +8,7 @@ using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -35,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = GenerateFinalResult(datas,3, dataType, "抄表日冻结电能表正向有功最大需量及发生时间"); + List> data = GenerateFinalResult(datas,3, dataType, "抄表日冻结电能表正向有功最大需量及发生时间"); if (data.Count > 0) { @@ -52,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -86,18 +87,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(12, 1);//费率数 M（1≤M≤12） values.Add(ratingCount.ToString()); int handlerNum = 13; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3 * (ratingCount + 1);//12 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1);//28 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 handlerNum += 3 * (ratingCount + 1);//48 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1); return values; } - private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) + private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) { List values = new List(); for (int i = 0; i < ratingCount + 1; i++) @@ -108,7 +109,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH values.Add(errorCode.Item1); else { - await _analysisStrategyContext.ExecuteAsync>(nameof(Appendix_A5), arr, (value) => + await _analysisStrategyContext.ExecuteAsync>(appendixName, arr, (value) => { values.Add(value.ToString()); }); @@ -117,19 +118,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH return values; } - public List> GenerateFinalResult(List data, int index, string dataType, string filedDesc = "") + public List> GenerateFinalResult(List data, int index, string dataType, string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); int fCount = Convert.ToInt32(data[2]) + 1; for (int i = 1; i <= 2; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto + AnalysisBaseDto meter = new AnalysisBaseDto { DeviceType = MeterTypeEnum.Ammeter }; int startIndex = i == 1 ? 3 : (3 + i * fCount); - decimal value = 0; var errorCode = data[startIndex].CheckErrorCode(); if (errorCode != null) { @@ -137,12 +137,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[startIndex], out value); - - meter.DataValue = value; + { + if(decimal.TryParse(data[startIndex], out decimal value)) + { + meter.DataValue = value; + } + } string timeSpan = $"{DateTime.Now.Year}-{data[startIndex + fCount].Substring(0, 2)}-{data[startIndex + fCount].Substring(2, 2)} {data[startIndex + fCount].Substring(4, 2)}:{data[startIndex + fCount].Substring(6, 2)}:00"; - DateTime readingDate = DateTime.Now; - if (DateTime.TryParse(timeSpan, out readingDate)) + if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs index 5348f46..cff5120 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "一象限无功电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "一象限无功电能示值"); if (data.Count > 0) { // 查询电表信息 @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs index aa7e1b3..28c8244 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs @@ -31,13 +31,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH try { ArgumentNullException.ThrowIfNull(input); + ArgumentNullException.ThrowIfNull(input.A.Code); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); - + List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "四象限无功电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "四象限无功电能示值"); if (data.Count > 0) { // 查询电表信息 @@ -53,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs index f253797..3fa0625 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "二象限无功电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "二象限无功电能示值"); if (data.Count > 0) { // 查询电表信息 @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs index abeaa33..9c7346b 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "三象限无功电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "三象限无功电能示值"); if (data.Count > 0) { @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs index c8c0709..b46161d 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType,timeSpan, "正向有功总电能示值").IsValidData(new List() { "0D_161", "0D_161_1", "0D_161_2", "0D_161_3", "0D_161_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType,timeSpan, "正向有功总电能示值").IsValidData(new List() { "0D_161", "0D_161_1", "0D_161_2", "0D_161_3", "0D_161_4" }); if (data.Count > 0) { @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs index 37586a4..c4d6ac4 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "正向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_162", "0D_162_1", "0D_162_2", "0D_162_3", "0D_162_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "正向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_162", "0D_162_1", "0D_162_2", "0D_162_3", "0D_162_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs index 2eca6e7..3fdee69 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "反向有功总电能示值").IsValidData(new List() { "0D_163", "0D_163_1", "0D_163_2", "0D_163_3", "0D_163_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "反向有功总电能示值").IsValidData(new List() { "0D_163", "0D_163_1", "0D_163_2", "0D_163_3", "0D_163_4" }); if (data.Count > 0) { @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs index 5f65463..6ecc824 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结反向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_164", "0D_164_1", "0D_164_2", "0D_164_3", "0D_164_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结反向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_164", "0D_164_1", "0D_164_2", "0D_164_3", "0D_164_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs index ba7ea40..f52b8d1 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结一象限无功电能示值").IsValidData(new List() { "0D_165", "0D_165_1", "0D_165_2", "0D_165_3", "0D_165_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结一象限无功电能示值").IsValidData(new List() { "0D_165", "0D_165_1", "0D_165_2", "0D_165_3", "0D_165_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs index a9e3dfe..12c012c 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结二象限无功电能示值").IsValidData(new List() { "0D_166", "0D_166_1", "0D_166_2", "0D_166_3", "0D_166_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结二象限无功电能示值").IsValidData(new List() { "0D_166", "0D_166_1", "0D_166_2", "0D_166_3", "0D_166_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs index b30f48c..2e76d9f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结三象限无功电能示值").IsValidData(new List() { "0D_167", "0D_167_1", "0D_167_2", "0D_167_3", "0D_167_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结三象限无功电能示值").IsValidData(new List() { "0D_167", "0D_167_1", "0D_167_2", "0D_167_3", "0D_167_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs index e6c2143..566b374 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结四象限无功电能示值").IsValidData(new List() { "0D_168", "0D_168_1", "0D_168_2", "0D_168_3", "0D_168_4" }); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "日冻结四象限无功电能示值").IsValidData(new List() { "0D_168", "0D_168_1", "0D_168_2", "0D_168_3", "0D_168_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs index a5aafb0..d685851 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs @@ -35,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结正向有功电能示值").IsValidData(new List() { "0D_177", "0D_177_1", "0D_177_2", "0D_177_3", "0D_177_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结正向有功电能示值").IsValidData(new List() { "0D_177", "0D_177_1", "0D_177_2", "0D_177_3", "0D_177_4" }); if (data.Count > 0) { // 查询电表信息 @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -66,7 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs index 33597da..20a9ccb 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结正向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_178", "0D_178_1", "0D_178_2", "0D_178_3", "0D_178_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结正向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_178", "0D_178_1", "0D_178_2", "0D_178_3", "0D_178_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs index e1cf7c9..10234b0 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "反向有功总电能示值").IsValidData(new List() { "0D_179", "0D_179_1", "0D_179_2", "0D_179_3", "0D_179_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "反向有功总电能示值").IsValidData(new List() { "0D_179", "0D_179_1", "0D_179_2", "0D_179_3", "0D_179_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs index 7c9dc8a..f896e59 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs @@ -35,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结反向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_180", "0D_180_1", "0D_180_2", "0D_180_3", "0D_180_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结反向无功（组合无功 1）电能示值").IsValidData(new List() { "0D_180", "0D_180_1", "0D_180_2", "0D_180_3", "0D_180_4" }); if (data.Count > 0) { // 查询电表信息 @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -66,7 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs index c799490..2e8ef47 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结一象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_181", "0D_181_1", "0D_181_2", "0D_181_3", "0D_181_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结一象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_181", "0D_181_1", "0D_181_2", "0D_181_3", "0D_181_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs index 7e1fd3f..f21f425 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结二象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_182", "0D_182_1", "0D_182_2", "0D_182_3", "0D_182_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结二象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_182", "0D_182_1", "0D_182_2", "0D_182_3", "0D_182_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs index 9f00652..81a8710 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs @@ -35,7 +35,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结三象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_183", "0D_183_1", "0D_183_2", "0D_183_3", "0D_183_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结三象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_183", "0D_183_1", "0D_183_2", "0D_183_3", "0D_183_4" }); if (data.Count > 0) { // 查询电表信息 @@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -66,7 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs index 732af70..e2f6747 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs @@ -36,7 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-01 00:00:00"; - List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结四象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_184", "0D_184_1", "0D_184_2", "0D_184_3", "0D_184_4" }); + List> data = datas.GenerateFinalResultTd_m(3, dataType, timeSpan, "月冻结四象限无功电能示值（总、费率 1～M）").IsValidData(new List() { "0D_184", "0D_184_1", "0D_184_2", "0D_184_3", "0D_184_4" }); if (data.Count > 0) { // 查询电表信息 @@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -67,7 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs index 4c5461d..40fc28c 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs @@ -37,7 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH string timeSpan = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "抄表日冻结正向有功最大需量及发生时间"); + List> data = datas.GenerateFinalResultTd_d(3, dataType, timeSpan, "抄表日冻结正向有功最大需量及发生时间"); if (data.Count > 0) { // 查询电表信息 @@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -87,13 +87,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(12, 1); values.Add(ratingCount.ToString()); int handlerNum = 13; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 return values; } - private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) + private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) { List values = new List(); for (int i = 0; i < ratingCount + 1; i++) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs index 2f5723b..2270784 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs @@ -34,10 +34,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); - - AnalysisBaseDto data = GenerateFinalResult(datas, "抄表日冻结正向无功最大需量及发生时间"); - data.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - + string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + AnalysisBaseDto data = GenerateFinalResult(datas, "抄表日冻结正向无功最大需量及发生时间", dataType); + // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -47,7 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; } - UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> + UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -62,7 +61,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -81,18 +80,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(12, 1); values.Add(ratingCount.ToString()); int handlerNum = 13; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3 * (ratingCount + 1);//12 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1);//28 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 handlerNum += 3 * (ratingCount + 1);//48 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1); return values; } - private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) + private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) { List values = new List(); for (int i = 0; i < ratingCount + 1; i++) @@ -112,15 +111,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH return values; } - public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc = "") + public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc,string dataType) { - List> list = new List>(); - AnalysisBaseDto meter = new AnalysisBaseDto + List> list = new List>(); + AnalysisBaseDto meter = new AnalysisBaseDto { DeviceType = MeterTypeEnum.Ammeter }; - - decimal value = 0; var errorCode = data[3].CheckErrorCode(); if (errorCode != null) { @@ -128,15 +125,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[3], out value); - meter.DataValue = value; - - string timeSpan = $"{DateTime.Now.Year}-{data[4].Substring(0, 2)}-{data[4].Substring(2, 2)} {data[4].Substring(4, 2)}:{data[4].Substring(6, 2)}:00";//$"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)}"; - DateTime readingDate = DateTime.Now; - if (DateTime.TryParse(timeSpan, out readingDate)) + { + if(decimal.TryParse(data[3], out decimal value)) + { + meter.DataValue = value; + } + } + string timeSpan = $"{DateTime.Now.Year}-{data[4].Substring(0, 2)}-{data[4].Substring(2, 2)} {data[4].Substring(4, 2)}:{data[4].Substring(6, 2)}:00"; + if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; } + meter.DataType = dataType; meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; return meter; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs index 9805b15..b7e920f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs @@ -35,9 +35,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); - - AnalysisBaseDto data = GenerateFinalResult(datas, "月冻结正向有功最大需量及发生时间"); - data.DataType= $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + + AnalysisBaseDto data = GenerateFinalResult(datas, "月冻结正向有功最大需量及发生时间", dataType); // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; } - UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> + UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -62,7 +62,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -83,13 +83,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(11, 1); values.Add(ratingCount.ToString()); int handlerNum = 12; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3), 3, nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3), 3, nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4), 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4), 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 return values; } - private async Task> GetDataAsync(List data, int len, string appendixName) + private async Task> GetDataAsync(List data, int len, string appendixName) { List values = new List(); var errorCode = data.CheckErrorCode(); @@ -104,14 +104,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH } return values; } - public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc = "") + public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc, string dataType) { - AnalysisBaseDto meter = new AnalysisBaseDto + AnalysisBaseDto meter = new AnalysisBaseDto { DeviceType = MeterTypeEnum.Ammeter, }; - - decimal value = 0; var errorCode = data[3].CheckErrorCode(); if (errorCode != null) { @@ -119,15 +117,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[3], out value); - meter.DataValue = value; - - string timeSpan = $"{data[0].Substring(0, 4)}-{data[4].Substring(0, 2)}-{data[4].Substring(2, 2)} {data[4].Substring(4, 2)}:{data[4].Substring(6, 2)}:00";//$"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)}"; - DateTime readingDate = DateTime.Now; - if (DateTime.TryParse(timeSpan, out readingDate)) + { + if(decimal.TryParse(data[3], out decimal value)) + { + meter.DataValue = value; + } + } + string timeSpan = $"{data[0].Substring(0, 4)}-{data[4].Substring(0, 2)}-{data[4].Substring(2, 2)} {data[4].Substring(4, 2)}:{data[4].Substring(6, 2)}:00"; + if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; } + meter.DataType = dataType; meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; return meter; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs index 229c4cd..ef5bc1f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs @@ -35,10 +35,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); + string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - AnalysisBaseDto data = GenerateFinalResult(datas, "月冻结反向有功最大需量及发生时间"); - data.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - // 查询电表信息 + AnalysisBaseDto data = GenerateFinalResult(datas, "月冻结反向有功最大需量及发生时间", dataType); + // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) { @@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; } - UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> + UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -62,7 +62,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Month, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -83,13 +83,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(11, 1); values.Add(ratingCount.ToString()); int handlerNum = 12; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3), 3,nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3), 3,nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4), 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4), 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 return values; } - private async Task> GetDataAsync(List data, int len, string appendixName) + private async Task> GetDataAsync(List data, int len, string appendixName) { List values = new List(); var errorCode = data.CheckErrorCode(); @@ -104,14 +104,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH } return values; } - public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc = "") + public AnalysisBaseDto GenerateFinalResult(List data, string filedDesc,string dataType) { - AnalysisBaseDto meter = new AnalysisBaseDto + AnalysisBaseDto meter = new AnalysisBaseDto { DeviceType = MeterTypeEnum.Ammeter }; - - decimal value = 0; var errorCode = data[3].CheckErrorCode(); if (errorCode != null) { @@ -119,15 +117,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[3], out value); - meter.DataValue = value; - - string timeSpan = $"{data[0].Substring(0, 4)}-{data[4].Substring(0, 2)}-{data[4].Substring(2, 2)} {data[4].Substring(4, 2)}:{data[4].Substring(6, 2)}:00";//$"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)}"; - DateTime readingDate = DateTime.Now; - if (DateTime.TryParse(timeSpan, out readingDate)) + { + if(decimal.TryParse(data[3], out decimal value)) + { + meter.DataValue = value; + } + } + string timeSpan = $"{data[0].Substring(0, 4)}-{data[4].Substring(0, 2)}-{data[4].Substring(2, 2)} {data[4].Substring(4, 2)}:{data[4].Substring(6, 2)}:00"; + if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; } + meter.DataType = dataType; meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; return meter; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs index 7fd8ea4..e8f200f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs @@ -10,6 +10,7 @@ using System.Data; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -37,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = GenerateFinalResult(datas, dataType, "月冻结电能表正向有功最大需量及发生时间"); + List> data = GenerateFinalResult(datas, dataType, "月冻结电能表正向有功最大需量及发生时间"); if (data.Count > 0) { // 查询电表信息 @@ -53,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -68,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -87,18 +88,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(11, 1); values.Add(ratingCount.ToString()); int handlerNum = 12; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3 * (ratingCount + 1); - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1); - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 handlerNum += 3 * (ratingCount + 1); - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1); return values; } - private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) + private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) { List values = new List(); for (int i = 0; i < ratingCount + 1; i++) @@ -118,16 +119,15 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH return values; } - public List> GenerateFinalResult(List data, string dataType,string filedDesc = "") + public List> GenerateFinalResult(List data, string dataType,string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); int fCount = Convert.ToInt32(data[2]) + 1; for (int i = 1; i <= 2; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto(); + AnalysisBaseDto meter = new AnalysisBaseDto(); meter.DeviceType= MeterTypeEnum.Ammeter; int startIndex = i == 1 ? 3 : (3 + i * fCount); - decimal value = 0; var errorCode = data[startIndex].CheckErrorCode(); if (errorCode != null) { @@ -135,17 +135,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[startIndex], out value); - meter.DataValue = value; - //2021 01 15 + { + if(decimal.TryParse(data[startIndex], out decimal value)) + { + meter.DataValue = value; + } + } string timeSpan = $"{DateTime.Now.Year}-{data[startIndex + fCount].Substring(0, 2)}-{data[startIndex + fCount].Substring(2, 2)} {data[startIndex + fCount].Substring(4, 2)}:{data[startIndex + fCount].Substring(6, 2)}:00"; - DateTime readingDate = DateTime.Now; - if (DateTime.TryParse(timeSpan, out readingDate)) + if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; } meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; - filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs index 9342427..5267153 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs @@ -41,7 +41,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH //冻结数据时标 var time = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; - List> data = GenerateFinalResult(datas,dataType, "日冻结正向有/无功最大需量及发生时间"); + List> data = GenerateFinalResult(datas,dataType, "日冻结正向有/无功最大需量及发生时间"); if (data.Count > 0) { // 查询电表信息 @@ -57,7 +57,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -72,7 +72,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -92,18 +92,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(12, 1);//费率数 M（1≤M≤12） values.Add(ratingCount.ToString()); int handlerNum = 13; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3 * (ratingCount + 1);//12 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1);//28 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 handlerNum += 3 * (ratingCount + 1);//48 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1); return values; } - private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) + private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) { List values = new List(); for (int i = 0; i < ratingCount + 1; i++) @@ -123,61 +123,52 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH return values; } - public List> GenerateFinalResult(List data,string dataType, string filedDesc = "") + public List> GenerateFinalResult(List data,string dataType, string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); int fCount = Convert.ToInt32(data[2]) + 1; for (int i = 1; i <= 2; i++) { - try + AnalysisBaseDto meter = new AnalysisBaseDto { - AnalysisBaseDto meter = new AnalysisBaseDto - { - DeviceType = MeterTypeEnum.Ammeter - }; - int startIndex = i == 1 ? 3 : (3 + i * fCount); + DeviceType = MeterTypeEnum.Ammeter + }; + int startIndex = i == 1 ? 3 : (3 + i * fCount); - var errorCode = data[startIndex].CheckErrorCode(); - if (errorCode != null) - meter.ValidData = false; - decimal.TryParse(data[startIndex], out decimal value);//decimal.TryParse(data[startIndex], out value); + var errorCode = data[startIndex].CheckErrorCode(); + if (errorCode != null) + meter.ValidData = false; + if(decimal.TryParse(data[startIndex], out decimal value)) meter.DataValue = value; - //TODO:日冻结类数据时标Td 20210824 - var dataTime = string.Empty; - errorCode = data[0].CheckErrorCode(); - if (data[0].Length == 8 && errorCode is null) - dataTime = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} 00:00:00"; - if (!DateTime.TryParse(dataTime, out DateTime readingDate)) - meter.ValidData = false; - meter.TimeSpan = readingDate;// - + //TODO:日冻结类数据时标Td + var dataTime = string.Empty; + errorCode = data[0].CheckErrorCode(); + if (data[0].Length == 8 && errorCode is null) + dataTime = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} 00:00:00"; + if (DateTime.TryParse(dataTime, out DateTime readingDate)) + meter.TimeSpan = readingDate; + else + meter.ValidData = false; //TODO:最大需量发生时间 - errorCode = data[startIndex + fCount].CheckErrorCode(); - if (errorCode != null && data[startIndex + fCount].Length != 8) + errorCode = data[startIndex + fCount].CheckErrorCode(); + if (errorCode != null && data[startIndex + fCount].Length != 8) + meter.ValidData = false; + else + { + string timeSpan = $"{data[0].Substring(0, 4)}-{data[startIndex + fCount].Substring(0, 2)}-{data[startIndex + fCount].Substring(2, 2)} {data[startIndex + fCount].Substring(4, 2)}:{data[startIndex + fCount].Substring(6, 2)}:00"; + if (!DateTime.TryParse(timeSpan, out DateTime tsField)) meter.ValidData = false; else - { - string timeSpan = $"{data[0].Substring(0, 4)}-{data[startIndex + fCount].Substring(0, 2)}-{data[startIndex + fCount].Substring(2, 2)} {data[startIndex + fCount].Substring(4, 2)}:{data[startIndex + fCount].Substring(6, 2)}:00"; - if (!DateTime.TryParse(timeSpan, out DateTime tsField)) - meter.ValidData = false; - else - meter.TimeSpan=tsField; - } - - meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; - filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); - meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; - list.Add(meter); - } - catch - { + meter.TimeSpan=tsField; } + meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; + filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); + meter.FiledDesc = filedDesc; + meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + list.Add(meter); + } - if (list.Count == 0) - throw new Exception("错误数据"); - return list; } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs index 8b7e7eb..1fb68ad 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs @@ -40,7 +40,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH //冻结数据时标 var time = $"{datas[0].Substring(0, 4)}-{datas[0].Substring(4, 2)}-{datas[0].Substring(6, 2)} 00:00:00"; - List> data = GenerateFinalResult(datas, dataType, "日冻结反向有/无功最大需量及发生时间"); + List> data = GenerateFinalResult(datas, dataType, "日冻结反向有/无功最大需量及发生时间"); if (data.Count > 0) { // 查询电表信息 @@ -56,7 +56,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -71,7 +71,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Day, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -91,18 +91,18 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH int ratingCount = hexMessageList.GetRatingCount(12, 1);//费率数 M（1≤M≤12） values.Add(ratingCount.ToString()); int handlerNum = 13; - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向有功总最大需量 handlerNum += 3 * (ratingCount + 1);//12 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向有功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1);//28 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 3 * (ratingCount + 1)), ratingCount, 3, nameof(Appendix_A23)));//正向无功总最大需量 handlerNum += 3 * (ratingCount + 1);//48 - values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 + values.AddRange(await GetDataAsync(hexMessageList.GetRange(handlerNum, 4 * (ratingCount + 1)), ratingCount, 4, nameof(Appendix_A17)));//正向无功总最大需量发生时间 handlerNum += 4 * (ratingCount + 1); return values; } - private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) + private async Task> GetDataAsync(List data, int ratingCount, int len, string appendixName) { List values = new List(); for (int i = 0; i < ratingCount + 1; i++) @@ -122,13 +122,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH return values; } - public List> GenerateFinalResult(List data,string dataType, string filedDesc = "") + public List> GenerateFinalResult(List data,string dataType, string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); int fCount = Convert.ToInt32(data[2]) + 1; for (int i = 1; i <= 2; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto + AnalysisBaseDto meter = new AnalysisBaseDto { DeviceType = MeterTypeEnum.Ammeter }; @@ -140,17 +140,17 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH meter.ValidData = false; meter.ErrorCodeMsg = errorCode.Item2; } - decimal.TryParse(data[startIndex], out decimal value);//decimal.TryParse(data[startIndex], out value); - meter.DataValue = value; - - //TODO:日冻结类数据时标Td 20210824 + if(decimal.TryParse(data[startIndex], out decimal value)) + meter.DataValue = value; + //TODO:日冻结类数据时标Td var dataTime = string.Empty; errorCode = data[0].CheckErrorCode(); if (data[0].Length == 8 && errorCode is null) dataTime = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} 00:00:00"; if (!DateTime.TryParse(dataTime, out DateTime readingDate)) meter.ValidData = false; - meter.TimeSpan = readingDate; + else + meter.TimeSpan = readingDate; //TODO:最大需量发生时间 errorCode = data[startIndex + fCount].CheckErrorCode(); @@ -169,7 +169,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); - } return list; } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs index 4f917de..acf04cd 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "有功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "有功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs index 1854237..ce5d692 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相有功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相有功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs index a35f66f..a5ea520 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相有功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相有功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs index 4c70465..648be75 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相有功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相有功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs index 4b85f94..3fd2907 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "无功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "无功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs index cc86276..2dad0e8 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相无功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相无功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs index 8aeaef4..de93427 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相无功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相无功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs index 3f1cdb7..3e24bb4 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相无功功率曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相无功功率曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs index 227418b..a89b0c7 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相电压曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相电压曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs index 428eeae..30f16b0 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相电压曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相电压曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs index 3a7f5c0..1b5e012 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs @@ -38,7 +38,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相电压曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相电压曲线"); if (data.Count > 0) { // 查询电表信息 @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -69,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs index 6c7f733..b3b41aa 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相电流曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "A相电流曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs index 5176d2f..f6282a5 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相电流曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "B相电流曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs index 60e0820..6d6025f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相电流曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "C相电流曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs index 391f375..d4174da 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "测量点零序电流曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "测量点零序电流曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs index e31ea6f..0e790dc 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向有功总电能量曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向有功总电能量曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs index 7e863aa..d772796 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向无功总电能量曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "正向无功总电能量曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs index b3763db..f22d2f1 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs @@ -39,7 +39,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH 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> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能量曲线"); + List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能量曲线"); if (data.Count > 0) { // 查询电表信息 @@ -55,7 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH }); } } - UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> + UnitDataAnalysis>> unitDataAnalysis = new UnitDataAnalysis>> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH DensityUnit = DensityUnit.Minute, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs index 3d17fd7..7fa1d92 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs @@ -18,6 +18,9 @@ using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H { + /// + /// 透抄 电网频率 + /// public class AFN16_F97_Analysis : IAnalysisStrategy { private readonly ILogger _logger; @@ -37,7 +40,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); - AnalysisBaseDto data = GenerateFinalResult(datas); + AnalysisBaseDto data = GenerateFinalResult(datas); // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -47,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; } - UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> + UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { Code = input.A.Code!, AFN = input.AFN_FC.AFN, @@ -62,7 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H DensityUnit = DensityUnit.Hour, ReceivedTime = input.ReceivedTime }; - await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); + await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); return await Task.FromResult(true); } @@ -73,10 +76,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H } } - private AnalysisBaseDto GenerateFinalResult(List data) + private AnalysisBaseDto GenerateFinalResult(List data) { - AnalysisBaseDto meter = new AnalysisBaseDto(); - decimal.TryParse(data[7], out decimal value); + AnalysisBaseDto meter = new AnalysisBaseDto(); + var errorCode = data[7].CheckErrorCode(); if (errorCode != null) { @@ -84,7 +87,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H meter.ErrorCodeMsg = errorCode.Item2; } else - meter.DataValue = value; + { + if(decimal.TryParse(data[7], out decimal value)) + meter.DataValue = value; + } + meter.DataType = "10_97"; meter.ValidData = data[2].Equals("91") || data[2].Equals("B1"); meter.FiledDesc = "电网频率";//"电网频率"; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs index 00c5c63..a9119d8 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs @@ -199,7 +199,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DeviceType = $"{item.DeviceType}.{IOTDBDataType.Data}", ProjectId = $"{item.ProjectId}", Timestamps = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeNanoseconds(), // TODO:这里暂时格式化15分钟数据，需要进行调整 - SingleMeasuring = new Tuple(item.FiledName ?? string.Empty, item.DataValue ?? default) + SingleMeasuring = new Tuple(item.FiledName ?? string.Empty, item.DataValue) }; _runtimeContext.UseTableSessionPool = true; // 使用表模型池 var taskSendInfo = await _dbProvider.QueryAsync(new IoTDBQueryOptions() { TableNameOrTreePath = DevicePathBuilder.GetTableName(), Conditions = conditions, PageIndex = 0, PageSize = 1 }); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs index caa6793..dcfd2f7 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs @@ -4,6 +4,7 @@ using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using NUglify.JavaScript.Syntax; using System.Text.RegularExpressions; +using YamlDotNet.Core.Tokens; namespace JiShe.CollectBus.Protocol.T37612012 { @@ -239,15 +240,15 @@ namespace JiShe.CollectBus.Protocol.T37612012 /// /// /// - public static List> GenerateFinalResultTd_c(this List data, int index,int density,string dataType, string filedDesc = "") + public static List> GenerateFinalResultTd_c(this List data, int index,int density,string dataType, string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); for (int i = index; i < data.Count; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto(); - meter.DeviceType= MeterTypeEnum.Ammeter; - - decimal value = 0; + AnalysisBaseDto meter = new AnalysisBaseDto + { + DeviceType = MeterTypeEnum.Ammeter + }; var errorCode = data[i].CheckErrorCode(); if (errorCode != null) { @@ -255,9 +256,13 @@ namespace JiShe.CollectBus.Protocol.T37612012 meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[i], out value); - meter.DataValue = value; - meter.DataType = dataType.ToUpper(); + { + if(decimal.TryParse(data[i], out decimal value)) + { + meter.DataValue = value; + } + } + meter.DataType = dataType; meter.FiledDesc = filedDesc; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; if (DateTime.TryParse(CalculateTimeSpan(i - 3, data[0], density), out DateTime readingDate)) @@ -276,14 +281,13 @@ namespace JiShe.CollectBus.Protocol.T37612012 /// /// /// - public static List> GenerateFinalResultTd_m(this List data, int index,string dataType,string timeSpan, string filedDesc = "") + public static List> GenerateFinalResultTd_m(this List data, int index,string dataType,string timeSpan, string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); for (int i = index; i < data.Count; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto(); + AnalysisBaseDto meter = new AnalysisBaseDto(); meter.DeviceType = MeterTypeEnum.Ammeter; - decimal value = 0; var errorCode = data[i].CheckErrorCode(); if (errorCode != null) { @@ -291,8 +295,12 @@ namespace JiShe.CollectBus.Protocol.T37612012 meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[i], out value); - meter.DataValue = value; + { + if(decimal.TryParse(data[i], out decimal value)) + { + meter.DataValue = value; + } + } if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; @@ -312,13 +320,13 @@ namespace JiShe.CollectBus.Protocol.T37612012 /// /// /// - public static List> GenerateFinalResultTd_d(this List data, int index,string dataType, string timeSpan, string filedDesc = "") + public static List> GenerateFinalResultTd_d(this List data, int index,string dataType, string timeSpan, string filedDesc = "") { - List> list = new List>(); + List> list = new List>(); int typeIndex = 0; for (int i = index; i < data.Count; i++) { - AnalysisBaseDto meter = new AnalysisBaseDto + AnalysisBaseDto meter = new AnalysisBaseDto { DeviceType = MeterTypeEnum.Ammeter }; @@ -330,8 +338,12 @@ namespace JiShe.CollectBus.Protocol.T37612012 meter.ErrorCodeMsg = errorCode.Item2; } else - decimal.TryParse(data[i], out value); - meter.DataValue = value; + { + if(decimal.TryParse(data[i], out value)) + { + meter.DataValue = value; + } + } if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; @@ -364,29 +376,33 @@ namespace JiShe.CollectBus.Protocol.T37612012 /// /// /// - public static List> IsValidData(this List> meterDatas, List mark) + public static List> IsValidData(this List> meterDatas, List mark) { bool isUpload = false; var jfpgSum = 0M; - var totalItem = meterDatas.Find(f => f.DataType.Equals(mark[0]));//meterDatas.Find(f => f.DataType.Equals(mark[0])); - for (int i = 1; i <= meterDatas.Count - 1; i++) + foreach (var item in meterDatas) { - var value = meterDatas[i];//meterDatas.Find(f => f.DataType.Equals(mark[i])); - if (value.ValidData) - jfpgSum += value.DataValue; + if (item.ValidData && item.DataValue.HasValue) + jfpgSum += item.DataValue.Value; + } + var totalItem = meterDatas.FirstOrDefault(f => f.DataType.Equals(mark[0]));//meterDatas.Find(f => f.DataType.Equals(mark[0])); + if (totalItem != null) + { + var floatingNum = (jfpgSum * 5 / 100);//上下浮动数据 + var minjfpgSum = jfpgSum - floatingNum;//100-(100*5/100); + var maxjfpgSum = jfpgSum + floatingNum; + if ((totalItem.DataValue <= maxjfpgSum || totalItem.DataValue >= minjfpgSum))//总值，在JFPG之和的浮动范围内 + isUpload = true; + else + isUpload = false; } - var floatingNum = (jfpgSum * 5 / 100);//上下浮动数据 - var minjfpgSum = jfpgSum - floatingNum;//100-(100*5/100); - var maxjfpgSum = jfpgSum + floatingNum; - if (totalItem.DataValue <= maxjfpgSum || totalItem.DataValue >= minjfpgSum)//总值，在JFPG之和的浮动范围内 - isUpload = true; - else - isUpload = false; if (!isUpload) + { meterDatas.ForEach(f => { f.ValidData = false; }); + } return meterDatas; } } diff --git a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs index 8d693e3..331fce6 100644 --- a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs +++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs @@ -71,10 +71,10 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto public class AnalysisBaseDto : AnalysisBaseDto { - /// - /// 抄读值 - /// - public T? DataValue { get; set; } + /// + /// 抄读值 + /// + public T? DataValue { get; set; } = default; } } diff --git a/shared/JiShe.CollectBus.Common/Extensions/StringExtensions.cs b/shared/JiShe.CollectBus.Common/Extensions/StringExtensions.cs index d2cea60..4b24683 100644 --- a/shared/JiShe.CollectBus.Common/Extensions/StringExtensions.cs +++ b/shared/JiShe.CollectBus.Common/Extensions/StringExtensions.cs @@ -1183,10 +1183,10 @@ namespace JiShe.CollectBus.Common.Extensions /// /// /// - public static string HexToDecStr(this int hexString) + public static string HexToDecStr(this int hexString,bool isUpper= true) { var decimalString = Convert.ToString(hexString, 16); - return decimalString; + return isUpper? decimalString.ToUpper(): decimalString; } /// diff --git a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml index 30e91e8..a58ded5 100644 --- a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml +++ b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml @@ -16,7 +16,6 @@ 后端服务 - From 75efbb3a36e9d686e12487eeb675eccdf65618a6 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 15:51:25 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=A6=E8=AE=A4=E5=B8=A7=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnalysisData/AFN_00H/AFN0_F2_Analysis.cs | 3 +++ .../AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs | 2 +- web/JiShe.CollectBus.Host/Pages/Monitor.cshtml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs index 5c2e890..27fd11f 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs @@ -37,6 +37,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H TimeDensity = -1 }; result?.Invoke(dto); +#if DEBUG + _logger.LogWarning($"全部否认:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString}"); +#endif return Task.FromResult(true); } catch (Exception ex) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs index d67d8d1..59ae0fc 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs @@ -99,7 +99,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH meter.DataValue = value; } meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; - string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00" + string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; if(DateTime.TryParse(timeSpan, out DateTime readingDate)) meter.TimeSpan = readingDate; meter.FiledDesc = filedDesc; diff --git a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml index a58ded5..30e91e8 100644 --- a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml +++ b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml @@ -16,6 +16,7 @@ 后端服务 + From 1a9d3924b0edd6db3e9566efe8ba203785868df2 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Thu, 8 May 2025 17:20:07 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=88=E7=AB=AF?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=97=B6=E9=92=9F=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs | 5 ++++- .../AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs | 2 +- .../Appendix/Appendix_A1.cs | 9 ++++++--- web/JiShe.CollectBus.Host/Pages/Monitor.cshtml | 1 - 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs index 2bc496f..5bac5c7 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs @@ -6,6 +6,8 @@ using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using static System.Runtime.InteropServices.JavaScript.JSType; +using System.Diagnostics.Metrics; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -71,7 +73,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { await _analysisStrategyContext.ExecuteAsync>(nameof(Appendix_A1), arr, (value) => { - dto.DataValue = value; + var data = (Tuple)value; + dto.DataValue = $"{data.Item1} {data.Item2}"; }); } dto.DataType = dataType; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs index c54d058..f4dd742 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs @@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH dto.DataValue = value; } dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i]}"; - dto.FiledName = DataType[i].GetDataFieldByGatherDataType() ?? string.Empty; + dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledDesc= remarks[i]; list.Add(dto); } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs index 05d45d9..eadc9a3 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs @@ -21,10 +21,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.Appendix var day = data[3]; string binString = data[4].HexTo4BinZero(); var months = (binString.Substring(3, 1).BinToDec() * 10) + Convert.ToInt32(binString.Substring(4, 4).BinToHex()); - var week = binString.Substring(0, 3).HexTo4BinZero(); + var week = binString.Substring(0, 3).BinToHex(); var year = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{data[5]}"; - string date= $"{year}-{months.ToString().PadLeft(2, '0')}-{day} {hours}:{minutes}:{seconds}_{week}"; - result?.Invoke(date); + string date= $"{year}-{months.ToString().PadLeft(2, '0')}-{day} {hours}:{minutes}:{seconds}"; + string[] weekdays = {"", "星期一", "星期二", "星期三","星期四", "星期五", "星期六", "星期日"}; + int.TryParse(week, out int weekday); + // Item1=日期，Item2=星期几 + result?.Invoke(Tuple.Create(date, weekdays[weekday])); return await Task.FromResult(true); } diff --git a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml index 30e91e8..a58ded5 100644 --- a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml +++ b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml @@ -16,7 +16,6 @@ 后端服务 -