diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs index fdeb25f..c34358a 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs @@ -1,4 +1,7 @@ -using JiShe.CollectBus.Common.Enums; +using Apache.IoTDB; +using JiShe.CollectBus.Common.Consts; +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; @@ -31,7 +34,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H var data = new AnalysisBaseDto() { FiledDesc = "全部确认", - DataValue = true + DataValue = true, + ItemType= $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -42,6 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId= ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -54,7 +59,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType= IOTDBDataTypeConst.Log }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs index 09c65c2..f96e9dc 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs @@ -1,4 +1,6 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +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; @@ -29,7 +31,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H var data = new AnalysisBaseDto() { FiledDesc = "全部否认", - DataValue = false + DataValue = false, + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -40,6 +43,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -52,7 +56,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H MessageId = input.MessageId, ReceivedTime =input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Log }; result?.Invoke(dto); #if DEBUG 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 6a83dbc..c46f935 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.Common.Consts; +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; @@ -31,7 +33,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H { FiledDesc = "登录", FiledName = "Type", - DataValue = "Login" + DataValue = "Login", + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -42,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -54,7 +58,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Status }; result?.Invoke(dto); await _dataStorage.SaveStatusToIotDbAsync(dto); 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 8992d82..e9f6edd 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.Common.Consts; +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; @@ -31,7 +33,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H { FiledDesc = "退出登录", FiledName = "Type", - DataValue = "LogOut" + DataValue = "LogOut", + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -42,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -54,7 +58,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Status }; result?.Invoke(dto); await _dataStorage.SaveStatusToIotDbAsync(dto); 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 4015131..348fc6f 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.Common.Consts; +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; @@ -31,7 +33,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H { FiledDesc = "心跳", FiledName = "Type", - DataValue = "Heartbeat" + DataValue = "Heartbeat", + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -42,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -54,7 +58,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Status }; result?.Invoke(dto); await _dataStorage.SaveStatusToIotDbAsync(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs index 2580ec9..b990da1 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs @@ -1,4 +1,5 @@ using System.Text; +using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; @@ -38,7 +39,8 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H var data = new AnalysisBaseDto() { FiledDesc = "终端版本信息", - DataValue = version + DataValue = version, + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -49,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -61,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType=IOTDBDataTypeConst.Data }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs index 1df4a32..3a62e56 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs @@ -1,4 +1,5 @@ using System.Text; +using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; @@ -32,7 +33,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H var data = new AnalysisBaseDto() { FiledDesc = "远程通信模块版本信息", - DataValue = Encoding.ASCII.GetString(string.Join("", input.UnitData.HexMessageList.Skip(30).Take(20).ToList()).HexToByte()).Replace("\0", "") + DataValue = Encoding.ASCII.GetString(string.Join("", input.UnitData.HexMessageList.Skip(30).Take(20).ToList()).HexToByte()).Replace("\0", ""), + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -43,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -55,7 +58,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType= IOTDBDataTypeConst.Data }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs index 0e66af9..c90a0a2 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -37,7 +38,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH { AFN10F10Entitys = tuple.Item2, ConfigNum = tuple.Item1 - } + }, + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -48,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -60,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType=IOTDBDataTypeConst.Param }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs index 2a01edc..6f9562e 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -36,7 +37,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH var data = new AnalysisBaseDto() { FiledDesc = "终端电能表/交流采样装置配置参数", - DataValue = await GenerateFinalResult(input.UnitData.HexMessageList) + DataValue = await GenerateFinalResult(input.UnitData.HexMessageList), + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -47,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -59,7 +62,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Param }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs index e69f8e3..9636477 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs @@ -1,4 +1,6 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +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; @@ -30,7 +32,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH var data = new AnalysisBaseDto() { FiledDesc = "终端电能表/交流采样装置配置参数", - DataValue = input.UnitData.HexMessageList[4].Equals("55") + DataValue = input.UnitData.HexMessageList[4].Equals("55"), + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); @@ -41,6 +44,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.Address; data.DeviceType = MeterTypeEnum.Focus; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -53,7 +57,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Param }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs index f4e9fa6..127b177 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs @@ -1,4 +1,6 @@ -using JiShe.CollectBus.Common.Enums; +using Apache.IoTDB; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IoTDB.Interface; using JiShe.CollectBus.IotSystems.Ammeters; @@ -46,7 +48,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); List> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn); @@ -62,6 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -127,14 +131,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH if(decimal.TryParse(data[i], out decimal value)) meter.DataValue = value; } - meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; + meter.ItemType = i - index == 0 ? $"{afn.ToString().PadLeft(2, '0')}_{fn}": $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; if (DateTime.TryParse(timeSpan, out DateTime readingDate)) { meter.TimeSpan = readingDate; } meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } return list; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs index ed4e4d0..b0685b9 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -7,6 +8,7 @@ using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH { @@ -46,6 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -60,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); @@ -116,12 +120,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH if(decimal.TryParse(data[i], out decimal value)) meter.DataValue = value; } - meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; + meter.ItemType = i - index==0 ? $"{afn.ToString().PadLeft(2, '0')}_{fn}": $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; if(DateTime.TryParse(timeSpan, out DateTime readingDate)) meter.TimeSpan = readingDate; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } return list; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs index 2fc30e0..92e9b89 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -9,6 +10,7 @@ using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using YamlDotNet.Core.Tokens; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH { @@ -47,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -61,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); @@ -118,12 +122,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH if(decimal.TryParse(data[i], out decimal value)) meter.DataValue = value; } - meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; + meter.ItemType = i - index==0? $"{afn.ToString().PadLeft(2, '0')}_{fn}" : $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; if(DateTime.TryParse(timeSpan, out DateTime readTime)) meter.TimeSpan = readTime; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } return list; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs index 1b420f6..7fb4ec2 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -64,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); @@ -100,7 +103,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH } return values; } - public List> GenerateFinalResult(int index, List data, string dataType, string filedDesc = "") + public List> GenerateFinalResult(int index, List data, string itemType, string filedDesc = "") { List> list = new List>(); for (int i = index; i < data.Count; i++) @@ -121,14 +124,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH meter.DataValue = value; } - meter.DataType = $"{dataType}_{i - index}"; + meter.ItemType = i - index==0?itemType:$"{itemType}_{i - index}"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; if (DateTime.TryParse(timeSpan,out DateTime readingDate)) { meter.TimeSpan = readingDate; } meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } return list; 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 485e75e..cec80bc 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -10,6 +11,7 @@ using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; using System.Collections.Generic; using System.Diagnostics.Metrics; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH { @@ -36,9 +38,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); - string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - AnalysisBaseDto data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", dataType); + AnalysisBaseDto data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", itemType); // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -47,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; - + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> @@ -61,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); @@ -111,7 +114,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 itemType) { AnalysisBaseDto dto = new AnalysisBaseDto { @@ -134,9 +137,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH { dto.TimeSpan = readingDate; } - dto.DataType = dataType; + dto.ItemType = itemType; dto.FiledDesc = filedDesc; - dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; return dto; } 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 8464ba9..355dae5 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -9,6 +10,7 @@ using JiShe.CollectBus.Protocol.T37612012.AnalysisData; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -36,9 +38,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); List datas = await AnalysisDataUnit(input.UnitData.HexMessageList); - string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - AnalysisBaseDto data = GenerateFinalResult(datas, dataType,"上月（上一结算日）正向有功最大需量及发生时间"); + AnalysisBaseDto data = GenerateFinalResult(datas, itemType,"上月（上一结算日）正向有功最大需量及发生时间"); // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -47,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID=ammeterInfo.DatabaseBusiID; data.DeviceAddress= ammeterInfo.AmmerterAddress; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { @@ -61,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH MessageId=input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -110,7 +114,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH } return values; } - public AnalysisBaseDto GenerateFinalResult(List data,string dataType, string filedDesc = "") + public AnalysisBaseDto GenerateFinalResult(List data,string itemType, string filedDesc = "") { AnalysisBaseDto dto = new AnalysisBaseDto { @@ -144,9 +148,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { dto.TimeSpan= dto.TimeSpan.Value.AddYears(-1); } - dto.DataType = dataType; + dto.ItemType = itemType; dto.FiledDesc = "上月（上一结算日）正向有功最大需量及发生时间"; - dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; return dto; } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs index d4850d5..4c36960 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -9,6 +10,7 @@ using JiShe.CollectBus.Protocol.T37612012.AnalysisData; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; using YamlDotNet.Core.Tokens; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -37,8 +39,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); ArgumentNullException.ThrowIfNull(input.AFN_FC.AFN); ArgumentNullException.ThrowIfNull(input.DT.Fn); - string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - AnalysisBaseDto data = GenerateFinalResult(input.UnitData.HexMessageList, dataType); + string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + AnalysisBaseDto data = GenerateFinalResult(input.UnitData.HexMessageList, itemType); // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -47,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; - + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -60,7 +62,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); @@ -73,7 +76,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH } return await Task.FromResult(false); } - public AnalysisBaseDto GenerateFinalResult(List hexMessageList,string dataType) + public AnalysisBaseDto GenerateFinalResult(List hexMessageList,string itemType) { AnalysisBaseDto dto = new AnalysisBaseDto { @@ -91,9 +94,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH if (decimal.TryParse($"{arr[11]}{arr[12]}{arr[13]}.{arr[14]}", out decimal value)) dto.DataValue = value; } - dto.DataType = dataType; + dto.ItemType = itemType; dto.FiledDesc = "水示值"; - dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; return dto; } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs index 90f3c6f..af324f6 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -29,7 +30,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH _dataStorage = dataStorage; } - public List DataType { get; set; } = new List() { "YGGL", "YGGL_A", "YGGL_B", "YGGL_C", "WGGL", "WGGL_A", "WGGL_B", "WGGL_C", "GLYS", "GLYS_A", "GLYS_B", "GLYS_C", "DY_A", "DY_B", "DY_C", "DL_A", "DL_B", "DL_C", "LXDL", "SZGL", "SZGL_A", "SZGL_B", "SZGL_C" }; + public List ItemType { get; set; } = new List() { "YGGL", "AYGGL", "BYGGL", "CYGGL", "WGGL", "AWGGL", "BWGGL", "CWGGL", "GLYS", "AGLYS", "BGLYS", "CGLYS", "ADY", "BDY", "CDY", "ADL", "BDL", "CDL", "LXDL", "SZGL", "ASZGL", "BSZGL", "CSZGL" }; public async Task ExecuteAsync(TB3761 input, Action? result = null) { @@ -59,8 +60,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH dto.DataValue = value; } - dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i-1]}"; - dto.FiledName = DataType[i - 1].GetDataFieldByGatherDataType() ?? string.Empty; + dto.ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{ItemType[i-1]}"; + dto.FiledName = ItemType[i - 1].GetDataFieldByGatherDataType() ?? string.Empty; dto.TimeSpan = Convert.ToDateTime($"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"); dto.FiledDesc = remarks[i - 1]; list.Add(dto); @@ -68,7 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH if (list.Count > 0) { // 查询电表信息 - AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(list[0].DataType.ToString(), "15"); + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(list[0].ItemType.ToString(), "15"); if (ammeterInfo != null) { list.ForEach(item => @@ -77,6 +78,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -92,7 +94,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs index 45e2ba9..234a0fc 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs @@ -10,6 +10,8 @@ using static System.Runtime.InteropServices.JavaScript.JSType; using System.Diagnostics.Metrics; using JiShe.CollectBus.Protocol.T37612012.AnalysisData; using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Common.Consts; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -35,9 +37,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); - string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - var data = await GenerateFinalResultAsync(input.UnitData.HexMessageList, dataType); + var data = await GenerateFinalResultAsync(input.UnitData.HexMessageList, itemType); // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -46,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; - + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> dto = new UnitDataAnalysis> { @@ -59,7 +61,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Param, }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); @@ -73,7 +76,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH return await Task.FromResult(false); } - public async Task> GenerateFinalResultAsync(List hexMessageList,string dataType) + public async Task> GenerateFinalResultAsync(List hexMessageList,string itemType) { AnalysisBaseDto dto = new AnalysisBaseDto(); var arr = hexMessageList.GetRange(4, 6); @@ -91,7 +94,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH dto.DataValue = $"{data.Item1} {data.Item2}"; }); } - dto.DataType = dataType; + dto.ItemType = itemType; dto.FiledName = "TerminalTime"; dto.FiledDesc = "召读终端时间"; return await Task.FromResult(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs index e1d4341..d4ecf6c 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs @@ -1,4 +1,6 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +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; @@ -8,6 +10,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; using System; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { @@ -27,7 +30,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH _dataStorage = dataStorage; } - public async Task ExecuteAsync(TB3761 input, Action? result = null) { try @@ -41,7 +43,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH var data = new AnalysisBaseDto() { FiledDesc = "当前正向有/无功电能示值、一/四象限无功电能示值", - DataValue = await AnalysisDataUnit(input.UnitData.HexMessageList, rationgCount) + DataValue = await AnalysisDataUnit(input.UnitData.HexMessageList, rationgCount), + ItemType= $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; // 查询电表信息 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); @@ -51,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; - + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { @@ -64,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); @@ -137,7 +141,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH { ChildNodes model = new ChildNodes() { - Value = value //29,4 33,4 37,4 41,4 + Value = value }; children.Add(model); }); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs index 33a06b9..3945a8e 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -28,7 +29,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH _dataStorage = dataStorage; } - public List DataType { get; set; } = new List() { "Uab_Ua", "Ub", "Ucb_Uc", "Ia", "Ib", "Ic" }; + public List ItemType { get; set; } = new List() { "Uab_Ua", "Ub", "Ucb_Uc", "Ia", "Ib", "Ic" }; public async Task ExecuteAsync(TB3761 input, Action? result = null) { @@ -56,8 +57,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH if(decimal.TryParse(data[i], out decimal value)) dto.DataValue = value; } - dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i]}"; - dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + dto.ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{ItemType[i]}"; + dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledDesc= remarks[i]; list.Add(dto); } @@ -73,6 +74,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -87,7 +89,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.Second, - TimeDensity = 0 + TimeDensity = 0, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(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 4f66190..4dc5ff0 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -69,7 +71,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度,注意这里会兼容存储做判断 DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 db6b1ab..030fb1f 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -66,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度,注意这里会兼容存储做判断 DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 19af1d5..bfe05b2 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 @@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } 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 c9c85ca..4cdba9e 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -36,9 +37,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH List datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums))); - string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; + string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; - List> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能示值"); + List> data = datas.GenerateFinalResultTd_c(3, density, itemType, "反向有功总电能示值"); if (data.Count > 0) { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度,注意这里会兼容存储做判断 DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 ef8b3bd..7558385 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度,注意这里会兼容存储做判断 DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 cd0f340..b31dd10 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度,注意这里会兼容存储做判断 DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 1c7fbdd..7ae5776 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度,注意这里会兼容存储做判断 DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 fb4495e..1c400b5 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -66,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度,注意这里会兼容存储做判断 DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 f5b8d24..c3b0fd5 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 698a180..1bd0717 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -66,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -148,10 +151,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { meter.TimeSpan = readingDate; } - meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; + meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } 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 97c2f64..d21fc7a 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -66,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 0f7ca95..4e85957 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 c5306b2..8f0f934 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -66,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 a155216..66f4715 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 57a84f0..582c9a1 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -66,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 7ac836e..039c4cb 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 0dc4362..ad4d2aa 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -66,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 5e0c7a4..93f0a7c 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 315dc66..934e4fc 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 0b7d121..bded83e 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 2487d84..a969778 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 7b6dbab..2696dab 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 25063a3..027d64c 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -48,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -64,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 9b942a5..3ee3193 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 @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 e6ce2b7..e0e866e 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 @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 e4d0f3c..3cbec39 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -48,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -64,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 2c4c58d..c241e2c 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 @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 b124158..d5cab85 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 @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 6a6ce65..f320aa3 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -48,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -64,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 ed75e71..12e9e5f 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 @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -49,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -65,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 73068c7..1f406e1 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 @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -50,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -66,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 62f8d44..d11be74 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -8,6 +9,7 @@ using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol3761; using Microsoft.Extensions.Logging; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -45,6 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { @@ -59,7 +62,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -136,9 +140,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { meter.TimeSpan = readingDate; } - meter.DataType = dataType; + meter.ItemType = dataType; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; return meter; } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs index 77df07e..76a4e4d 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 @@ -9,6 +9,8 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -46,6 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { @@ -60,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -128,9 +132,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { meter.TimeSpan = readingDate; } - meter.DataType = dataType; + meter.ItemType = dataType; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; return meter; } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs index a688d57..0fc8ad0 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 @@ -9,6 +9,8 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; +using static FreeSql.Internal.GlobalFilter; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -46,6 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { @@ -60,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Month, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -128,9 +132,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { meter.TimeSpan = readingDate; } - meter.DataType = dataType; + meter.ItemType = dataType; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; return meter; } } diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs index 7984be2..4f0c5c3 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 @@ -11,6 +11,7 @@ using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; using YamlDotNet.Core.Tokens; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -146,10 +149,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { meter.TimeSpan = readingDate; } - meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; + meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } return list; 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 1329f0f..cb456cd 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 @@ -11,6 +11,7 @@ using JiShe.CollectBus.Common.Extensions; using Volo.Abp.Domain.Entities; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -54,6 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -70,7 +72,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -162,10 +165,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH else meter.TimeSpan=tsField; } - meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; + meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } 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 cc283f7..0fddd41 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 @@ -10,6 +10,7 @@ using JiShe.CollectBus.Common.Extensions; using AutoMapper.Internal.Mappers; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -53,6 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -69,7 +71,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Day, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); @@ -164,10 +167,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH else meter.TimeSpan = tsField; } - meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; + meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } return list; diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs index e6fd687..b8ffddd 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 ab2d42f..c5ee665 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 d31ae3e..853aeeb 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 2f350ca..2d0d100 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 c4e8a74..6c063cd 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 e93e737..af1a33e 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 6f618a9..82b3b97 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 071fb0b..598f9fd 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 e784710..89d5f71 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 4cd618d..7ab37b9 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 760e405..27cfbff 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 @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.IotSystems.Ammeters; @@ -51,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -67,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 a919b18..7013558 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 421f430..5a86c82 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 fada7f7..c73619f 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 9ae2af2..3633567 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 043dd67..1e04f6f 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 11a97be..c3fe639 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 ba3b9f5..ac93186 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 @@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Consts; namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH { @@ -52,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH item.DeviceId = ammeterInfo.MeterId; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.AmmerterAddress; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -68,7 +70,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH MessageId = input.MessageId, TimeDensity = density,//密度-间隔分钟数, DensityUnit = DensityUnit.Minute, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data, }; await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); result?.Invoke(unitDataAnalysis); 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 d44d45f..2c29612 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,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; @@ -55,6 +56,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DeviceAddress = ammeterInfo.Address; item.DeviceType = MeterTypeEnum.Focus; + item.FocusId = ammeterInfo.FocusId; }); } } @@ -69,7 +71,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Event, }; // meterData.DataType = "0E_1"; result?.Invoke(dto); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F101_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F101_Analysis.cs index 4d23dd0..27bee6b 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F101_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F101_Analysis.cs @@ -1,5 +1,7 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +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; @@ -32,8 +34,19 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H var data = new AnalysisBaseDto() { FiledDesc = "透读取SIM卡信息", - DataValue = AnalysisDataUnit(input.UnitData.HexMessageList) + DataValue = AnalysisDataUnit(input.UnitData.HexMessageList), + ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}" }; + // 查询电表信息 + AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); + if (ammeterInfo != null) + { + data.ProjectId = ammeterInfo.ProjectID; + data.DeviceId = ammeterInfo.MeterId; + data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; + data.DeviceAddress = ammeterInfo.AmmerterAddress; + data.FocusId = ammeterInfo.FocusId; + } UnitDataAnalysis> dto = new UnitDataAnalysis> { Code = input.A.Code!, @@ -45,7 +58,8 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Data, }; result?.Invoke(dto); await _dataStorage.SaveDataToIotDbAsync(dto); 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 6a15d69..0da9f88 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 @@ -1,4 +1,5 @@ using GatherService.WattMeter.AnalysisData.AFN_10H; +using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; @@ -41,6 +42,7 @@ 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.DeviceType.ToString(), "15"); if (ammeterInfo != null) @@ -49,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { @@ -63,7 +66,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H MessageId = input.MessageId, TimeDensity = 1,//密度-间隔, DensityUnit = DensityUnit.Hour, - ReceivedTime = input.ReceivedTime + ReceivedTime = input.ReceivedTime, + DataType = IOTDBDataTypeConst.Data + }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); @@ -93,10 +98,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H meter.DataValue = value; } - meter.DataType = "10_97"; + meter.ItemType = "10_97"; meter.ValidData = data[2].Equals("91") || data[2].Equals("B1"); meter.FiledDesc = "电网频率";//"电网频率"; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; return meter; } private async Task> AnalysisDataUnitAsync(List hexMessageList) diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F98_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F98_Analysis.cs index dec2a3b..e54cc09 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F98_Analysis.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F98_Analysis.cs @@ -1,4 +1,5 @@ -using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.Protocol; @@ -39,7 +40,8 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H var data = new AnalysisBaseDto() { FiledDesc = "跳合闸", - DataValue = (datas[2].Equals("9C") || datas[2].Equals("94")) ? true : false + DataValue = (datas[2].Equals("9C") || datas[2].Equals("94")) ? true : false, + ItemType= "10_98", }; // 查询电表信息 @@ -50,6 +52,7 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H data.DeviceId = ammeterInfo.MeterId; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DeviceAddress = ammeterInfo.AmmerterAddress; + data.FocusId = ammeterInfo.FocusId; } UnitDataAnalysis> unitDataAnalysis = new UnitDataAnalysis> { @@ -64,7 +67,8 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H MessageId = input.MessageId, ReceivedTime = input.ReceivedTime, DensityUnit = DensityUnit.None, - TimeDensity = -1 + TimeDensity = -1, + DataType = IOTDBDataTypeConst.Data }; result?.Invoke(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs index f7009bb..2183ca2 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 DeviceId = $"{data.DeviceId}", DeviceType = $"{data.DeviceType.ToString()}", ProjectId = $"{data.ProjectId}", - DataType = IOTDBDataTypeConst.Data, + DataType = analysisBaseDto.DataType, Timestamps = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeNanoseconds(), SingleMeasuring = (data.FiledName ?? string.Empty, data.DataValue ?? default) }; @@ -148,21 +148,24 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData ProjectId = $"{data.ProjectId}", DeviceType = $"{data.DeviceType}", DeviceId = $"{data.DeviceId}", + DataType = analysisBaseDto.DataType, + FocusId = data.FocusId, + FocusAddress = analysisBaseDto.Code, Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(), DatabaseBusiID = data.DatabaseBusiID, - PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), + PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), CreationTime = currentTime, - MeterAddress = data.DeviceAddress, + MeterAddress = analysisBaseDto.Code == data.DeviceAddress ? "" : data.DeviceAddress, // 判断是否能取到表地址 AFN = analysisBaseDto.AFN, Fn = analysisBaseDto.Fn, Seq = analysisBaseDto.PSEQ, MSA = analysisBaseDto.MSA, - ItemCode = data.DataType, + ItemCode = data.ItemType, TaskMark = taskMark, IsSend = false, ManualOrNot = false, Pn = analysisBaseDto.Pn, - ReceivedMessageId = analysisBaseDto.MessageId?? string.Empty, + ReceivedMessageId = analysisBaseDto.MessageId ?? string.Empty, ReceivedMessageHexString = analysisBaseDto.ReceivedHexMessage, IsReceived = true, ReceivedRemark = data.ErrorCodeMsg ?? string.Empty, @@ -170,7 +173,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData ReceivedTime = analysisBaseDto.ReceivedTime, }; } - + _runtimeContext.UseTableSessionPool = true; // 使树模型池 await _dbProvider.InsertAsync(taskData); //如果无字段名，则不保存数据 if (!string.IsNullOrWhiteSpace(data.FiledName)) @@ -229,7 +232,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DeviceId = $"{item.DeviceId}", DeviceType = $"{item.DeviceType}", ProjectId = $"{item.ProjectId}", - DataType = IOTDBDataTypeConst.Data, + DataType = analysisBaseDto.DataType, Timestamps = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeNanoseconds(), // TODO:这里暂时格式化15分钟数据，需要进行调整 SingleMeasuring =(item.FiledName ?? string.Empty, item.DataValue ?? default) }; @@ -253,17 +256,20 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData SystemName = _applicationOptions.SystemType, ProjectId = $"{item.ProjectId}", DeviceType = $"{item.DeviceType}", - DeviceId = $"{item.DeviceId}", + DeviceId = $"{item.DeviceId}", + DataType = IOTDBDataTypeConst.Log, // 匹配不到下发记录标记为LOG Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(), DatabaseBusiID = item.DatabaseBusiID, PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), CreationTime = currentTime, - MeterAddress = item.DeviceAddress, + FocusId = item.FocusId, + FocusAddress = analysisBaseDto.Code, + MeterAddress = analysisBaseDto.Code == item.DeviceAddress ? "" : item.DeviceAddress, // 判断是否能取到表地址 AFN = analysisBaseDto.AFN, Fn = analysisBaseDto.Fn, Seq = analysisBaseDto.PSEQ, MSA = analysisBaseDto.MSA, - ItemCode = item.DataType, + ItemCode = item.ItemType, TaskMark = taskMark, IsSend = false, ManualOrNot = false, @@ -318,7 +324,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DeviceId = $"{data.DeviceId}", DeviceType = $"{data.DeviceType}", ProjectId = $"{data.ProjectId}", - DataType = IOTDBDataTypeConst.Status, + DataType = analysisBaseDto.DataType, Timestamps = timestamps, SingleMeasuring = (data.FiledName!, data.DataValue!) }; @@ -331,7 +337,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DeviceId = $"{data.DeviceId}", DeviceType = $"{data.DeviceType}", ProjectId = $"{data.ProjectId}", - DataType = IOTDBDataTypeConst.Status, + DataType = analysisBaseDto.DataType, Timestamps = timestamps, SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty) }; @@ -340,15 +346,15 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData await _dbProvider.InsertAsync(treeFrameData); // 时间 - var treeRecordingTimeData = new TreeModelSingleMeasuringEntity() + var treeRecordingTimeData = new TreeModelSingleMeasuringEntity() { SystemName = _applicationOptions.SystemType, DeviceId = $"{data.DeviceId}", DeviceType = $"{data.DeviceType}", ProjectId = $"{data.ProjectId}", Timestamps = timestamps, - DataType = IOTDBDataTypeConst.Status, - SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, (data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds()) + DataType = analysisBaseDto.DataType, + SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now) }; _runtimeContext.UseTableSessionPool = false; // 使树模型池 await _dbProvider.InsertAsync(treeRecordingTimeData); @@ -362,16 +368,19 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData ProjectId = $"{data.ProjectId}", DeviceType = $"{data.DeviceType}", DeviceId = $"{data.DeviceId}", + DataType = analysisBaseDto.DataType, + FocusId = data.FocusId, + FocusAddress = analysisBaseDto.Code, Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(), DatabaseBusiID = data.DatabaseBusiID, PendingCopyReadTime = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), CreationTime = currentTime, - MeterAddress = data.DeviceAddress, + MeterAddress = analysisBaseDto.Code == data.DeviceAddress ? "" : data.DeviceAddress,// 判断是否能取到表地址 AFN = analysisBaseDto.AFN, Fn = analysisBaseDto.Fn, Seq = analysisBaseDto.PSEQ, MSA = analysisBaseDto.MSA, - ItemCode = data.DataType, + ItemCode = data.ItemType, TaskMark = taskMark, IsSend = false, ManualOrNot = false, @@ -416,7 +425,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData DeviceId = $"{item.DeviceId}", DeviceType = $"{item.DeviceType}", ProjectId = $"{item.ProjectId}", - DataType = IOTDBDataTypeConst.Status, + DataType = analysisBaseDto.DataType, Timestamps = timestamps, SingleMeasuring = (item.FiledName!, item.DataValue!) }; @@ -428,7 +437,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData SystemName = _applicationOptions.SystemType, DeviceType = $"{item.DeviceType}", ProjectId = $"{item.ProjectId}", - DataType = IOTDBDataTypeConst.Status, + DataType = analysisBaseDto.DataType, Timestamps = timestamps, SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty) }; @@ -437,14 +446,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData await _dbProvider.InsertAsync(treeFrameData); // 时间 - var treeRecordingTimeData = new TreeModelSingleMeasuringEntity() + var treeRecordingTimeData = new TreeModelSingleMeasuringEntity() { SystemName = _applicationOptions.SystemType, DeviceType = $"{item.DeviceType}", ProjectId = $"{item.ProjectId}", - DataType = IOTDBDataTypeConst.Status, + DataType = analysisBaseDto.DataType, Timestamps = timestamps, - SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, (item.TimeSpan.HasValue ? item.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds()) + SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, item.TimeSpan.HasValue ? item.TimeSpan.Value : DateTime.Now) }; _runtimeContext.UseTableSessionPool = false; // 使树模型池 await _dbProvider.InsertAsync(treeRecordingTimeData); @@ -458,16 +467,19 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData ProjectId = $"{item.ProjectId}", DeviceType = $"{item.DeviceType}", DeviceId = $"{item.DeviceId}", + DataType = analysisBaseDto.DataType, Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(), DatabaseBusiID = item.DatabaseBusiID, PendingCopyReadTime = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), CreationTime = currentTime, - MeterAddress = item.DeviceAddress, + FocusId = item.FocusId, + FocusAddress = analysisBaseDto.Code, + MeterAddress= analysisBaseDto.Code== item.DeviceAddress?"": item.DeviceAddress,// 判断是否能取到表地址 AFN = analysisBaseDto.AFN, Fn = analysisBaseDto.Fn, Seq = analysisBaseDto.PSEQ, MSA = analysisBaseDto.MSA, - ItemCode = item.DataType, + ItemCode = item.ItemType, TaskMark = taskMark, IsSend = false, ManualOrNot = false, diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs index dcfd2f7..7ac67a2 100644 --- a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs +++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs @@ -262,9 +262,9 @@ namespace JiShe.CollectBus.Protocol.T37612012 meter.DataValue = value; } } - meter.DataType = dataType; + meter.ItemType = dataType; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; if (DateTime.TryParse(CalculateTimeSpan(i - 3, data[0], density), out DateTime readingDate)) meter.TimeSpan = readingDate; list.Add(meter); @@ -305,9 +305,9 @@ namespace JiShe.CollectBus.Protocol.T37612012 { meter.TimeSpan = readingDate; } - meter.DataType = i - index == 0 ? dataType : $"{dataType}_{i - index}"; + meter.ItemType = i - index == 0 ? dataType : $"{dataType}_{i - index}"; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); } return list; @@ -348,9 +348,9 @@ namespace JiShe.CollectBus.Protocol.T37612012 { meter.TimeSpan = readingDate; } - meter.DataType = i - index == 0 ? dataType : $"{dataType}_{i - index}"; + meter.ItemType = i - index == 0 ? dataType : $"{dataType}_{i - index}"; meter.FiledDesc = filedDesc; - meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; + meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; list.Add(meter); typeIndex++; } @@ -385,7 +385,7 @@ namespace JiShe.CollectBus.Protocol.T37612012 if (item.ValidData && item.DataValue.HasValue) jfpgSum += item.DataValue.Value; } - var totalItem = meterDatas.FirstOrDefault(f => f.DataType.Equals(mark[0]));//meterDatas.Find(f => f.DataType.Equals(mark[0])); + var totalItem = meterDatas.FirstOrDefault(f => f.ItemType.Equals(mark[0]));//meterDatas.Find(f => f.DataType.Equals(mark[0])); if (totalItem != null) { var floatingNum = (jfpgSum * 5 / 100);//上下浮动数据 diff --git a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs index 331fce6..c02ee76 100644 --- a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs +++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs @@ -17,9 +17,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto public bool ValidData { get; set; } = true; /// - /// 数据类型 + /// 数据项类型 /// - public string DataType { get; set; } = null!; + public string ItemType { get; set; } = null!; /// /// 错误码信息 @@ -67,6 +67,10 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto /// public string DeviceAddress { get; set; } = null!; + /// + /// 集中器ID + /// + public int FocusId { get; set; } } public class AnalysisBaseDto : AnalysisBaseDto diff --git a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs index d338693..8572819 100644 --- a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs +++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs @@ -1,4 +1,5 @@ using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Extensions; using System; using System.Collections.Generic; @@ -60,6 +61,17 @@ namespace JiShe.CollectBus.Protocol.Dto /// 采集密度单位 /// public DensityUnit DensityUnit { get; set; }= DensityUnit.Minute; + + /// + /// 数据类型 + /// + public string DataType { get; set; }= null!; + + /// + /// 数据项编码 + /// + public string ItemCode => $"{AFN.HexToDecStr().PadLeft(2, '0')}_{Fn}"; + } public class UnitDataAnalysis: UnitDataAnalysis diff --git a/shared/JiShe.CollectBus.Common/Consts/IOTDBDataTypeConst.cs b/shared/JiShe.CollectBus.Common/Consts/IOTDBDataTypeConst.cs index 7c076c9..872c099 100644 --- a/shared/JiShe.CollectBus.Common/Consts/IOTDBDataTypeConst.cs +++ b/shared/JiShe.CollectBus.Common/Consts/IOTDBDataTypeConst.cs @@ -25,5 +25,15 @@ namespace JiShe.CollectBus.Common.Consts /// 状态 /// public const string Status = "Status"; + + /// + /// 日志 + /// + public const string Log = "Log"; + + /// + /// 参数 + /// + public const string Param= "Param"; } } diff --git a/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs b/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs index 35c457e..2f16084 100644 --- a/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs +++ b/shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs @@ -98,6 +98,10 @@ namespace JiShe.CollectBus.Common.Consts public const string Ib = "Ib"; public const string Ic = "Ic"; + public const string SZGL = "SZGL"; + public const string ASZGL = "ASZGL"; + public const string BSZGL = "BSZGL"; + public const string CSZGL = "CSZGL"; } public class ConstGatherDataType @@ -150,8 +154,14 @@ namespace JiShe.CollectBus.Common.Consts public const string Ib = "0C_49_Ib"; // 当前电压、电流相位角 public const string Ic = "0C_49_Ic"; // 当前电压、电流相位角 + + public const string SZGL = "0C_25_SZGL"; // 视在功率曲线 + public const string ASZGL = "0C_25_ASZGL"; // A相视在功率曲线 + public const string BSZGL = "0C_25_BSZGL"; // B相视在功率曲线 + public const string CSZGL = "0C_25_CSZGL"; // C相视在功率曲线 + } - + /// /// 集中器状态字段 diff --git a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml index 9c23d54..a58ded5 100644 --- a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml +++ b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml @@ -15,8 +15,7 @@ - 后端服务 - + 后端服务 diff --git a/web/JiShe.CollectBus.Host/appsettings.json b/web/JiShe.CollectBus.Host/appsettings.json index 89c0175..bc90b01 100644 --- a/web/JiShe.CollectBus.Host/appsettings.json +++ b/web/JiShe.CollectBus.Host/appsettings.json @@ -88,7 +88,7 @@ "ClusterList": [ "192.168.1.9:6667" ], "PoolSize": 32, "DataBaseName": "energy", - "OpenDebugMode": false, + "OpenDebugMode": true, "UseTableSessionPoolByDefault": false }, "Cassandra": {