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] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=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!;