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

打开注释的订阅信息，优化电表信息未缓存不保存数据，仅保存日志

Browse Source
This commit is contained in:
zenghongyao 2025-05-19 08:51:10 +08:00
parent 070173af4f
commit ba92a3d604
3 changed files with 488 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
} }
meterReadingTelemetryPacketInfos.Add(taskData); meterReadingTelemetryPacketInfos.Add(taskData);
//如果无字段名，则不保存数据,如saveData=false 也不保存数据 //如果无字段名，则不保存数据,如saveData=false 也不保存数据
if (!string.IsNullOrWhiteSpace(item.FiledName)) if (!string.IsNullOrWhiteSpace(item.FiledName) && item.ProjectId>0)
{ {
treeModelSingleMeasuringEntities.Add(meter); treeModelSingleMeasuringEntities.Add(meter);
} }
@ -342,44 +342,46 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
if (!data.TimeSpan.HasValue) if (!data.TimeSpan.HasValue)
data.TimeSpan = analysisBaseDto.ReceivedTime; data.TimeSpan = analysisBaseDto.ReceivedTime;
// 类型(心跳，登录，上电，掉电) // 类型(心跳，登录，上电，掉电)
long timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(); if (data.ProjectId > 0)
var treeData = new TreeModelSingleMeasuringEntity<T>()
{ {
SystemName = _applicationOptions.SystemType, long timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds();
DeviceId = $"{data.DeviceId}", var treeData = new TreeModelSingleMeasuringEntity<T>()
DeviceType = $"{data.DeviceType}", {
ProjectId = $"{data.ProjectId}", SystemName = _applicationOptions.SystemType,
DataType = IOTDBDataTypeConst.Status, DeviceId = $"{data.DeviceId}",
Timestamps = timestamps, DeviceType = $"{data.DeviceType}",
SingleMeasuring = (data.FiledName!, data.DataValue!) ProjectId = $"{data.ProjectId}",
}; DataType = IOTDBDataTypeConst.Status,
await _dbProvider.GetSessionPool(false).InsertAsync(treeData); Timestamps = timestamps,
// 数据帧 SingleMeasuring = (data.FiledName!, data.DataValue!)
var treeFrameData = new TreeModelSingleMeasuringEntity<string>() };
{ await _dbProvider.GetSessionPool(false).InsertAsync(treeData);
SystemName = _applicationOptions.SystemType, // 数据帧
DeviceId = $"{data.DeviceId}", var treeFrameData = new TreeModelSingleMeasuringEntity<string>()
DeviceType = $"{data.DeviceType}", {
ProjectId = $"{data.ProjectId}", SystemName = _applicationOptions.SystemType,
DataType = IOTDBDataTypeConst.Status, DeviceId = $"{data.DeviceId}",
Timestamps = timestamps, DeviceType = $"{data.DeviceType}",
SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty) ProjectId = $"{data.ProjectId}",
}; DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps,
SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty)
};
await _dbProvider.GetSessionPool(false).InsertAsync(treeFrameData);
await _dbProvider.GetSessionPool(false).InsertAsync(treeFrameData); // 时间
var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<DateTime>()
// 时间 {
var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<DateTime>() SystemName = _applicationOptions.SystemType,
{ DeviceId = $"{data.DeviceId}",
SystemName = _applicationOptions.SystemType, DeviceType = $"{data.DeviceType}",
DeviceId = $"{data.DeviceId}", ProjectId = $"{data.ProjectId}",
DeviceType = $"{data.DeviceType}", Timestamps = timestamps,
ProjectId = $"{data.ProjectId}", DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps, SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now)
DataType = IOTDBDataTypeConst.Status, };
SingleMeasuring = (ConcentratorStatusFieldConst.RecordingTime, data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now) await _dbProvider.GetSessionPool(false).InsertAsync(treeRecordingTimeData);
}; }
await _dbProvider.GetSessionPool(true).InsertAsync(treeRecordingTimeData);
// 新建 // 新建
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);
@ -439,42 +441,46 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
if (!item.TimeSpan.HasValue) if (!item.TimeSpan.HasValue)
item.TimeSpan = analysisBaseDto.ReceivedTime; item.TimeSpan = analysisBaseDto.ReceivedTime;
// 类型(心跳，登录，上电，掉电) // 类型(心跳，登录，上电，掉电)
long timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(); if (item.ProjectId > 0)
var treeData = new TreeModelSingleMeasuringEntity<T>()
{ {
SystemName = _applicationOptions.SystemType, long timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds();
DeviceId = $"{item.DeviceId}", var treeData = new TreeModelSingleMeasuringEntity<T>()
DeviceType = $"{item.DeviceType}", {
ProjectId = $"{item.ProjectId}", SystemName = _applicationOptions.SystemType,
DataType = IOTDBDataTypeConst.Status, DeviceId = $"{item.DeviceId}",
Timestamps = timestamps, DeviceType = $"{item.DeviceType}",
SingleMeasuring = (item.FiledName!, item.DataValue!) ProjectId = $"{item.ProjectId}",
}; DataType = IOTDBDataTypeConst.Status,
await _dbProvider.GetSessionPool(false).InsertAsync(treeData); Timestamps = timestamps,
// 数据帧 SingleMeasuring = (item.FiledName!, item.DataValue!)
var treeFrameData = new TreeModelSingleMeasuringEntity<string>() };
{ await _dbProvider.GetSessionPool(false).InsertAsync(treeData);
SystemName = _applicationOptions.SystemType, // 数据帧
DeviceType = $"{item.DeviceType}", var treeFrameData = new TreeModelSingleMeasuringEntity<string>()
ProjectId = $"{item.ProjectId}", {
DataType = IOTDBDataTypeConst.Status, SystemName = _applicationOptions.SystemType,
Timestamps = timestamps, DeviceType = $"{item.DeviceType}",
SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty) ProjectId = $"{item.ProjectId}",
}; DataType = IOTDBDataTypeConst.Status,
Timestamps = timestamps,
SingleMeasuring = (ConcentratorStatusFieldConst.FrameData, analysisBaseDto.ReceivedHexMessage ?? string.Empty)
};
await _dbProvider.GetSessionPool(false).InsertAsync(treeFrameData); await _dbProvider.GetSessionPool(false).InsertAsync(treeFrameData);
// 时间 // 时间
var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<DateTime>() var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<DateTime>()
{ {
SystemName = _applicationOptions.SystemType, SystemName = _applicationOptions.SystemType,
DeviceType = $"{item.DeviceType}", DeviceType = $"{item.DeviceType}",
ProjectId = $"{item.ProjectId}", ProjectId = $"{item.ProjectId}",
DataType = IOTDBDataTypeConst.Status, 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)
}; };
await _dbProvider.GetSessionPool(false).InsertAsync(treeRecordingTimeData); await _dbProvider.GetSessionPool(false).InsertAsync(treeRecordingTimeData);
}
// 新建 // 新建
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);

820
services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs
View File

@ -42,458 +42,458 @@ namespace JiShe.CollectBus.Subscribers
_protocolService = protocolService; _protocolService = protocolService;
} }
///// <summary> /// <summary>
///// 解析AFN00H /// 解析AFN00H
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN00HReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN00HReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN00Event(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN00Event(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data==null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN01H /// 解析AFN01H
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN01HReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN01HReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN01Event(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN01Event(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN02H /// 解析AFN02H
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN02HReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN02HReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN02Event(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN02Event(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data, (result) => await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data, (result) =>
// { {
// var ssss = (UnitDataAnalysis<AnalysisBaseDto<string>>)result; var ssss = (UnitDataAnalysis<AnalysisBaseDto<string>>)result;
// _logger.LogInformation($"解析AFN02H数据：{ssss.Serialize()}"); _logger.LogInformation($"解析AFN02H数据：{ssss.Serialize()}");
// }); });
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN03H /// 解析AFN03H
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN03HReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN03HReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN03Event(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN03Event(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN04H /// 解析AFN04H
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN04HReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN04HReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN04Event(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN04Event(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN05H /// 解析AFN05H
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN05HReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN05HReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN05Event(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN05Event(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN09H /// 解析AFN09H
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN09HReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN09HReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN09Event(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN09Event(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN0AH /// 解析AFN0AH
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN0AHReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN0AHReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN0AEvent(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN0AEvent(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN0BH /// 解析AFN0BH
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN0BHReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN0BHReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN0BEvent(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN0BEvent(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN0CH /// 解析AFN0CH
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN0CHReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN0CHReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN0CEvent(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN0CEvent(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN0DH /// 解析AFN0DH
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN0DHReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN0DHReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN0DEvent(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN0DEvent(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
///// <summary> /// <summary>
///// 解析AFN0EH /// 解析AFN0EH
///// </summary> /// </summary>
///// <param name="receivedMessage"></param> /// <param name="receivedMessage"></param>
///// <returns></returns> /// <returns></returns>
//[KafkaSubscribe(ProtocolConst.SubscriberAFN0EHReceivedEventNameTemp)] [KafkaSubscribe(ProtocolConst.SubscriberAFN0EHReceivedEventNameTemp)]
//public async Task<ISubscribeAck> ReceivedAFN0EEvent(MessageProtocolAnalysis<TB3761> receivedMessage) public async Task<ISubscribeAck> ReceivedAFN0EEvent(MessageProtocolAnalysis<TB3761> receivedMessage)
//{ {
// var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo); var protocolPlugin = await _protocolService.GetProtocolServiceAsync(receivedMessage.DeviceNo);
// if (protocolPlugin == null) if (protocolPlugin == null)
// { {
// _logger.LogError("协议不存在！"); _logger.LogError("协议不存在！");
// } }
// else else
// { {
// if (receivedMessage.Data == null) if (receivedMessage.Data == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null) if (receivedMessage.Data.DT == null || receivedMessage.Data.AFN_FC == null)
// { {
// Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}"); Logger.LogError($"数据解析失败：{receivedMessage.Serialize()}");
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis"; string serverName = $"AFN{receivedMessage.Data.AFN_FC.AFN}_F{receivedMessage.Data.DT.Fn}_Analysis";
// //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis"); //var analysisStrategy = _serviceProvider.GetKeyedService<IAnalysisStrategy>($"AFN0_F1_Analysis");
// //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761); //var data = await analysisStrategy.ExecuteAsync<UnitDataDto<bool>>(tB3761);
// var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>(); var executor = _serviceProvider.GetRequiredService<AnalysisStrategyContext>();
// await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data); await executor.ExecuteAsync<TB3761>(serverName, receivedMessage.Data);
// return SubscribeAck.Success(); return SubscribeAck.Success();
// } }
// return SubscribeAck.Fail(); return SubscribeAck.Fail();
//} }
/// <summary> /// <summary>

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

@ -141,7 +141,7 @@
} }
}, },
"ServerApplicationOptions": { "ServerApplicationOptions": {
"ServerTagName": "JiSheCollectBus8", "ServerTagName": "JiSheCollectBus99",
"SystemType": "Energy", "SystemType": "Energy",
"FirstCollectionTime": "2025-04-28 15:07:00", "FirstCollectionTime": "2025-04-28 15:07:00",
"AutomaticVerificationTime": "16:07:00", "AutomaticVerificationTime": "16:07:00",