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 8e52c90..b287391 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 @@ -1,4 +1,6 @@ using JiShe.CollectBus.Common.Enums; +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.Protocol.T37612012.AnalysisData.AFN_00H; @@ -9,6 +11,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using static FreeSql.Internal.GlobalFilter; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H { @@ -18,25 +22,42 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H public class AFN2_F1_Analysis : IAnalysisStrategy { private readonly ILogger _logger; - - public AFN2_F1_Analysis(ILogger logger) + private readonly DataStorage _dataStorage; + public AFN2_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 { ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.A.Code); - UnitDataAnalysis dto = new UnitDataAnalysis + var data = new AnalysisBaseDto() + { + FiledDesc = "登录", + FiledName = "Type", + DataValue = "Login" + }; + // 查询电表信息 + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); + if (ammeterInfo != null) + { + data.ProjectId = ammeterInfo.ProjectID; + data.DeviceId = ammeterInfo.FocusId; + data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; + data.MeterAddress = ammeterInfo.AmmerterAddress; + data.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 = $"登录帧", + Data = data, HexMessage = input.BaseHexMessage.HexMessageString, MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, @@ -44,13 +65,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H TimeDensity = -1 }; result?.Invoke(dto); - return Task.FromResult(true); + await _dataStorage.SaveStatusToIotDbAsync(dto); + return await Task.FromResult(true); } catch (Exception ex) { _logger.LogError(ex, $"02_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}"); } - return Task.FromResult(false); + return await Task.FromResult(false); } } 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 47917e3..5d940f6 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 @@ -1,4 +1,6 @@ using JiShe.CollectBus.Common.Enums; +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; @@ -17,25 +19,42 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H public class AFN2_F2_Analysis : IAnalysisStrategy { private readonly ILogger _logger; - - public AFN2_F2_Analysis(ILogger logger) + private readonly DataStorage _dataStorage; + public AFN2_F2_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 { ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.A.Code); - UnitDataAnalysis dto = new UnitDataAnalysis + var data = new AnalysisBaseDto() + { + FiledDesc = "退出登录", + FiledName = "Type", + DataValue = "LogOut" + }; + // 查询电表信息 + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); + if (ammeterInfo != null) + { + data.ProjectId = ammeterInfo.ProjectID; + data.DeviceId = ammeterInfo.FocusId; + data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; + data.MeterAddress = ammeterInfo.AmmerterAddress; + data.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 = $"退出登录帧", + Data = data, HexMessage = input.BaseHexMessage.HexMessageString, MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, @@ -43,13 +62,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H TimeDensity = -1 }; result?.Invoke(dto); - return Task.FromResult(true); + await _dataStorage.SaveStatusToIotDbAsync(dto); + return await Task.FromResult(true); } catch (Exception ex) { _logger.LogError(ex, $"02_2解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}"); } - return Task.FromResult(false); + return await Task.FromResult(false); } } } 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 669debc..f4342f8 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 @@ -1,4 +1,6 @@ using JiShe.CollectBus.Common.Enums; +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; @@ -17,25 +19,42 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H public class AFN2_F3_Analysis : IAnalysisStrategy { private readonly ILogger _logger; - - public AFN2_F3_Analysis(ILogger logger) + private readonly DataStorage _dataStorage; + public AFN2_F3_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 { ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.A.Code); - UnitDataAnalysis dto = new UnitDataAnalysis + var data = new AnalysisBaseDto() + { + FiledDesc = "心跳", + FiledName = "Type", + DataValue = "Heartbeat" + }; + // 查询电表信息 + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); + if (ammeterInfo != null) + { + data.ProjectId = ammeterInfo.ProjectID; + data.DeviceId = ammeterInfo.FocusId; + data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; + data.MeterAddress = ammeterInfo.AmmerterAddress; + data.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 = $"心跳帧", + Data = data, HexMessage = input.BaseHexMessage.HexMessageString, MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, @@ -43,13 +62,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H TimeDensity = -1 }; result?.Invoke(dto); - return Task.FromResult(true); + await _dataStorage.SaveStatusToIotDbAsync(dto); + return await Task.FromResult(true); } catch (Exception ex) { - _logger.LogError(ex, $"02_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}"); + _logger.LogError(ex, $"02_3解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}"); } - return Task.FromResult(false); + return await Task.FromResult(false); } } } 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 b1fe185..e0d143b 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 @@ -96,7 +96,7 @@ 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(); 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 1323501..c5afb48 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 @@ -40,11 +40,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH AnalysisBaseDto data = GenerateFinalResult(datas, dataType,"上月（上一结算日）正向有功最大需量及发生时间"); // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ProjectId = ammeterInfo.ProjectID; - data.MeterId = ammeterInfo.MeterId; + data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID=ammeterInfo.DatabaseBusiID; data.MeterAddress= ammeterInfo.AmmerterAddress; } @@ -122,7 +122,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH } decimal.TryParse(data[2], out decimal value); dto.DataValue = value; - dto.MeterType= MeterTypeEnum.Ammeter; + dto.DeviceType= MeterTypeEnum.Ammeter; //TODO:最大需量发生时间 errorCodeInfo = data[3].CheckErrorCode(); if (data[3].Length != 8 && errorCodeInfo != null) 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 15de899..65e3b28 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 6a90222..17750b8 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 a3d3273..12d0136 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 1cb2198..f72e60c 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 5aa49b1..a258b18 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 aaf1c6f..5caebd9 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 3a1f4e6..b138b3f 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 fab7e26..bcaf15c 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 737da7f..f8d185a 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 7f2c44d..48fb9ae 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = ammeterInfo.AmmerterAddress; }); @@ -125,7 +125,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { AnalysisBaseDto meter = new AnalysisBaseDto { - MeterType = MeterTypeEnum.Ammeter + DeviceType = MeterTypeEnum.Ammeter }; int startIndex = i == 1 ? 3 : (3 + i * fCount); 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 bccc6fc..b674500 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 e0bac0e..2d80010 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 94172d9..fd60c25 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 f27f4f9..797eaf9 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 0960575..0702077 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 e3fefa6..4aca266 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 bb96a32..b040842 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 587501c..a1b8084 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 31f6a9b..b4de0ab 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 8671be5..ce97c66 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 bdceb9f..a383cb5 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 aca4509..2ed4694 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 3646e73..4589d46 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 @@ -39,13 +39,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 5595113..793a2ec 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 4ab20af..326ce3e 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 07ff5f1..fd69e70 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 @@ -39,13 +39,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 9d203e1..01464e6 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 506d93a..d0e3e3e 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 32967d8..f1d8bda 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 @@ -39,13 +39,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 2827e43..fed55e1 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 @@ -40,13 +40,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 f67c2ec..f353949 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 7dd1ed1..e9e56e2 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 @@ -39,11 +39,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ProjectId = ammeterInfo.ProjectID; - data.MeterId = ammeterInfo.MeterId; + data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.MeterAddress = ammeterInfo.AmmerterAddress; } @@ -117,7 +117,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List> list = new List>(); AnalysisBaseDto meter = new AnalysisBaseDto { - MeterType = MeterTypeEnum.Ammeter + DeviceType = MeterTypeEnum.Ammeter }; decimal value = 0; 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 71319da..b0cdbf2 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 @@ -39,11 +39,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH AnalysisBaseDto data = GenerateFinalResult(datas, "月冻结正向有功最大需量及发生时间"); data.DataType= $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ProjectId = ammeterInfo.ProjectID; - data.MeterId = ammeterInfo.MeterId; + data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.MeterAddress = ammeterInfo.AmmerterAddress; } @@ -108,7 +108,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { AnalysisBaseDto meter = new AnalysisBaseDto { - MeterType = MeterTypeEnum.Ammeter, + DeviceType = MeterTypeEnum.Ammeter, }; decimal value = 0; 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 e1f411c..0bee263 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 @@ -39,11 +39,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH AnalysisBaseDto data = GenerateFinalResult(datas, "月冻结反向有功最大需量及发生时间"); data.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ProjectId = ammeterInfo.ProjectID; - data.MeterId = ammeterInfo.MeterId; + data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.MeterAddress = ammeterInfo.AmmerterAddress; } @@ -108,7 +108,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { AnalysisBaseDto meter = new AnalysisBaseDto { - MeterType = MeterTypeEnum.Ammeter + DeviceType = MeterTypeEnum.Ammeter }; decimal value = 0; 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 917e48a..818309f 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 @@ -41,13 +41,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = ammeterInfo.AmmerterAddress; }); @@ -125,7 +125,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH for (int i = 1; i <= 2; i++) { AnalysisBaseDto meter = new AnalysisBaseDto(); - meter.MeterType= MeterTypeEnum.Ammeter; + meter.DeviceType= MeterTypeEnum.Ammeter; int startIndex = i == 1 ? 3 : (3 + i * fCount); decimal value = 0; var errorCode = data[startIndex].CheckErrorCode(); 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 89725be..c461225 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 @@ -45,13 +45,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = ammeterInfo.AmmerterAddress; }); @@ -133,7 +133,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { AnalysisBaseDto meter = new AnalysisBaseDto { - MeterType = MeterTypeEnum.Ammeter + DeviceType = MeterTypeEnum.Ammeter }; int startIndex = i == 1 ? 3 : (3 + i * fCount); 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 d223574..84c3532 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 @@ -44,13 +44,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = ammeterInfo.AmmerterAddress; }); @@ -130,7 +130,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { AnalysisBaseDto meter = new AnalysisBaseDto { - MeterType = MeterTypeEnum.Ammeter + DeviceType = MeterTypeEnum.Ammeter }; int startIndex = i == 1 ? 3 : (3 + i * fCount); 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 6cd9d14..50b6cd4 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 7163c2d..4a5c8d7 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 22d2fe0..69b2fa1 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 4ca5880..976e500 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 f906285..19dbbc5 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 cd283c0..b09ea25 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 80218d9..73d4804 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 09b7b62..2e39463 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 e02b567..eabab57 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 be46484..a5be397 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 d9663d2..c0d7fa5 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 @@ -42,13 +42,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 6b2c52b..2e0fbdc 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 2c01dcb..10bddfa 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 2a2512c..4f722e8 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 89ab935..295e6fd 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 10f3001..e880d2a 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 eca29ae..1969c24 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = 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 4778175..e2a5922 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 @@ -43,13 +43,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH if (data.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ForEach(item => { item.ProjectId = ammeterInfo.ProjectID; - item.MeterId = ammeterInfo.MeterId; + item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.MeterAddress = ammeterInfo.AmmerterAddress; }); 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 2589603..4681548 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 @@ -39,11 +39,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); AnalysisBaseDto data = GenerateFinalResult(datas); // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.MeterType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) { data.ProjectId = ammeterInfo.ProjectID; - data.MeterId = ammeterInfo.MeterId; + data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.MeterAddress = ammeterInfo.AmmerterAddress; } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs index 00435e0..be655fc 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs @@ -18,6 +18,7 @@ using System.Diagnostics.Metrics; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using static FreeSql.Internal.GlobalFilter; +using static JiShe.CollectBus.Common.Consts.T37612012PacketItemCodeConst; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData { @@ -44,7 +45,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData public async Task GetMeterInfoAsync(string meterType,string timeDensity="15") { var redisCacheMeterInfoHashKeyTemp = $"{string.Format(RedisConst.CacheMeterInfoHashKey, _applicationOptions.SystemType, _applicationOptions.ServerTagName, meterType, timeDensity)}"; - return await Task.FromResult(new AmmeterInfo()); + // TODO：临时写死，等确认后如何取再调整 + return await Task.FromResult(new AmmeterInfo() { + ProjectID = 10000, + MeterId=11111, + FocusId=22222 + }); } /// @@ -86,8 +92,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData var meter = new TreeModelSingleMeasuringEntity() { SystemName = _applicationOptions.SystemType, - DeviceId = $"{data.MeterId}", - DeviceType = $"{data.MeterType}", + DeviceId = $"{data.DeviceId}", + DeviceType = $"{data.DeviceType.ToString()}.{IOTDBDataType.Data}", ProjectId = $"{data.ProjectId}", Timestamps = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeMilliseconds(), SingleMeasuring = new Tuple(data.FiledName ?? string.Empty, data.DataValue ?? default) @@ -111,8 +117,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData { SystemName = _applicationOptions.SystemType, ProjectId = $"{data.ProjectId}", - DeviceType = $"{data.MeterType}", - DeviceId = $"{data.MeterId}", + DeviceType = $"{data.DeviceType}", + DeviceId = $"{data.DeviceId}", Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(), DatabaseBusiID = data.DatabaseBusiID, PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), @@ -189,8 +195,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData var meter = new TreeModelSingleMeasuringEntity() { SystemName = _applicationOptions.SystemType, - DeviceId = $"{item.MeterId}", - DeviceType = $"{item.MeterType}", + DeviceId = $"{item.DeviceId}", + DeviceType = $"{item.DeviceType}.{IOTDBDataType.Data}", ProjectId = $"{item.ProjectId}", Timestamps = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeMilliseconds(), // TODO:这里暂时格式化15分钟数据，需要进行调整 SingleMeasuring = new Tuple(item.FiledName ?? string.Empty, item.DataValue ?? default) @@ -214,8 +220,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData { SystemName = _applicationOptions.SystemType, ProjectId = $"{item.ProjectId}", - DeviceType = $"{item.MeterType}", - DeviceId = $"{item.MeterId}", + DeviceType = $"{item.DeviceType}", + DeviceId = $"{item.DeviceId}", Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(), DatabaseBusiID = item.DatabaseBusiID, PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), @@ -254,7 +260,72 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData return await Task.FromResult(true); } - + /// + /// 保存状态到IotDb + /// + /// + /// + /// + public async Task SaveStatusToIotDbAsync(UnitDataAnalysis> analysisBaseDto) + { + ArgumentNullException.ThrowIfNull(nameof(analysisBaseDto.Data)); + ArgumentNullException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.FiledName)); + ArgumentNullException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.DataValue)); + var data = analysisBaseDto.Data!; + if (!data.TimeSpan.HasValue) + data.TimeSpan = analysisBaseDto.ReceivedTime; + // 类型(心跳，登录，上电，掉电) + long timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeMilliseconds(); + var treeData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{data.DeviceId}", + DeviceType = $"{data.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{data.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(data.FiledName!, data.DataValue!) + }; + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeData); + // 时间 + var treeRecordingTimeData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{data.DeviceId}", + DeviceType = $"{data.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{data.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.RecordingTime, data.TimeSpan!.Value.GetDateTimeOffset().ToUnixTimeNanoseconds()) + }; + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeRecordingTimeData); + // 备注 + var treeRemarkData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{data.DeviceId}", + DeviceType = $"{data.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{data.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.Remark, data.FiledDesc ?? string.Empty) + }; + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeRemarkData); + // 数据帧 + var treeFrameData = new TreeModelSingleMeasuringEntity() + { + SystemName = _applicationOptions.SystemType, + DeviceId = $"{data.DeviceId}", + DeviceType = $"{data.DeviceType}.{IOTDBDataType.Status}", + ProjectId = $"{data.ProjectId}", + Timestamps = timestamps, + SingleMeasuring = new Tuple(ConcentratorStatusFieldConst.FrameData, (analysisBaseDto.HexMessage ?? string.Empty).Replace(" ","") ) + }; + + _runtimeContext.UseTableSessionPool = false; // 使树模型池 + await _dbProvider.InsertAsync(treeFrameData); + return await Task.FromResult(true); + } } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs index 278fb08..f9f3801 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs @@ -245,7 +245,7 @@ namespace JiShe.CollectBus.Protocol.T37612012 for (int i = index; i < data.Count; i++) { AnalysisBaseDto meter = new AnalysisBaseDto(); - meter.MeterType= MeterTypeEnum.Ammeter; + meter.DeviceType= MeterTypeEnum.Ammeter; decimal value = 0; var errorCode = data[i].CheckErrorCode(); @@ -282,7 +282,7 @@ namespace JiShe.CollectBus.Protocol.T37612012 for (int i = index; i < data.Count; i++) { AnalysisBaseDto meter = new AnalysisBaseDto(); - meter.MeterType = MeterTypeEnum.Ammeter; + meter.DeviceType = MeterTypeEnum.Ammeter; decimal value = 0; var errorCode = data[i].CheckErrorCode(); if (errorCode != null) @@ -320,7 +320,7 @@ namespace JiShe.CollectBus.Protocol.T37612012 { AnalysisBaseDto meter = new AnalysisBaseDto { - MeterType = MeterTypeEnum.Ammeter + DeviceType = MeterTypeEnum.Ammeter }; decimal value = 0; var errorCode = data[i].CheckErrorCode(); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs index 247b03f..867971e 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs @@ -111,9 +111,6 @@ namespace JiShe.CollectBus.Protocol.T37612012 _logger.LogError("376.1协议解析AFN失败"); return; } - // 登录心跳已做了处理，故需要忽略登录和心跳帧 - //if (tB3761.DT.Fn == (int)FN.登录 || tB3761.DT.Fn == (int)FN.心跳) - // return; //TODO：根据AFN进行分流推送到kafka string topicName = string.Format(ProtocolConst.AFNTopicNameFormat, tB3761.AFN_FC.AFN.ToString().PadLeft(2, '0')); tB3761.MessageId = Guid.NewGuid().ToString(); @@ -154,24 +151,24 @@ namespace JiShe.CollectBus.Protocol.T37612012 { string oldClientId = $"{client.Id}"; await client.ResetIdAsync(code); - var deviceInfoList = await _deviceRepository.GetListAsync(a => a.Number == code); - if (deviceInfoList != null && deviceInfoList.Count > 1) - { - //todo 推送集中器编号重复预警 - _logger.LogError($"集中器编号：{code}，存在多个集中器，请检查集中器编号是否重复"); - return; - } + //var deviceInfoList = await _deviceRepository.GetListAsync(a => a.Number == code); + //if (deviceInfoList != null && deviceInfoList.Count > 1) + //{ + // //todo 推送集中器编号重复预警 + // _logger.LogError($"集中器编号：{code}，存在多个集中器，请检查集中器编号是否重复"); + // return; + //} - var entity = deviceInfoList?.FirstOrDefault(a => a.Number == code); - if (entity == null) - { - await _deviceRepository.InsertAsync(new Device(code, oldClientId, DateTime.Now, DateTime.Now, DeviceStatus.Online)); - } - else - { - entity.UpdateByLoginAndHeartbeat(oldClientId); - await _deviceRepository.UpdateAsync(entity); - } + //var entity = deviceInfoList?.FirstOrDefault(a => a.Number == code); + //if (entity == null) + //{ + // await _deviceRepository.InsertAsync(new Device(code, oldClientId, DateTime.Now, DateTime.Now, DeviceStatus.Online)); + //} + //else + //{ + // entity.UpdateByLoginAndHeartbeat(oldClientId); + // await _deviceRepository.UpdateAsync(entity); + //} var messageReceivedLoginEvent = new MessageReceivedLogin { @@ -230,34 +227,34 @@ namespace JiShe.CollectBus.Protocol.T37612012 { string clientId = code; - string oldClientId = $"{client.Id}"; - var deviceInfoList = await _deviceRepository.GetListAsync(a => a.Number == code); - if (deviceInfoList != null && deviceInfoList.Count > 1) - { - //todo 推送集中器编号重复预警 - _logger.LogError($"集中器编号：{code}，存在多个集中器，请检查集中器编号是否重复"); - return; - } + //string oldClientId = $"{client.Id}"; + //var deviceInfoList = await _deviceRepository.GetListAsync(a => a.Number == code); + //if (deviceInfoList != null && deviceInfoList.Count > 1) + //{ + // //todo 推送集中器编号重复预警 + // _logger.LogError($"集中器编号：{code}，存在多个集中器，请检查集中器编号是否重复"); + // return; + //} - var entity = deviceInfoList?.FirstOrDefault(a => a.Number == code); - if (entity == null) //没有登录帧的设备，只有心跳帧 - { + //var entity = deviceInfoList?.FirstOrDefault(a => a.Number == code); + //if (entity == null) //没有登录帧的设备，只有心跳帧 + //{ await client.ResetIdAsync(clientId); - await _deviceRepository.InsertAsync(new Device(code, oldClientId, DateTime.Now, DateTime.Now, DeviceStatus.Online)); - } - else - { - if (clientId != oldClientId) - { - entity.UpdateByLoginAndHeartbeat(oldClientId); - } - else - { - entity.UpdateByLoginAndHeartbeat(); - } + //await _deviceRepository.InsertAsync(new Device(code, oldClientId, DateTime.Now, DateTime.Now, DeviceStatus.Online)); + //} + //else + //{ + // if (clientId != oldClientId) + // { + // entity.UpdateByLoginAndHeartbeat(oldClientId); + // } + // else + // { + // entity.UpdateByLoginAndHeartbeat(); + // } - await _deviceRepository.UpdateAsync(entity); - } + // await _deviceRepository.UpdateAsync(entity); + //} var messageReceivedHeartbeatEvent = new MessageReceivedHeartbeat { @@ -610,7 +607,7 @@ namespace JiShe.CollectBus.Protocol.T37612012 { unitData = new UnitData { - HexMessageList = hexStringList. (14, hexStringList.Count - 14 - 2) //总数字节数-固定长度报文头-控制域C-地址域A-校验和CS-结束字符（16H） + HexMessageList = hexStringList.GetRange(14, hexStringList.Count - 14 - 2) //总数字节数-固定长度报文头-控制域C-地址域A-校验和CS-结束字符（16H） }; unitData.HexMessageString = string.Join(" ", unitData.HexMessageList); } diff --git a/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs index 54482b4..9d22468 100644 --- a/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs +++ b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs @@ -15,6 +15,7 @@ using System.Threading.Tasks; using JiShe.CollectBus.Protocol; using TouchSocket.Sockets; using JiShe.CollectBus.Protocol.Dto; +using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; namespace JiShe.CollectBus.Subscribers { @@ -146,7 +147,7 @@ namespace JiShe.CollectBus.Subscribers var executor = _serviceProvider.GetRequiredService(); await executor.ExecuteAsync(serverName, receivedMessage.Data, (result) => { - var ssss = (UnitDataAnalysis)result; + var ssss = (UnitDataAnalysis>)result; _logger.LogInformation($"解析AFN02H数据：{ssss.Serialize()}"); }); return SubscribeAck.Success(); diff --git a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs index 1553d9f..c6026d6 100644 --- a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs +++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs @@ -47,14 +47,14 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto public int ProjectId { get; set; } /// - /// 电表ID + /// 设备ID(电表ID,水表ID，气表ID，集中器ID等) /// - public int MeterId { get; set; } + public int DeviceId { get; set; } /// - /// 表类型 + /// 设备类型 /// - public MeterTypeEnum MeterType { get; set;} + public MeterTypeEnum DeviceType { get; set;} /// diff --git a/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs b/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs index e797e69..5123fab 100644 --- a/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs +++ b/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs @@ -88,7 +88,7 @@ namespace JiShe.CollectBus.Common.Consts public const string CDL = "CDL"; public const string LXDL = "LXDL"; - public const string PowerGridFrequency = "PowerGridFrequency"; + public const string DWPL = "DWPL"; public const string Ua = "Ua"; public const string Ub = "Ub"; @@ -141,7 +141,7 @@ namespace JiShe.CollectBus.Common.Consts public const string CDL = "0D_94"; //C相电流曲线 public const string LXDL = "0D_95"; // 零序电流 - public const string PowerGridFrequency = "10_97"; //电网频率 + public const string DWPL = "10_97"; //电网频率 public const string Ua = "0C_49_Uab_Ua"; // 当前电压、电流相位角 public const string Ub = "0C_49_Ub"; // 当前电压、电流相位角 @@ -152,6 +152,48 @@ namespace JiShe.CollectBus.Common.Consts } - #endregion + /// + /// IOTDB数据树类型 + /// + public class IOTDBDataType + { + /// + /// 数据 + /// + public const string Data = "Data"; + + /// + /// 事件 + /// + public const string Event = "Event"; + + /// + /// 状态 + /// + public const string Status = "Status"; + } + + /// + /// 集中器状态字段 + /// + public class ConcentratorStatusFieldConst + { + + /// + /// 记录时间 + /// + public const string RecordingTime = "RecordingTime"; + + /// + /// 帧数据 + /// + public const string FrameData = "FrameData"; + + /// + /// 备注 + /// + public const string Remark="Remark"; + } + #endregion } } diff --git a/shared/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs b/shared/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs index 43cfaae..dc78e45 100644 --- a/shared/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs +++ b/shared/JiShe.CollectBus.Common/Enums/MeterTypeEnum.cs @@ -49,5 +49,10 @@ namespace JiShe.CollectBus.Common.Enums /// 采集器 /// Collector = 9, + + /// + /// 集中器 + /// + Focus = 10, } } 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 @@ 后端服务 -