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-16 13:47:54 +08:00
parent 99e19428a1
commit 63a6ace884
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
using GatherService.WattMeter.AnalysisData.AFN_10H; using DeviceDetectorNET.Parser.Device;
using GatherService.WattMeter.AnalysisData.AFN_10H;
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
@ -46,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas); AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas);
// 查询设备信息 // 查询设备信息
DeviceInfo? deviceInfo = await _dataStorage.GetDeviceInfoAsync(input.A.Code, input.DA.Pn); DeviceInfo? deviceInfo = await _dataStorage.GetDeviceInfoAsync(input.A.Code, input.DA.Pn, datas[1]);
if (deviceInfo != null) if (deviceInfo != null)
{ {
data.ProjectId = deviceInfo.ProjectID; data.ProjectId = deviceInfo.ProjectID;
@ -87,8 +88,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
private AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> data) private AnalysisBaseDto<decimal?> GenerateFinalResult(List<string> data)
{ {
AnalysisBaseDto<decimal?> meter = new AnalysisBaseDto<decimal?>(); AnalysisBaseDto<decimal?> meter = new AnalysisBaseDto<decimal?>();
meter.DeviceType = MeterTypeEnum.Ammeter;
var errorCode = data[7].CheckErrorCode(); var errorCode = data[4].CheckErrorCode();
if (errorCode != null) if (errorCode != null)
{ {
meter.ValidData = false; meter.ValidData = false;
@ -96,7 +97,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
} }
else else
{ {
if(decimal.TryParse(data[7], out decimal value)) if(decimal.TryParse(data[4], out decimal value))
meter.DataValue = value; meter.DataValue = value;
} }

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

@ -81,11 +81,11 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
/// <param name="meterType"></param> /// <param name="meterType"></param>
/// <param name="timeDensity"></param> /// <param name="timeDensity"></param>
/// <returns></returns> /// <returns></returns>
public async Task<DeviceInfo?> GetDeviceInfoAsync(string code,int pn=1) public async Task<DeviceInfo?> GetDeviceInfoAsync(string code,int pn=1,string meterAddress=null)
{ {
string redisCacheDeviceInfoHashKey = $"{string.Format(RedisConst.CacheDeviceInfoHashKey, _applicationOptions.SystemType, _applicationOptions.ServerTagName)}"; string redisCacheDeviceInfoHashKey = $"{string.Format(RedisConst.CacheDeviceInfoHashKey, _applicationOptions.SystemType, _applicationOptions.ServerTagName)}";
string deviceKey= $"{code}:{pn}"; string deviceKey= $"{code}:{pn}";
return await _imemoryCache.GetOrCreateAsync(deviceKey, async entry => var deviceInfo= await _imemoryCache.GetOrCreateAsync(deviceKey, async entry =>
{ {
List<DeviceInfo> devices= await Instance.HGetAsync<List<DeviceInfo>>(redisCacheDeviceInfoHashKey, code) ?? new List<DeviceInfo>(); List<DeviceInfo> devices= await Instance.HGetAsync<List<DeviceInfo>>(redisCacheDeviceInfoHashKey, code) ?? new List<DeviceInfo>();
var data = devices.Where(s => s.MeteringCode == pn).FirstOrDefault(); var data = devices.Where(s => s.MeteringCode == pn).FirstOrDefault();
@ -95,6 +95,22 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
entry.SetSlidingExpiration(TimeSpan.FromSeconds(5)); entry.SetSlidingExpiration(TimeSpan.FromSeconds(5));
return data ?? default; return data ?? default;
}); });
if (deviceInfo == null && !string.IsNullOrWhiteSpace(meterAddress))
{
// TODO:透明转发回来的pn为0情况
string deviceAddressKey = $"{code}:{meterAddress}";
deviceInfo = await _imemoryCache.GetOrCreateAsync(deviceAddressKey, async entry =>
{
List<DeviceInfo> devices = await Instance.HGetAsync<List<DeviceInfo>>(redisCacheDeviceInfoHashKey, code) ?? new List<DeviceInfo>();
var data = devices.Where(s => s.MeterAddress == meterAddress).FirstOrDefault();
if (data != null)
entry.SetSlidingExpiration(TimeSpan.FromMinutes(5));
else
entry.SetSlidingExpiration(TimeSpan.FromSeconds(5));
return data ?? default;
});
}
return deviceInfo;
} }
/// <summary> /// <summary>

11
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
View File

@ -19,18 +19,19 @@ namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
try try
{ {
if (data.Count != 2) if (data.Count == 2)
return null; {
var value = string.Join(".", data); var value = string.Join(".", data);
var values= new List<string>() { "电网频率", "10_97", "1", value }; //电网频率
result?.Invoke(values); result?.Invoke(value);
return Task.FromResult(true); return Task.FromResult(true);
} }
}
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, $"Appendix_02800002解析失败:{ex.Message}"); _logger.LogError(ex, $"Appendix_02800002解析失败:{ex.Message}");
}
return Task.FromResult(false); return Task.FromResult(false);
} }
} }
} }
}

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",