优化返回消息体都增加消息ID
This commit is contained in:
parent
981d948255
commit
f020d456d5
@ -29,7 +29,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = true
|
Data = true,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -16,27 +16,30 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
|
|||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
public Task<bool> ExecuteAsync(TB3761 tB3761, Action<dynamic>? result = null)
|
public Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(tB3761);
|
ArgumentNullException.ThrowIfNull(input);
|
||||||
ArgumentNullException.ThrowIfNull(tB3761.A.Code);
|
ArgumentNullException.ThrowIfNull(input.A.Code);
|
||||||
UnitDataAnalysis<bool> dto = new UnitDataAnalysis<bool>
|
UnitDataAnalysis<bool> dto = new UnitDataAnalysis<bool>
|
||||||
{
|
{
|
||||||
Code = tB3761.A.Code,
|
Code = input.A.Code,
|
||||||
AFN = tB3761.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = tB3761.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = tB3761.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = false,
|
Data = false,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime =input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, $"00_2解析失败:{tB3761.A.Code}-{tB3761.DT.Fn}-{tB3761.BaseHexMessage.HexMessageString},{ex.Message}");
|
_logger.LogError(ex, $"00_2解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}");
|
||||||
return null;
|
return Task.FromResult(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -35,7 +35,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = $"登录帧"
|
Data = $"登录帧",
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
@ -47,86 +50,5 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
|
|||||||
return Task.FromResult(false);
|
return Task.FromResult(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//public Task ExecuteAsync<TResult>(TB3761 input, Action<TResult>? callback = null) where TResult : UnitDataAnalysis<TResult>
|
|
||||||
//{
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// ArgumentNullException.ThrowIfNull(input);
|
|
||||||
// ArgumentNullException.ThrowIfNull(input.A.Code);
|
|
||||||
// UnitDataAnalysis<string> dto = new UnitDataAnalysis<string>
|
|
||||||
// {
|
|
||||||
// Code = input.A.Code,
|
|
||||||
// AFN = input.AFN_FC.AFN,
|
|
||||||
// Fn = input.DT.Fn,
|
|
||||||
// Pn = input.DA.Pn,
|
|
||||||
// Data = $"登录帧"
|
|
||||||
// };
|
|
||||||
// callback?.Invoke(dto);
|
|
||||||
// return Task.FromResult(dto);
|
|
||||||
// }
|
|
||||||
// catch (Exception ex)
|
|
||||||
// {
|
|
||||||
// _logger.LogError(ex, $"02_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}");
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
//public Task<UnitDataAnalysis<string>> ExecuteAsync(TB3761 input, Action<UnitDataAnalysis<string>>? callback = null)
|
|
||||||
//{
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// ArgumentNullException.ThrowIfNull(input);
|
|
||||||
// ArgumentNullException.ThrowIfNull(input.A.Code);
|
|
||||||
// UnitDataAnalysis<string> dto = new UnitDataAnalysis<string>
|
|
||||||
// {
|
|
||||||
// Code = input.A.Code,
|
|
||||||
// AFN = input.AFN_FC.AFN,
|
|
||||||
// Fn = input.DT.Fn,
|
|
||||||
// Pn = input.DA.Pn,
|
|
||||||
// Data = $"登录帧"
|
|
||||||
// };
|
|
||||||
// callback?.Invoke(dto);
|
|
||||||
// return Task.FromResult(dto);
|
|
||||||
// }
|
|
||||||
// catch (Exception ex)
|
|
||||||
// {
|
|
||||||
// _logger.LogError(ex, $"02_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}");
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
//public Task ExecuteAsync<TResult>(TB3761 input, Action<TResult>? callback = null)
|
|
||||||
//{
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// ArgumentNullException.ThrowIfNull(input);
|
|
||||||
// ArgumentNullException.ThrowIfNull(input.A.Code);
|
|
||||||
// var dto = Activator.CreateInstance<TResult>();
|
|
||||||
// dto.Code = input.A.Code;
|
|
||||||
// dto.AFN = input.AFN_FC.AFN;
|
|
||||||
// dto.Fn = input.DT.Fn;
|
|
||||||
// dto.Pn = input.DA.Pn;
|
|
||||||
// dto.Data = "登录帧";
|
|
||||||
// //UnitDataAnalysis<string> dto = new UnitDataAnalysis<string>
|
|
||||||
// //{
|
|
||||||
// // Code = input.A.Code,
|
|
||||||
// // AFN = input.AFN_FC.AFN,
|
|
||||||
// // Fn = input.DT.Fn,
|
|
||||||
// // Pn = input.DA.Pn,
|
|
||||||
// // Data = $"登录帧"
|
|
||||||
// //};
|
|
||||||
// callback?.Invoke(dto);
|
|
||||||
// return Task.FromResult(dto);
|
|
||||||
// }
|
|
||||||
// catch (Exception ex)
|
|
||||||
// {
|
|
||||||
// _logger.LogError(ex, $"02_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}");
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,26 +22,29 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
|
|||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<bool> ExecuteAsync(TB3761 tB3761, Action<dynamic>? result = null)
|
public Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(tB3761);
|
ArgumentNullException.ThrowIfNull(input);
|
||||||
ArgumentNullException.ThrowIfNull(tB3761.A.Code);
|
ArgumentNullException.ThrowIfNull(input.A.Code);
|
||||||
UnitDataAnalysis<string> dto = new UnitDataAnalysis<string>
|
UnitDataAnalysis<string> dto = new UnitDataAnalysis<string>
|
||||||
{
|
{
|
||||||
Code = tB3761.A.Code,
|
Code = input.A.Code,
|
||||||
AFN = tB3761.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = tB3761.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = tB3761.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = $"退出登录帧"
|
Data = $"退出登录帧",
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, $"02_2解析失败:{tB3761.A.Code}-{tB3761.DT.Fn}-{tB3761.BaseHexMessage.HexMessageString},{ex.Message}");
|
_logger.LogError(ex, $"02_2解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}");
|
||||||
}
|
}
|
||||||
return Task.FromResult(false);
|
return Task.FromResult(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -34,7 +34,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = $"心跳帧"
|
Data = $"心跳帧",
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -35,7 +35,10 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = data
|
Data = data,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -31,7 +31,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = Encoding.ASCII.GetString(string.Join("", input.UnitData.HexMessageList.Skip(30).Take(20).ToList()).HexToByte()).Replace("\0", "") //SIM卡
|
Data = Encoding.ASCII.GetString(string.Join("", input.UnitData.HexMessageList.Skip(30).Take(20).ToList()).HexToByte()).Replace("\0", ""), //SIM卡
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -35,7 +35,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
|
|||||||
{
|
{
|
||||||
AFN10F10Entitys = tuple.Item2,
|
AFN10F10Entitys = tuple.Item2,
|
||||||
ConfigNum = tuple.Item1
|
ConfigNum = tuple.Item1
|
||||||
}
|
},
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -36,7 +36,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = data
|
Data = data,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -29,7 +29,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = input.UnitData.HexMessageList[4].Equals("55")
|
Data = input.UnitData.HexMessageList[4].Equals("55"),
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -39,6 +39,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
|
|||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
MSA= input.A.A3.D1_D7,
|
MSA= input.A.A3.D1_D7,
|
||||||
PSEQ= input.SEQ.PSEQ,
|
PSEQ= input.SEQ.PSEQ,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
|
List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
|
||||||
List<AFN12_F129_AnalysisDto> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn);
|
List<AFN12_F129_AnalysisDto> list = GenerateFinalResult(2, datas, "正向有功电能示值", input.AFN_FC.AFN, input.DT.Fn);
|
||||||
|
|||||||
@ -36,7 +36,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = list
|
Data = list,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -35,7 +35,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = list
|
Data = list,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -33,11 +33,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
|
|||||||
List<AFN12_F132_AnalysisDto> list = GenerateFinalResult(2, datas, "反向无功电能示值", (int)input.AFN_FC.AFN!, (int)input.DT.Fn!);
|
List<AFN12_F132_AnalysisDto> list = GenerateFinalResult(2, datas, "反向无功电能示值", (int)input.AFN_FC.AFN!, (int)input.DT.Fn!);
|
||||||
UnitDataAnalysis<List<AFN12_F132_AnalysisDto>> unitDataAnalysis = new UnitDataAnalysis<List<AFN12_F132_AnalysisDto>>
|
UnitDataAnalysis<List<AFN12_F132_AnalysisDto>> unitDataAnalysis = new UnitDataAnalysis<List<AFN12_F132_AnalysisDto>>
|
||||||
{
|
{
|
||||||
Code = input.A.Code,
|
Code = input.A.Code!,
|
||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn ,
|
Fn = input.DT.Fn ,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = list
|
Data = list,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -38,7 +38,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = data
|
Data = data,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -60,7 +60,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
|
|||||||
HexMessage=input.BaseHexMessage.HexMessageString,
|
HexMessage=input.BaseHexMessage.HexMessageString,
|
||||||
MessageId=input.MessageId,
|
MessageId=input.MessageId,
|
||||||
TimeDensity=1,
|
TimeDensity=1,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
@ -136,12 +137,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
|
|||||||
//TODO:时间标
|
//TODO:时间标
|
||||||
if (!DateTime.TryParse(timeSpan, out DateTime dataTime))
|
if (!DateTime.TryParse(timeSpan, out DateTime dataTime))
|
||||||
dto.ValidData = false;
|
dto.ValidData = false;
|
||||||
dto.DataTime = dataTime;
|
dto.TimeSpan = dataTime;
|
||||||
}
|
}
|
||||||
if (DateTime.Now.Month.Equals(1))//如果为1月份,则日期减去1年
|
if (DateTime.Now.Month.Equals(1) && dto.TimeSpan.HasValue)//如果为1月份,则日期减去1年
|
||||||
{
|
{
|
||||||
dto.DataTime = dto.DataTime.AddYears(-1);
|
dto.TimeSpan= dto.TimeSpan.Value.AddYears(-1);
|
||||||
dto.TimeSpan= dto.DataTime;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dto.FiledDesc = "上月(上一结算日)正向有功最大需量及发生时间";
|
dto.FiledDesc = "上月(上一结算日)正向有功最大需量及发生时间";
|
||||||
|
|||||||
@ -39,7 +39,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = data
|
Data = data,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -59,7 +59,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = list
|
Data = list,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -37,7 +37,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = data
|
Data = data,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -39,7 +39,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = await AnalysisDataUnit(input.UnitData.HexMessageList, rationgCount)
|
Data = await AnalysisDataUnit(input.UnitData.HexMessageList, rationgCount),
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -58,7 +58,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data= list
|
Data= list,
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
return await Task.FromResult(true);
|
return await Task.FromResult(true);
|
||||||
|
|||||||
@ -67,7 +67,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -63,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -63,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -63,7 +63,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -64,7 +64,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -59,7 +59,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -59,7 +59,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -59,7 +59,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Month
|
DensityUnit = DensityUnit.Month,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -69,7 +69,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -68,7 +68,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔,
|
TimeDensity = 1,//密度-间隔,
|
||||||
DensityUnit = DensityUnit.Day
|
DensityUnit = DensityUnit.Day,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -65,7 +65,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -66,7 +66,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = density,//密度-间隔分钟数,
|
TimeDensity = density,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Minute
|
DensityUnit = DensityUnit.Minute,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
await _dataStorage.SaveMultipleDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -20,13 +20,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
|
|||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<bool> ExecuteAsync(TB3761 tB3761, Action<dynamic>? result = null)
|
public Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(nameof(tB3761));
|
ArgumentNullException.ThrowIfNull(nameof(input));
|
||||||
ArgumentNullException.ThrowIfNull(nameof(tB3761.UnitData.HexMessageList));
|
ArgumentNullException.ThrowIfNull(nameof(input.UnitData.HexMessageList));
|
||||||
int erc = tB3761.UnitData.HexMessageList![8].HexToDec();
|
int erc = input.UnitData.HexMessageList![8].HexToDec();
|
||||||
bool isOnOffPower = erc.Equals(14) ? true : false;
|
bool isOnOffPower = erc.Equals(14) ? true : false;
|
||||||
if (!isOnOffPower)
|
if (!isOnOffPower)
|
||||||
{
|
{
|
||||||
@ -34,11 +34,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
|
|||||||
}
|
}
|
||||||
UnitDataAnalysis<Tuple<string, string>> dto = new UnitDataAnalysis<Tuple<string, string>>
|
UnitDataAnalysis<Tuple<string, string>> dto = new UnitDataAnalysis<Tuple<string, string>>
|
||||||
{
|
{
|
||||||
Code = tB3761.A.Code!,
|
Code = input.A.Code!,
|
||||||
AFN = tB3761.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = tB3761.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = tB3761.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = AnalysisDataUnit(tB3761.UnitData.HexMessageList)
|
Data = AnalysisDataUnit(input.UnitData.HexMessageList),
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
// meterData.DataType = "0E_1";
|
// meterData.DataType = "0E_1";
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
@ -46,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, $"0E_1解析失败:{tB3761.A.Code}-{tB3761.DT.Fn}-{tB3761.BaseHexMessage.HexMessageString},{ex.Message}");
|
_logger.LogError(ex, $"0E_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}");
|
||||||
}
|
}
|
||||||
return Task.FromResult(false);
|
return Task.FromResult(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,10 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = AnalysisDataUnit(input.UnitData.HexMessageList) //SIM卡
|
Data = AnalysisDataUnit(input.UnitData.HexMessageList), //SIM卡
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -38,7 +38,10 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
|
|||||||
AFN = input.AFN_FC.AFN,
|
AFN = input.AFN_FC.AFN,
|
||||||
Fn = input.DT.Fn,
|
Fn = input.DT.Fn,
|
||||||
Pn = input.DA.Pn,
|
Pn = input.DA.Pn,
|
||||||
Data = AnalysisDataUnit(input.UnitData.HexMessageList)
|
Data = AnalysisDataUnit(input.UnitData.HexMessageList),
|
||||||
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
|
MessageId = input.MessageId,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
result?.Invoke(dto);
|
result?.Invoke(dto);
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
|
|||||||
@ -55,7 +55,8 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
|
|||||||
HexMessage = input.BaseHexMessage.HexMessageString,
|
HexMessage = input.BaseHexMessage.HexMessageString,
|
||||||
MessageId = input.MessageId,
|
MessageId = input.MessageId,
|
||||||
TimeDensity = 1,//密度-间隔分钟数,
|
TimeDensity = 1,//密度-间隔分钟数,
|
||||||
DensityUnit = DensityUnit.Second
|
DensityUnit = DensityUnit.Second,
|
||||||
|
ReceivedTime = input.ReceivedTime
|
||||||
};
|
};
|
||||||
//await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
//await _dataStorage.SaveDataToIotDbAsync<decimal>(unitDataAnalysis);
|
||||||
result?.Invoke(unitDataAnalysis);
|
result?.Invoke(unitDataAnalysis);
|
||||||
|
|||||||
@ -54,7 +54,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
|
|||||||
public async Task<bool> SaveDataToIotDbAsync<T>(UnitDataAnalysis<AnalysisBaseDto<T>> analysisBaseDto)
|
public async Task<bool> SaveDataToIotDbAsync<T>(UnitDataAnalysis<AnalysisBaseDto<T>> analysisBaseDto)
|
||||||
{
|
{
|
||||||
var data = analysisBaseDto.Data!;
|
var data = analysisBaseDto.Data!;
|
||||||
|
if(!data.TimeSpan.HasValue)
|
||||||
|
data.TimeSpan= analysisBaseDto.ReceivedTime;
|
||||||
string taskMark = CommonHelper.GetTaskMark(analysisBaseDto.AFN, analysisBaseDto.Fn, analysisBaseDto.Pn, analysisBaseDto.MSA, analysisBaseDto.PSEQ);
|
string taskMark = CommonHelper.GetTaskMark(analysisBaseDto.AFN, analysisBaseDto.Fn, analysisBaseDto.Pn, analysisBaseDto.MSA, analysisBaseDto.PSEQ);
|
||||||
string scoreValue = $"{analysisBaseDto.Code}.{taskMark}".Md5Fun();
|
string scoreValue = $"{analysisBaseDto.Code}.{taskMark}".Md5Fun();
|
||||||
|
|
||||||
@ -86,7 +87,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
|
|||||||
DeviceId = $"{data.MeterId}",
|
DeviceId = $"{data.MeterId}",
|
||||||
DeviceType = $"{data.MeterType}",
|
DeviceType = $"{data.MeterType}",
|
||||||
ProjectId = $"{data.ProjectId}",
|
ProjectId = $"{data.ProjectId}",
|
||||||
Timestamps = data.TimeSpan.GetDateTimeOffset().ToUnixTimeMilliseconds(),
|
Timestamps = data.TimeSpan!.Value.GetDateTimeOffset().ToUnixTimeMilliseconds(), // TODO:这里暂时格式化15分钟数据,需要进行调整
|
||||||
SingleMeasuring = new Tuple<string, T>(data.FiledName ?? string.Empty, data.DataValue ?? default)
|
SingleMeasuring = new Tuple<string, T>(data.FiledName ?? string.Empty, data.DataValue ?? default)
|
||||||
};
|
};
|
||||||
_runtimeContext.UseTableSessionPool = true; // 使用表模型池
|
_runtimeContext.UseTableSessionPool = true; // 使用表模型池
|
||||||
@ -110,9 +111,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
|
|||||||
ProjectId = $"{data.ProjectId}",
|
ProjectId = $"{data.ProjectId}",
|
||||||
DeviceType = $"{data.MeterType}",
|
DeviceType = $"{data.MeterType}",
|
||||||
DeviceId = $"{data.MeterId}",
|
DeviceId = $"{data.MeterId}",
|
||||||
Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(),
|
Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(),
|
||||||
DatabaseBusiID = data.DatabaseBusiID,
|
DatabaseBusiID = data.DatabaseBusiID,
|
||||||
PendingCopyReadTime = data.DataTime.CheckTimePoint(),
|
PendingCopyReadTime = data.TimeSpan.Value.CheckTimePoint(), // // TODO:这里暂时格式化15分钟数据,需要进行调整
|
||||||
CreationTime = currentTime,
|
CreationTime = currentTime,
|
||||||
MeterAddress = data.MeterAddress,
|
MeterAddress = data.MeterAddress,
|
||||||
AFN = analysisBaseDto.AFN,
|
AFN = analysisBaseDto.AFN,
|
||||||
@ -154,6 +155,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
|
|||||||
var data = analysisBaseDto.Data!;
|
var data = analysisBaseDto.Data!;
|
||||||
foreach (var item in data)
|
foreach (var item in data)
|
||||||
{
|
{
|
||||||
|
if(!item.TimeSpan.HasValue)
|
||||||
|
item.TimeSpan = analysisBaseDto.ReceivedTime;
|
||||||
string taskMark = CommonHelper.GetTaskMark(analysisBaseDto.AFN, analysisBaseDto.Fn, analysisBaseDto.Pn, analysisBaseDto.MSA, analysisBaseDto.PSEQ);
|
string taskMark = CommonHelper.GetTaskMark(analysisBaseDto.AFN, analysisBaseDto.Fn, analysisBaseDto.Pn, analysisBaseDto.MSA, analysisBaseDto.PSEQ);
|
||||||
string scoreValue = $"{analysisBaseDto.Code}.{taskMark}".Md5Fun();
|
string scoreValue = $"{analysisBaseDto.Code}.{taskMark}".Md5Fun();
|
||||||
|
|
||||||
@ -185,7 +188,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
|
|||||||
DeviceId = $"{item.MeterId}",
|
DeviceId = $"{item.MeterId}",
|
||||||
DeviceType = $"{item.MeterType}",
|
DeviceType = $"{item.MeterType}",
|
||||||
ProjectId = $"{item.ProjectId}",
|
ProjectId = $"{item.ProjectId}",
|
||||||
Timestamps = item.TimeSpan.GetDateTimeOffset().ToUnixTimeMilliseconds(),
|
Timestamps = item.TimeSpan!.Value.CheckTimePoint().GetDateTimeOffset().ToUnixTimeMilliseconds(), // TODO:这里暂时格式化15分钟数据,需要进行调整
|
||||||
SingleMeasuring = new Tuple<string, T>(item.FiledName ?? string.Empty, item.DataValue ?? default)
|
SingleMeasuring = new Tuple<string, T>(item.FiledName ?? string.Empty, item.DataValue ?? default)
|
||||||
};
|
};
|
||||||
_runtimeContext.UseTableSessionPool = true; // 使用表模型池
|
_runtimeContext.UseTableSessionPool = true; // 使用表模型池
|
||||||
@ -211,7 +214,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
|
|||||||
DeviceId = $"{item.MeterId}",
|
DeviceId = $"{item.MeterId}",
|
||||||
Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(),
|
Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(),
|
||||||
DatabaseBusiID = item.DatabaseBusiID,
|
DatabaseBusiID = item.DatabaseBusiID,
|
||||||
PendingCopyReadTime = item.DataTime.CheckTimePoint(),
|
PendingCopyReadTime = item.TimeSpan.Value.CheckTimePoint(), // TODO:这里暂时格式化15分钟数据,需要进行调整
|
||||||
CreationTime = currentTime,
|
CreationTime = currentTime,
|
||||||
MeterAddress = item.MeterAddress,
|
MeterAddress = item.MeterAddress,
|
||||||
AFN = analysisBaseDto.AFN,
|
AFN = analysisBaseDto.AFN,
|
||||||
|
|||||||
@ -144,6 +144,11 @@ namespace JiShe.CollectBus.Protocol.T37612012
|
|||||||
return DateTime.Parse(dataTime);
|
return DateTime.Parse(dataTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 判断当前时间所在时标(5分钟)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="curTime"></param>
|
||||||
|
/// <returns></returns>
|
||||||
public static DateTime CheckTimeFivePoint(this DateTime curTime)
|
public static DateTime CheckTimeFivePoint(this DateTime curTime)
|
||||||
{
|
{
|
||||||
string dataTime;
|
string dataTime;
|
||||||
|
|||||||
@ -117,6 +117,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
|
|||||||
//TODO:根据AFN进行分流推送到kafka
|
//TODO:根据AFN进行分流推送到kafka
|
||||||
string topicName = string.Format(ProtocolConst.AFNTopicNameFormat, tB3761.AFN_FC.AFN.ToString().PadLeft(2, '0'));
|
string topicName = string.Format(ProtocolConst.AFNTopicNameFormat, tB3761.AFN_FC.AFN.ToString().PadLeft(2, '0'));
|
||||||
tB3761.MessageId = Guid.NewGuid().ToString();
|
tB3761.MessageId = Guid.NewGuid().ToString();
|
||||||
|
tB3761.ReceivedTime = DateTime.Now;
|
||||||
MessageProtocolAnalysis<TB3761> messageReceivedAnalysis = new MessageProtocolAnalysis<TB3761>()
|
MessageProtocolAnalysis<TB3761> messageReceivedAnalysis = new MessageProtocolAnalysis<TB3761>()
|
||||||
{
|
{
|
||||||
ClientId = tcpSessionClient.Id,
|
ClientId = tcpSessionClient.Id,
|
||||||
@ -125,7 +126,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
|
|||||||
MessageHexString = tB3761.BaseHexMessage.HexMessageString!,
|
MessageHexString = tB3761.BaseHexMessage.HexMessageString!,
|
||||||
DeviceNo = tB3761.A.Code!,
|
DeviceNo = tB3761.A.Code!,
|
||||||
MessageId = tB3761.MessageId,
|
MessageId = tB3761.MessageId,
|
||||||
ReceivedTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
|
ReceivedTime = tB3761.ReceivedTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
Data = tB3761
|
Data = tB3761
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -73,6 +73,8 @@ namespace JiShe.CollectBus.Plugins
|
|||||||
// TODO: 暂时不处理,后续再处理
|
// TODO: 暂时不处理,后续再处理
|
||||||
_logger.LogError($"指令初步解析失败,指令内容:{messageHexString}");
|
_logger.LogError($"指令初步解析失败,指令内容:{messageHexString}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO:要注意保存树模型的时时标字段,如果没有时标,则取接受时间做兼容
|
||||||
await e.InvokeNext();
|
await e.InvokeNext();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -147,6 +147,7 @@ namespace JiShe.CollectBus.Subscribers
|
|||||||
await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data, (result) =>
|
await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data, (result) =>
|
||||||
{
|
{
|
||||||
var ssss = (UnitDataAnalysis<string>)result;
|
var ssss = (UnitDataAnalysis<string>)result;
|
||||||
|
_logger.LogInformation($"解析AFN02H数据:{ssss.Serialize()}");
|
||||||
});
|
});
|
||||||
return SubscribeAck.Success();
|
return SubscribeAck.Success();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,12 +39,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 数据时标
|
/// 数据时标
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime TimeSpan { get; set; }
|
public DateTime? TimeSpan { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 数据时间
|
|
||||||
/// </summary>
|
|
||||||
public DateTime DataTime { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目Id
|
/// 项目Id
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using JiShe.CollectBus.Common.Enums;
|
using JiShe.CollectBus.Common.Enums;
|
||||||
|
using System;
|
||||||
|
|
||||||
namespace JiShe.CollectBus.Protocol.Dto
|
namespace JiShe.CollectBus.Protocol.Dto
|
||||||
{
|
{
|
||||||
@ -44,6 +45,11 @@ namespace JiShe.CollectBus.Protocol.Dto
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string? MessageId { get; set; }
|
public string? MessageId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 消息时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? ReceivedTime { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 采集密度
|
/// 采集密度
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -22,6 +22,11 @@ namespace JiShe.CollectBus.Protocol3761
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string? MessageId { get; set; }
|
public string? MessageId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 消息时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime ReceivedTime { get; set; }=DateTime.Now;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 控制域C
|
/// 控制域C
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -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>
|
||||||
|
|||||||
@ -80,7 +80,7 @@
|
|||||||
"SaslPassword": "lixiao1980",
|
"SaslPassword": "lixiao1980",
|
||||||
"KafkaReplicationFactor": 3,
|
"KafkaReplicationFactor": 3,
|
||||||
"NumPartitions": 30,
|
"NumPartitions": 30,
|
||||||
"ServerTagName": "JiSheCollectBus99",
|
"ServerTagName": "JiSheCollectBus4",
|
||||||
"FirstCollectionTime": "2025-04-22 16:07:00"
|
"FirstCollectionTime": "2025-04-22 16:07:00"
|
||||||
},
|
},
|
||||||
"IoTDBOptions": {
|
"IoTDBOptions": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user