admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: admin:5b4673adef9f8cd7a4f35b71c1f7f13c0247a0ce
Branches Tags
admin:master
admin:dev
admin:feature_定时抄读_23_CY
admin:zhy_feat_dev_v11
admin:feature_定时抄读_20_CY
admin:zhy_feat_cev_v8
admin:zhy_feat_cev_v7
admin:feature_定时抄读_19_CY
admin:zhy_feat_cev_v5
admin:feature_定时抄读_16_CY
admin:feature_定时抄读_14_CY
admin:feature_定时抄读_11_CY
admin:feature_定时抄读_10_CY
admin:zhy_feat_cev_v3
admin:log
admin:V1.2.0
admin:v1.0.0
..
compare: admin:fa84f42ca21574a512bb8f0a20503e26b8ebd9d3
Branches Tags
admin:dev
admin:feature_定时抄读_23_CY
admin:zhy_feat_dev_v11
admin:master
admin:feature_定时抄读_20_CY
admin:zhy_feat_cev_v8
admin:zhy_feat_cev_v7
admin:feature_定时抄读_19_CY
admin:zhy_feat_cev_v5
admin:feature_定时抄读_16_CY
admin:feature_定时抄读_14_CY
admin:feature_定时抄读_11_CY
admin:feature_定时抄读_10_CY
admin:zhy_feat_cev_v3
admin:log
admin:V1.2.0
admin:v1.0.0

No commits in common. "5b4673adef9f8cd7a4f35b71c1f7f13c0247a0ce" and "fa84f42ca21574a512bb8f0a20503e26b8ebd9d3" have entirely different histories.
5b4673adef ... fa84f42ca2

88 changed files with 238 additions and 561 deletions
Show Stats Expand all files Collapse all files

12
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs
View File

@ -1,7 +1,4 @@
using Apache.IoTDB; 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.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
@ -34,8 +31,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
var data = new AnalysisBaseDto<bool?>() var data = new AnalysisBaseDto<bool?>()
{ {
FiledDesc = "全部确认", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -46,7 +42,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId= ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>> UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
{ {
@ -59,8 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType= IOTDBDataTypeConst.Log
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync<bool?>(dto); await _dataStorage.SaveDataToIotDbAsync<bool?>(dto);

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
View File

@ -1,6 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
@ -31,8 +29,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
var data = new AnalysisBaseDto<bool?>() var data = new AnalysisBaseDto<bool?>()
{ {
FiledDesc = "全部否认", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -43,7 +40,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>> UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
{ {
@ -56,8 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime =input.ReceivedTime, ReceivedTime =input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Log
}; };
result?.Invoke(dto); result?.Invoke(dto);
#if DEBUG #if DEBUG

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs
View File

@ -1,6 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
@ -33,8 +31,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
{ {
FiledDesc = "登录", FiledDesc = "登录",
FiledName = "Type", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -45,7 +42,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>> UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
{ {
@ -58,8 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Status
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveStatusToIotDbAsync<string>(dto); await _dataStorage.SaveStatusToIotDbAsync<string>(dto);

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs
View File

@ -1,6 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
@ -33,8 +31,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
{ {
FiledDesc = "退出登录", FiledDesc = "退出登录",
FiledName = "Type", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -45,7 +42,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>> UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
{ {
@ -58,8 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Status
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveStatusToIotDbAsync<string>(dto); await _dataStorage.SaveStatusToIotDbAsync<string>(dto);

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs
View File

@ -1,6 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
@ -33,8 +31,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
{ {
FiledDesc = "心跳", FiledDesc = "心跳",
FiledName = "Type", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -45,7 +42,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>> UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
{ {
@ -58,8 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Status
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveStatusToIotDbAsync<string>(dto); await _dataStorage.SaveStatusToIotDbAsync<string>(dto);

8
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
View File

@ -1,5 +1,4 @@
using System.Text; using System.Text;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -39,8 +38,7 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
var data = new AnalysisBaseDto<AFN9_F1_AnalysisDto?>() var data = new AnalysisBaseDto<AFN9_F1_AnalysisDto?>()
{ {
FiledDesc = "终端版本信息", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -51,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<AFN9_F1_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN9_F1_AnalysisDto?>> UnitDataAnalysis<AnalysisBaseDto<AFN9_F1_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN9_F1_AnalysisDto?>>
{ {
@ -64,8 +61,7 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType=IOTDBDataTypeConst.Data
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync(dto); await _dataStorage.SaveDataToIotDbAsync(dto);

8
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
View File

@ -1,5 +1,4 @@
using System.Text; using System.Text;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -33,8 +32,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
var data = new AnalysisBaseDto<string?>() var data = new AnalysisBaseDto<string?>()
{ {
FiledDesc = "远程通信模块版本信息", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -45,7 +43,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<string?>> dto = new UnitDataAnalysis<AnalysisBaseDto<string?>> UnitDataAnalysis<AnalysisBaseDto<string?>> dto = new UnitDataAnalysis<AnalysisBaseDto<string?>>
{ {
@ -58,8 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType= IOTDBDataTypeConst.Data
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync(dto); await _dataStorage.SaveDataToIotDbAsync(dto);

10
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -38,8 +37,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
{ {
AFN10F10Entitys = tuple.Item2, AFN10F10Entitys = tuple.Item2,
ConfigNum = tuple.Item1 ConfigNum = tuple.Item1
}, }
ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"
}; };
// 查询电表信息 // 查询电表信息
AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -50,7 +48,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<AFN10_F10_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN10_F10_AnalysisDto?>> UnitDataAnalysis<AnalysisBaseDto<AFN10_F10_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN10_F10_AnalysisDto?>>
{ {
@ -63,8 +60,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType=IOTDBDataTypeConst.Param
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync<AFN10_F10_AnalysisDto?>(dto); await _dataStorage.SaveDataToIotDbAsync<AFN10_F10_AnalysisDto?>(dto);

10
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -37,8 +36,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
var data = new AnalysisBaseDto<AFN10_F66_AnalysisDto?>() var data = new AnalysisBaseDto<AFN10_F66_AnalysisDto?>()
{ {
FiledDesc = "终端电能表/交流采样装置配置参数", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -49,7 +47,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<AFN10_F66_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN10_F66_AnalysisDto?>> UnitDataAnalysis<AnalysisBaseDto<AFN10_F66_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN10_F66_AnalysisDto?>>
{ {
@ -62,8 +59,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Param
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync<AFN10_F66_AnalysisDto?>(dto); await _dataStorage.SaveDataToIotDbAsync<AFN10_F66_AnalysisDto?>(dto);

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
View File

@ -1,6 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
@ -32,8 +30,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
var data = new AnalysisBaseDto<bool?>() var data = new AnalysisBaseDto<bool?>()
{ {
FiledDesc = "终端电能表/交流采样装置配置参数", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(MeterTypeEnum.Focus.ToString(), "15");
@ -44,7 +41,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.Address; data.DeviceAddress = ammeterInfo.Address;
data.DeviceType = MeterTypeEnum.Focus; data.DeviceType = MeterTypeEnum.Focus;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>> UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
{ {
@ -57,8 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Param
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync<bool?>(dto); await _dataStorage.SaveDataToIotDbAsync<bool?>(dto);

12
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
View File

@ -1,6 +1,4 @@
using Apache.IoTDB; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IoTDB.Interface; using JiShe.CollectBus.IoTDB.Interface;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -48,8 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
List<AnalysisBaseDto<decimal?>> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn); List<AnalysisBaseDto<decimal?>> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn);
@ -65,7 +62,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -131,14 +127,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
if(decimal.TryParse(data[i], out decimal value)) if(decimal.TryParse(data[i], out decimal value))
meter.DataValue = value; meter.DataValue = value;
} }
meter.ItemType = i - index == 0 ? $"{afn.ToString().PadLeft(2, '0')}_{fn}": $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}";
string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00";
if (DateTime.TryParse(timeSpan, out DateTime readingDate)) if (DateTime.TryParse(timeSpan, out DateTime readingDate))
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }
return list; return list;

12
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -8,7 +7,6 @@ using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
@ -48,7 +46,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -63,8 +60,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis);
@ -120,12 +116,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
if(decimal.TryParse(data[i], out decimal value)) if(decimal.TryParse(data[i], out decimal value))
meter.DataValue = value; meter.DataValue = value;
} }
meter.ItemType = i - index==0 ? $"{afn.ToString().PadLeft(2, '0')}_{fn}": $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}";
string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00";
if(DateTime.TryParse(timeSpan, out DateTime readingDate)) if(DateTime.TryParse(timeSpan, out DateTime readingDate))
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }
return list; return list;

12
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -10,7 +9,6 @@ using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using YamlDotNet.Core.Tokens; using YamlDotNet.Core.Tokens;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
@ -49,7 +47,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -64,8 +61,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis);
@ -122,12 +118,12 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
if(decimal.TryParse(data[i], out decimal value)) if(decimal.TryParse(data[i], out decimal value))
meter.DataValue = value; meter.DataValue = value;
} }
meter.ItemType = i - index==0? $"{afn.ToString().PadLeft(2, '0')}_{fn}" : $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}"; meter.DataType = $"{afn.ToString().PadLeft(2, '0')}_{fn}_{i - index}";
string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00";
if(DateTime.TryParse(timeSpan, out DateTime readTime)) if(DateTime.TryParse(timeSpan, out DateTime readTime))
meter.TimeSpan = readTime; meter.TimeSpan = readTime;
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }
return list; return list;

13
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -66,8 +64,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis);
@ -103,7 +100,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
} }
return values; return values;
} }
public List<AnalysisBaseDto<decimal?>> GenerateFinalResult(int index, List<string> data, string itemType, string filedDesc = "") public List<AnalysisBaseDto<decimal?>> GenerateFinalResult(int index, List<string> data, string dataType, string filedDesc = "")
{ {
List<AnalysisBaseDto<decimal?>> list = new List<AnalysisBaseDto<decimal?>>(); List<AnalysisBaseDto<decimal?>> list = new List<AnalysisBaseDto<decimal?>>();
for (int i = index; i < data.Count; i++) for (int i = index; i < data.Count; i++)
@ -124,14 +121,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
meter.DataValue = value; meter.DataValue = value;
} }
meter.ItemType = i - index==0?itemType:$"{itemType}_{i - index}"; meter.DataType = $"{dataType}_{i - index}";
string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"; string timeSpan = $"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00";
if (DateTime.TryParse(timeSpan,out DateTime readingDate)) if (DateTime.TryParse(timeSpan,out DateTime readingDate))
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }
return list; return list;

19
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -11,7 +10,6 @@ using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.Metrics; using System.Diagnostics.Metrics;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
@ -38,9 +36,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input);
ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", itemType); AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", dataType);
// 查询电表信息 // 查询电表信息
AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
if (ammeterInfo != null) if (ammeterInfo != null)
@ -49,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>> UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
@ -63,8 +61,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis);
@ -114,7 +111,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
return values; return values;
} }
public AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> data, string filedDesc,string itemType) public AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> data, string filedDesc,string dataType)
{ {
AnalysisBaseDto<decimal?> dto = new AnalysisBaseDto<decimal?> AnalysisBaseDto<decimal?> dto = new AnalysisBaseDto<decimal?>
{ {
@ -137,9 +134,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
dto.TimeSpan = readingDate; dto.TimeSpan = readingDate;
} }
dto.ItemType = itemType; dto.DataType = dataType;
dto.FiledDesc = filedDesc; dto.FiledDesc = filedDesc;
dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
return dto; return dto;
} }

18
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -10,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.AnalysisData;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
{ {
@ -38,9 +36,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input);
ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
List<string> datas = await AnalysisDataUnit(input.UnitData.HexMessageList); List<string> datas = await AnalysisDataUnit(input.UnitData.HexMessageList);
string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas, itemType,"上月（上一结算日）正向有功最大需量及发生时间"); AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas, dataType,"上月（上一结算日）正向有功最大需量及发生时间");
// 查询电表信息 // 查询电表信息
AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
if (ammeterInfo != null) if (ammeterInfo != null)
@ -49,7 +47,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID=ammeterInfo.DatabaseBusiID; data.DatabaseBusiID=ammeterInfo.DatabaseBusiID;
data.DeviceAddress= ammeterInfo.AmmerterAddress; data.DeviceAddress= ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>> UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
{ {
@ -64,8 +61,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
MessageId=input.MessageId, MessageId=input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -114,7 +110,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
} }
return values; return values;
} }
public AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> data,string itemType, string filedDesc = "") public AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> data,string dataType, string filedDesc = "")
{ {
AnalysisBaseDto<decimal?> dto = new AnalysisBaseDto<decimal?> AnalysisBaseDto<decimal?> dto = new AnalysisBaseDto<decimal?>
{ {
@ -148,9 +144,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
{ {
dto.TimeSpan= dto.TimeSpan.Value.AddYears(-1); dto.TimeSpan= dto.TimeSpan.Value.AddYears(-1);
} }
dto.ItemType = itemType; dto.DataType = dataType;
dto.FiledDesc = "上月（上一结算日）正向有功最大需量及发生时间"; dto.FiledDesc = "上月（上一结算日）正向有功最大需量及发生时间";
dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
return dto; return dto;
} }

19
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -10,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.AnalysisData;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using YamlDotNet.Core.Tokens; using YamlDotNet.Core.Tokens;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
{ {
@ -39,8 +37,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
ArgumentNullException.ThrowIfNull(input.AFN_FC.AFN); ArgumentNullException.ThrowIfNull(input.AFN_FC.AFN);
ArgumentNullException.ThrowIfNull(input.DT.Fn); ArgumentNullException.ThrowIfNull(input.DT.Fn);
string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
AnalysisBaseDto<decimal?> data = GenerateFinalResult(input.UnitData.HexMessageList, itemType); AnalysisBaseDto<decimal?> data = GenerateFinalResult(input.UnitData.HexMessageList, dataType);
// 查询电表信息 // 查询电表信息
AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
if (ammeterInfo != null) if (ammeterInfo != null)
@ -49,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<decimal?>> dto = new UnitDataAnalysis<AnalysisBaseDto<decimal?>> UnitDataAnalysis<AnalysisBaseDto<decimal?>> dto = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
{ {
@ -62,8 +60,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync(dto); await _dataStorage.SaveDataToIotDbAsync(dto);
@ -76,7 +73,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
} }
return await Task.FromResult(false); return await Task.FromResult(false);
} }
public AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> hexMessageList,string itemType) public AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> hexMessageList,string dataType)
{ {
AnalysisBaseDto<decimal?> dto = new AnalysisBaseDto<decimal?> AnalysisBaseDto<decimal?> dto = new AnalysisBaseDto<decimal?>
{ {
@ -94,9 +91,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
if (decimal.TryParse($"{arr[11]}{arr[12]}{arr[13]}.{arr[14]}", out decimal value)) if (decimal.TryParse($"{arr[11]}{arr[12]}{arr[13]}.{arr[14]}", out decimal value))
dto.DataValue = value; dto.DataValue = value;
} }
dto.ItemType = itemType; dto.DataType = dataType;
dto.FiledDesc = "水示值"; dto.FiledDesc = "水示值";
dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
return dto; return dto;
} }

15
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -30,7 +29,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
_dataStorage = dataStorage; _dataStorage = dataStorage;
} }
public List<string> ItemType { get; set; } = new List<string>() { "YGGL", "AYGGL", "BYGGL", "CYGGL", "WGGL", "AWGGL", "BWGGL", "CWGGL", "GLYS", "AGLYS", "BGLYS", "CGLYS", "ADY", "BDY", "CDY", "ADL", "BDL", "CDL", "LXDL", "SZGL", "ASZGL", "BSZGL", "CSZGL" }; public List<string> DataType { get; set; } = new List<string>() { "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 async Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null) public async Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
{ {
@ -60,8 +59,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
dto.DataValue = value; dto.DataValue = value;
} }
dto.ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{ItemType[i-1]}"; dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i-1]}";
dto.FiledName = ItemType[i - 1].GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledName = DataType[i - 1].GetDataFieldByGatherDataType() ?? string.Empty;
dto.TimeSpan = Convert.ToDateTime($"{data[0].Substring(0, 4)}-{data[0].Substring(4, 2)}-{data[0].Substring(6, 2)} {data[0].Substring(8, 2)}:{data[0].Substring(10, 2)}:00"); dto.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]; dto.FiledDesc = remarks[i - 1];
list.Add(dto); list.Add(dto);
@ -69,7 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
if (list.Count > 0) if (list.Count > 0)
{ {
// 查询电表信息 // 查询电表信息
AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(list[0].ItemType.ToString(), "15"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(list[0].DataType.ToString(), "15");
if (ammeterInfo != null) if (ammeterInfo != null)
{ {
list.ForEach(item => list.ForEach(item =>
@ -78,7 +77,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -94,8 +92,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis);

15
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
View File

@ -10,8 +10,6 @@ using static System.Runtime.InteropServices.JavaScript.JSType;
using System.Diagnostics.Metrics; using System.Diagnostics.Metrics;
using JiShe.CollectBus.Protocol.T37612012.AnalysisData; using JiShe.CollectBus.Protocol.T37612012.AnalysisData;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Consts;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
{ {
@ -37,9 +35,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
{ {
ArgumentNullException.ThrowIfNull(input); ArgumentNullException.ThrowIfNull(input);
ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList); ArgumentNullException.ThrowIfNull(input.UnitData?.HexMessageList);
string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
var data = await GenerateFinalResultAsync(input.UnitData.HexMessageList, itemType); var data = await GenerateFinalResultAsync(input.UnitData.HexMessageList, dataType);
// 查询电表信息 // 查询电表信息
AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
if (ammeterInfo != null) if (ammeterInfo != null)
@ -48,7 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>> UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
{ {
@ -61,8 +59,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Param,
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync(dto); await _dataStorage.SaveDataToIotDbAsync(dto);
@ -76,7 +73,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
return await Task.FromResult(false); return await Task.FromResult(false);
} }
public async Task<AnalysisBaseDto<string>> GenerateFinalResultAsync(List<string> hexMessageList,string itemType) public async Task<AnalysisBaseDto<string>> GenerateFinalResultAsync(List<string> hexMessageList,string dataType)
{ {
AnalysisBaseDto<string> dto = new AnalysisBaseDto<string>(); AnalysisBaseDto<string> dto = new AnalysisBaseDto<string>();
var arr = hexMessageList.GetRange(4, 6); var arr = hexMessageList.GetRange(4, 6);
@ -94,7 +91,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
dto.DataValue = $"{data.Item1} {data.Item2}"; dto.DataValue = $"{data.Item1} {data.Item2}";
}); });
} }
dto.ItemType = itemType; dto.DataType = dataType;
dto.FiledName = "TerminalTime"; dto.FiledName = "TerminalTime";
dto.FiledDesc = "召读终端时间"; dto.FiledDesc = "召读终端时间";
return await Task.FromResult(dto); return await Task.FromResult(dto);

16
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
View File

@ -1,6 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
@ -10,7 +8,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
{ {
@ -30,6 +27,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
_dataStorage = dataStorage; _dataStorage = dataStorage;
} }
public async Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null) public async Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
{ {
try try
@ -43,8 +41,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
var data = new AnalysisBaseDto<AFN12_F33_AnalysisDto?>() var data = new AnalysisBaseDto<AFN12_F33_AnalysisDto?>()
{ {
FiledDesc = "当前正向有/无功电能示值、一/四象限无功电能示值", 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"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
@ -54,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<AFN12_F33_AnalysisDto?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<AFN12_F33_AnalysisDto?>> UnitDataAnalysis<AnalysisBaseDto<AFN12_F33_AnalysisDto?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<AFN12_F33_AnalysisDto?>>
{ {
@ -67,8 +64,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis);
@ -141,7 +137,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
{ {
ChildNodes model = new ChildNodes() ChildNodes model = new ChildNodes()
{ {
Value = value Value = value //29,4 33,4 37,4 41,4
}; };
children.Add(model); children.Add(model);
}); });

13
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -29,7 +28,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
_dataStorage = dataStorage; _dataStorage = dataStorage;
} }
public List<string> ItemType { get; set; } = new List<string>() { "Uab_Ua", "Ub", "Ucb_Uc", "Ia", "Ib", "Ic" }; public List<string> DataType { get; set; } = new List<string>() { "Uab_Ua", "Ub", "Ucb_Uc", "Ia", "Ib", "Ic" };
public async Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null) public async Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
{ {
@ -57,8 +56,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
if(decimal.TryParse(data[i], out decimal value)) if(decimal.TryParse(data[i], out decimal value))
dto.DataValue = value; dto.DataValue = value;
} }
dto.ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{ItemType[i]}"; dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i]}";
dto.FiledName = dto.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
dto.FiledDesc= remarks[i]; dto.FiledDesc= remarks[i];
list.Add(dto); list.Add(dto);
} }
@ -74,7 +73,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -89,8 +87,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.Second, DensityUnit = DensityUnit.Second,
TimeDensity = 0, TimeDensity = 0
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -71,8 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度,注意这里会兼容存储做判断 TimeDensity = density,//密度,注意这里会兼容存储做判断
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -68,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度,注意这里会兼容存储做判断 TimeDensity = density,//密度,注意这里会兼容存储做判断
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

1
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs
View File

@ -52,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -37,9 +36,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums))); int density = Convert.ToInt32(Convert.ToInt32(datas[1]).GetEnumDescription(typeof(DensityEnums)));
string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"; string dataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
List<AnalysisBaseDto<decimal?>> data = datas.GenerateFinalResultTd_c(3, density, itemType, "反向有功总电能示值"); List<AnalysisBaseDto<decimal?>> data = datas.GenerateFinalResultTd_c(3, density, dataType, "反向有功总电能示值");
if (data.Count > 0) if (data.Count > 0)
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度,注意这里会兼容存储做判断 TimeDensity = density,//密度,注意这里会兼容存储做判断
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度,注意这里会兼容存储做判断 TimeDensity = density,//密度,注意这里会兼容存储做判断
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度,注意这里会兼容存储做判断 TimeDensity = density,//密度,注意这里会兼容存储做判断
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度,注意这里会兼容存储做判断 TimeDensity = density,//密度,注意这里会兼容存储做判断
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -68,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度,注意这里会兼容存储做判断 TimeDensity = density,//密度,注意这里会兼容存储做判断
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -68,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -151,10 +148,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}";
filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功");
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -68,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -68,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -68,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

6
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -67,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -49,7 +48,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -66,8 +64,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs
View File

@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs
View File

@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -49,7 +48,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -66,8 +64,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs
View File

@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs
View File

@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -49,7 +48,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -66,8 +64,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs
View File

@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -50,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -67,8 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs
View File

@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -51,7 +50,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -68,8 +66,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

12
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -9,7 +8,6 @@ using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -47,7 +45,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>> UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
{ {
@ -62,8 +59,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -140,9 +136,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.ItemType = dataType; meter.DataType = dataType;
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
return meter; return meter;
} }
} }

10
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs
View File

@ -9,8 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -48,7 +46,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>> UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
{ {
@ -63,8 +60,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -132,9 +128,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.ItemType = dataType; meter.DataType = dataType;
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
return meter; return meter;
} }
} }

10
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs
View File

@ -9,8 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -48,7 +46,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>> UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
{ {
@ -63,8 +60,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Month, DensityUnit = DensityUnit.Month,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -132,9 +128,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.ItemType = dataType; meter.DataType = dataType;
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
return meter; return meter;
} }
} }

9
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs
View File

@ -11,7 +11,6 @@ using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using YamlDotNet.Core.Tokens; using YamlDotNet.Core.Tokens;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -149,10 +146,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}";
filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功");
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }
return list; return list;

9
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs
View File

@ -11,7 +11,6 @@ using JiShe.CollectBus.Common.Extensions;
using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -55,7 +54,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -72,8 +70,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -165,10 +162,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
else else
meter.TimeSpan=tsField; meter.TimeSpan=tsField;
} }
meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}";
filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功");
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }

9
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs
View File

@ -10,7 +10,6 @@ using JiShe.CollectBus.Common.Extensions;
using AutoMapper.Internal.Mappers; using AutoMapper.Internal.Mappers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -54,7 +53,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -71,8 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Day, DensityUnit = DensityUnit.Day,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
@ -167,10 +164,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
else else
meter.TimeSpan = tsField; meter.TimeSpan = tsField;
} }
meter.ItemType = i == 1 ? dataType : $"{dataType}_{ i - 1}"; meter.DataType = i == 1 ? dataType : $"{dataType}_{ i - 1}";
filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功"); filedDesc = i == 1 ? filedDesc : filedDesc.Replace("有功", "无功");
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }
return list; return list;

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.T37612012.Appendix; using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
@ -52,7 +51,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -69,8 +67,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs
View File

@ -9,7 +9,6 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Consts;
namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
{ {
@ -53,7 +52,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
item.DeviceId = ammeterInfo.MeterId; item.DeviceId = ammeterInfo.MeterId;
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.AmmerterAddress; item.DeviceAddress = ammeterInfo.AmmerterAddress;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -70,8 +68,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = density,//密度-间隔分钟数, TimeDensity = density,//密度-间隔分钟数,
DensityUnit = DensityUnit.Minute, DensityUnit = DensityUnit.Minute,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data,
}; };
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveMultipleDataToIotDbAsync<decimal?>(unitDataAnalysis);
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
@ -56,7 +55,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
item.DatabaseBusiID = ammeterInfo.DatabaseBusiID; item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
item.DeviceAddress = ammeterInfo.Address; item.DeviceAddress = ammeterInfo.Address;
item.DeviceType = MeterTypeEnum.Focus; item.DeviceType = MeterTypeEnum.Focus;
item.FocusId = ammeterInfo.FocusId;
}); });
} }
} }
@ -71,8 +69,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Event,
}; };
// meterData.DataType = "0E_1"; // meterData.DataType = "0E_1";
result?.Invoke(dto); result?.Invoke(dto);

20
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F101_Analysis.cs
View File

@ -1,7 +1,5 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
@ -34,19 +32,8 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
var data = new AnalysisBaseDto<string?>() var data = new AnalysisBaseDto<string?>()
{ {
FiledDesc = "透读取SIM卡信息", 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<AnalysisBaseDto<string?>> dto = new UnitDataAnalysis<AnalysisBaseDto<string?>> UnitDataAnalysis<AnalysisBaseDto<string?>> dto = new UnitDataAnalysis<AnalysisBaseDto<string?>>
{ {
Code = input.A.Code!, Code = input.A.Code!,
@ -58,8 +45,7 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Data,
}; };
result?.Invoke(dto); result?.Invoke(dto);
await _dataStorage.SaveDataToIotDbAsync<string?>(dto); await _dataStorage.SaveDataToIotDbAsync<string?>(dto);

11
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs
View File

@ -1,5 +1,4 @@
using GatherService.WattMeter.AnalysisData.AFN_10H; using GatherService.WattMeter.AnalysisData.AFN_10H;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Helpers;
@ -42,7 +41,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList); List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas); AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas);
// 查询电表信息 // 查询电表信息
AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15"); AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
if (ammeterInfo != null) if (ammeterInfo != null)
@ -51,7 +49,6 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>> UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
{ {
@ -66,9 +63,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
MessageId = input.MessageId, MessageId = input.MessageId,
TimeDensity = 1,//密度-间隔, TimeDensity = 1,//密度-间隔,
DensityUnit = DensityUnit.Hour, DensityUnit = DensityUnit.Hour,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime
DataType = IOTDBDataTypeConst.Data
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync<decimal?>(unitDataAnalysis);
@ -98,10 +93,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
meter.DataValue = value; meter.DataValue = value;
} }
meter.ItemType = "10_97"; meter.DataType = "10_97";
meter.ValidData = data[2].Equals("91") || data[2].Equals("B1"); meter.ValidData = data[2].Equals("91") || data[2].Equals("B1");
meter.FiledDesc = "电网频率";//"电网频率"; meter.FiledDesc = "电网频率";//"电网频率";
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
return meter; return meter;
} }
private async Task<List<string>> AnalysisDataUnitAsync(List<string> hexMessageList) private async Task<List<string>> AnalysisDataUnitAsync(List<string> hexMessageList)

10
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F98_Analysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.IotSystems.Ammeters; using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.Protocol; using JiShe.CollectBus.Protocol;
@ -40,8 +39,7 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
var data = new AnalysisBaseDto<bool?>() var data = new AnalysisBaseDto<bool?>()
{ {
FiledDesc = "跳合闸", 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",
}; };
// 查询电表信息 // 查询电表信息
@ -52,7 +50,6 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
data.DeviceId = ammeterInfo.MeterId; data.DeviceId = ammeterInfo.MeterId;
data.DatabaseBusiID = ammeterInfo.DatabaseBusiID; data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
data.DeviceAddress = ammeterInfo.AmmerterAddress; data.DeviceAddress = ammeterInfo.AmmerterAddress;
data.FocusId = ammeterInfo.FocusId;
} }
UnitDataAnalysis<AnalysisBaseDto<bool?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<bool?>> UnitDataAnalysis<AnalysisBaseDto<bool?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
{ {
@ -67,8 +64,7 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
MessageId = input.MessageId, MessageId = input.MessageId,
ReceivedTime = input.ReceivedTime, ReceivedTime = input.ReceivedTime,
DensityUnit = DensityUnit.None, DensityUnit = DensityUnit.None,
TimeDensity = -1, TimeDensity = -1
DataType = IOTDBDataTypeConst.Data
}; };
result?.Invoke(unitDataAnalysis); result?.Invoke(unitDataAnalysis);
await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis); await _dataStorage.SaveDataToIotDbAsync(unitDataAnalysis);

56
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs
View File

@ -123,7 +123,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
DeviceId = $"{data.DeviceId}", DeviceId = $"{data.DeviceId}",
DeviceType = $"{data.DeviceType.ToString()}", DeviceType = $"{data.DeviceType.ToString()}",
ProjectId = $"{data.ProjectId}", ProjectId = $"{data.ProjectId}",
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Data,
Timestamps = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeNanoseconds(), Timestamps = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeNanoseconds(),
SingleMeasuring = (data.FiledName ?? string.Empty, data.DataValue ?? default) SingleMeasuring = (data.FiledName ?? string.Empty, data.DataValue ?? default)
}; };
@ -148,24 +148,21 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
ProjectId = $"{data.ProjectId}", ProjectId = $"{data.ProjectId}",
DeviceType = $"{data.DeviceType}", DeviceType = $"{data.DeviceType}",
DeviceId = $"{data.DeviceId}", DeviceId = $"{data.DeviceId}",
DataType = analysisBaseDto.DataType,
FocusId = data.FocusId,
FocusAddress = analysisBaseDto.Code,
Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(), Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(),
DatabaseBusiID = data.DatabaseBusiID, DatabaseBusiID = data.DatabaseBusiID,
PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity),
CreationTime = currentTime, CreationTime = currentTime,
MeterAddress = analysisBaseDto.Code == data.DeviceAddress ? "" : data.DeviceAddress, // 判断是否能取到表地址 MeterAddress = data.DeviceAddress,
AFN = analysisBaseDto.AFN, AFN = analysisBaseDto.AFN,
Fn = analysisBaseDto.Fn, Fn = analysisBaseDto.Fn,
Seq = analysisBaseDto.PSEQ, Seq = analysisBaseDto.PSEQ,
MSA = analysisBaseDto.MSA, MSA = analysisBaseDto.MSA,
ItemCode = data.ItemType, ItemCode = data.DataType,
TaskMark = taskMark, TaskMark = taskMark,
IsSend = false, IsSend = false,
ManualOrNot = false, ManualOrNot = false,
Pn = analysisBaseDto.Pn, Pn = analysisBaseDto.Pn,
ReceivedMessageId = analysisBaseDto.MessageId ?? string.Empty, ReceivedMessageId = analysisBaseDto.MessageId?? string.Empty,
ReceivedMessageHexString = analysisBaseDto.ReceivedHexMessage, ReceivedMessageHexString = analysisBaseDto.ReceivedHexMessage,
IsReceived = true, IsReceived = true,
ReceivedRemark = data.ErrorCodeMsg ?? string.Empty, ReceivedRemark = data.ErrorCodeMsg ?? string.Empty,
@ -173,7 +170,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
ReceivedTime = analysisBaseDto.ReceivedTime, ReceivedTime = analysisBaseDto.ReceivedTime,
}; };
} }
_runtimeContext.UseTableSessionPool = true; // 使树模型池
await _dbProvider.InsertAsync(taskData); await _dbProvider.InsertAsync(taskData);
//如果无字段名，则不保存数据 //如果无字段名，则不保存数据
if (!string.IsNullOrWhiteSpace(data.FiledName)) if (!string.IsNullOrWhiteSpace(data.FiledName))
@ -232,7 +229,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
DeviceId = $"{item.DeviceId}", DeviceId = $"{item.DeviceId}",
DeviceType = $"{item.DeviceType}", DeviceType = $"{item.DeviceType}",
ProjectId = $"{item.ProjectId}", ProjectId = $"{item.ProjectId}",
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Data,
Timestamps = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeNanoseconds(), // TODO:这里暂时格式化15分钟数据，需要进行调整 Timestamps = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeNanoseconds(), // TODO:这里暂时格式化15分钟数据，需要进行调整
SingleMeasuring =(item.FiledName ?? string.Empty, item.DataValue ?? default) SingleMeasuring =(item.FiledName ?? string.Empty, item.DataValue ?? default)
}; };
@ -257,19 +254,16 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
ProjectId = $"{item.ProjectId}", ProjectId = $"{item.ProjectId}",
DeviceType = $"{item.DeviceType}", DeviceType = $"{item.DeviceType}",
DeviceId = $"{item.DeviceId}", DeviceId = $"{item.DeviceId}",
DataType = IOTDBDataTypeConst.Log, // 匹配不到下发记录标记为LOG
Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(), Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(),
DatabaseBusiID = item.DatabaseBusiID, DatabaseBusiID = item.DatabaseBusiID,
PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity),
CreationTime = currentTime, CreationTime = currentTime,
FocusId = item.FocusId, MeterAddress = item.DeviceAddress,
FocusAddress = analysisBaseDto.Code,
MeterAddress = analysisBaseDto.Code == item.DeviceAddress ? "" : item.DeviceAddress, // 判断是否能取到表地址
AFN = analysisBaseDto.AFN, AFN = analysisBaseDto.AFN,
Fn = analysisBaseDto.Fn, Fn = analysisBaseDto.Fn,
Seq = analysisBaseDto.PSEQ, Seq = analysisBaseDto.PSEQ,
MSA = analysisBaseDto.MSA, MSA = analysisBaseDto.MSA,
ItemCode = item.ItemType, ItemCode = item.DataType,
TaskMark = taskMark, TaskMark = taskMark,
IsSend = false, IsSend = false,
ManualOrNot = false, ManualOrNot = false,
@ -324,7 +318,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
DeviceId = $"{data.DeviceId}", DeviceId = $"{data.DeviceId}",
DeviceType = $"{data.DeviceType}", DeviceType = $"{data.DeviceType}",
ProjectId = $"{data.ProjectId}", ProjectId = $"{data.ProjectId}",
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps, Timestamps = timestamps,
SingleMeasuring = (data.FiledName!, data.DataValue!) SingleMeasuring = (data.FiledName!, data.DataValue!)
}; };
@ -337,7 +331,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
DeviceId = $"{data.DeviceId}", DeviceId = $"{data.DeviceId}",
DeviceType = $"{data.DeviceType}", DeviceType = $"{data.DeviceType}",
ProjectId = $"{data.ProjectId}", ProjectId = $"{data.ProjectId}",
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps, Timestamps = timestamps,
SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty) SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty)
}; };
@ -346,15 +340,15 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
await _dbProvider.InsertAsync(treeFrameData); await _dbProvider.InsertAsync(treeFrameData);
// 时间 // 时间
var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<DateTime>() var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<long>()
{ {
SystemName = _applicationOptions.SystemType, SystemName = _applicationOptions.SystemType,
DeviceId = $"{data.DeviceId}", DeviceId = $"{data.DeviceId}",
DeviceType = $"{data.DeviceType}", DeviceType = $"{data.DeviceType}",
ProjectId = $"{data.ProjectId}", ProjectId = $"{data.ProjectId}",
Timestamps = timestamps, Timestamps = timestamps,
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Status,
SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now) SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, (data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds())
}; };
_runtimeContext.UseTableSessionPool = false; // 使树模型池 _runtimeContext.UseTableSessionPool = false; // 使树模型池
await _dbProvider.InsertAsync(treeRecordingTimeData); await _dbProvider.InsertAsync(treeRecordingTimeData);
@ -368,19 +362,16 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
ProjectId = $"{data.ProjectId}", ProjectId = $"{data.ProjectId}",
DeviceType = $"{data.DeviceType}", DeviceType = $"{data.DeviceType}",
DeviceId = $"{data.DeviceId}", DeviceId = $"{data.DeviceId}",
DataType = analysisBaseDto.DataType,
FocusId = data.FocusId,
FocusAddress = analysisBaseDto.Code,
Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(), Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(),
DatabaseBusiID = data.DatabaseBusiID, DatabaseBusiID = data.DatabaseBusiID,
PendingCopyReadTime = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), PendingCopyReadTime = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity),
CreationTime = currentTime, CreationTime = currentTime,
MeterAddress = analysisBaseDto.Code == data.DeviceAddress ? "" : data.DeviceAddress,// 判断是否能取到表地址 MeterAddress = data.DeviceAddress,
AFN = analysisBaseDto.AFN, AFN = analysisBaseDto.AFN,
Fn = analysisBaseDto.Fn, Fn = analysisBaseDto.Fn,
Seq = analysisBaseDto.PSEQ, Seq = analysisBaseDto.PSEQ,
MSA = analysisBaseDto.MSA, MSA = analysisBaseDto.MSA,
ItemCode = data.ItemType, ItemCode = data.DataType,
TaskMark = taskMark, TaskMark = taskMark,
IsSend = false, IsSend = false,
ManualOrNot = false, ManualOrNot = false,
@ -425,7 +416,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
DeviceId = $"{item.DeviceId}", DeviceId = $"{item.DeviceId}",
DeviceType = $"{item.DeviceType}", DeviceType = $"{item.DeviceType}",
ProjectId = $"{item.ProjectId}", ProjectId = $"{item.ProjectId}",
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps, Timestamps = timestamps,
SingleMeasuring = (item.FiledName!, item.DataValue!) SingleMeasuring = (item.FiledName!, item.DataValue!)
}; };
@ -437,7 +428,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
SystemName = _applicationOptions.SystemType, SystemName = _applicationOptions.SystemType,
DeviceType = $"{item.DeviceType}", DeviceType = $"{item.DeviceType}",
ProjectId = $"{item.ProjectId}", ProjectId = $"{item.ProjectId}",
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps, Timestamps = timestamps,
SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty) SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty)
}; };
@ -446,14 +437,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
await _dbProvider.InsertAsync(treeFrameData); await _dbProvider.InsertAsync(treeFrameData);
// 时间 // 时间
var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<DateTime>() var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<long>()
{ {
SystemName = _applicationOptions.SystemType, SystemName = _applicationOptions.SystemType,
DeviceType = $"{item.DeviceType}", DeviceType = $"{item.DeviceType}",
ProjectId = $"{item.ProjectId}", ProjectId = $"{item.ProjectId}",
DataType = analysisBaseDto.DataType, DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps, Timestamps = timestamps,
SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, item.TimeSpan.HasValue ? item.TimeSpan.Value : DateTime.Now) SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, (item.TimeSpan.HasValue ? item.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds())
}; };
_runtimeContext.UseTableSessionPool = false; // 使树模型池 _runtimeContext.UseTableSessionPool = false; // 使树模型池
await _dbProvider.InsertAsync(treeRecordingTimeData); await _dbProvider.InsertAsync(treeRecordingTimeData);
@ -467,19 +458,16 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
ProjectId = $"{item.ProjectId}", ProjectId = $"{item.ProjectId}",
DeviceType = $"{item.DeviceType}", DeviceType = $"{item.DeviceType}",
DeviceId = $"{item.DeviceId}", DeviceId = $"{item.DeviceId}",
DataType = analysisBaseDto.DataType,
Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(), Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(),
DatabaseBusiID = item.DatabaseBusiID, DatabaseBusiID = item.DatabaseBusiID,
PendingCopyReadTime = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), PendingCopyReadTime = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity),
CreationTime = currentTime, CreationTime = currentTime,
FocusId = item.FocusId, MeterAddress = item.DeviceAddress,
FocusAddress = analysisBaseDto.Code,
MeterAddress= analysisBaseDto.Code== item.DeviceAddress?"": item.DeviceAddress,// 判断是否能取到表地址
AFN = analysisBaseDto.AFN, AFN = analysisBaseDto.AFN,
Fn = analysisBaseDto.Fn, Fn = analysisBaseDto.Fn,
Seq = analysisBaseDto.PSEQ, Seq = analysisBaseDto.PSEQ,
MSA = analysisBaseDto.MSA, MSA = analysisBaseDto.MSA,
ItemCode = item.ItemType, ItemCode = item.DataType,
TaskMark = taskMark, TaskMark = taskMark,
IsSend = false, IsSend = false,
ManualOrNot = false, ManualOrNot = false,

14
protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs
View File

@ -262,9 +262,9 @@ namespace JiShe.CollectBus.Protocol.T37612012
meter.DataValue = value; meter.DataValue = value;
} }
} }
meter.ItemType = dataType; meter.DataType = dataType;
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
if (DateTime.TryParse(CalculateTimeSpan(i - 3, data[0], density), out DateTime readingDate)) if (DateTime.TryParse(CalculateTimeSpan(i - 3, data[0], density), out DateTime readingDate))
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
list.Add(meter); list.Add(meter);
@ -305,9 +305,9 @@ namespace JiShe.CollectBus.Protocol.T37612012
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.ItemType = i - index == 0 ? dataType : $"{dataType}_{i - index}"; meter.DataType = i - index == 0 ? dataType : $"{dataType}_{i - index}";
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
} }
return list; return list;
@ -348,9 +348,9 @@ namespace JiShe.CollectBus.Protocol.T37612012
{ {
meter.TimeSpan = readingDate; meter.TimeSpan = readingDate;
} }
meter.ItemType = i - index == 0 ? dataType : $"{dataType}_{i - index}"; meter.DataType = i - index == 0 ? dataType : $"{dataType}_{i - index}";
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.ItemType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
list.Add(meter); list.Add(meter);
typeIndex++; typeIndex++;
} }
@ -385,7 +385,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
if (item.ValidData && item.DataValue.HasValue) if (item.ValidData && item.DataValue.HasValue)
jfpgSum += item.DataValue.Value; jfpgSum += item.DataValue.Value;
} }
var totalItem = meterDatas.FirstOrDefault(f => f.ItemType.Equals(mark[0]));//meterDatas.Find(f => f.DataType.Equals(mark[0])); var totalItem = meterDatas.FirstOrDefault(f => f.DataType.Equals(mark[0]));//meterDatas.Find(f => f.DataType.Equals(mark[0]));
if (totalItem != null) if (totalItem != null)
{ {
var floatingNum = (jfpgSum * 5 / 100);//上下浮动数据 var floatingNum = (jfpgSum * 5 / 100);//上下浮动数据

8
services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs
View File

@ -17,9 +17,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto
public bool ValidData { get; set; } = true; public bool ValidData { get; set; } = true;
/// <summary> /// <summary>
/// 数据项类型 /// 数据类型
/// </summary> /// </summary>
public string ItemType { get; set; } = null!; public string DataType { get; set; } = null!;
/// <summary> /// <summary>
/// 错误码信息 /// 错误码信息
@ -67,10 +67,6 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto
/// </summary> /// </summary>
public string DeviceAddress { get; set; } = null!; public string DeviceAddress { get; set; } = null!;
/// <summary>
/// 集中器ID
/// </summary>
public int FocusId { get; set; }
} }
public class AnalysisBaseDto<T> : AnalysisBaseDto public class AnalysisBaseDto<T> : AnalysisBaseDto

12
services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -61,17 +60,6 @@ namespace JiShe.CollectBus.Protocol.Dto
/// 采集密度单位 /// 采集密度单位
/// </summary> /// </summary>
public DensityUnit DensityUnit { get; set; }= DensityUnit.Minute; public DensityUnit DensityUnit { get; set; }= DensityUnit.Minute;
/// <summary>
/// 数据类型
/// </summary>
public string DataType { get; set; }= null!;
/// <summary>
/// 数据项编码
/// </summary>
public string ItemCode => $"{AFN.HexToDecStr().PadLeft(2, '0')}_{Fn}";
} }
public class UnitDataAnalysis<T>: UnitDataAnalysis public class UnitDataAnalysis<T>: UnitDataAnalysis

10
shared/JiShe.CollectBus.Common/Consts/IOTDBDataTypeConst.cs
View File

@ -25,15 +25,5 @@ namespace JiShe.CollectBus.Common.Consts
/// 状态 /// 状态
/// </summary> /// </summary>
public const string Status = "Status"; public const string Status = "Status";
/// <summary>
/// 日志
/// </summary>
public const string Log = "Log";
/// <summary>
/// 参数
/// </summary>
public const string Param= "Param";
} }
} }

10
shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs
View File

@ -98,10 +98,6 @@ namespace JiShe.CollectBus.Common.Consts
public const string Ib = "Ib"; public const string Ib = "Ib";
public const string Ic = "Ic"; 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 public class ConstGatherDataType
@ -154,12 +150,6 @@ namespace JiShe.CollectBus.Common.Consts
public const string Ib = "0C_49_Ib"; // 当前电压、电流相位角 public const string Ib = "0C_49_Ib"; // 当前电压、电流相位角
public const string Ic = "0C_49_Ic"; // 当前电压、电流相位角 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相视在功率曲线
} }

1
web/JiShe.CollectBus.Host/Pages/Monitor.cshtml
View File

@ -16,6 +16,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" /> <link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<title>后端服务</title> <title>后端服务</title>
</head> </head>
<body> <body>

2
web/JiShe.CollectBus.Host/appsettings.json
View File

@ -88,7 +88,7 @@
"ClusterList": [ "192.168.1.9:6667" ], "ClusterList": [ "192.168.1.9:6667" ],
"PoolSize": 32, "PoolSize": 32,
"DataBaseName": "energy", "DataBaseName": "energy",
"OpenDebugMode": true, "OpenDebugMode": false,
"UseTableSessionPoolByDefault": false "UseTableSessionPoolByDefault": false
}, },
"Cassandra": { "Cassandra": {