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:
Dai Mr 2024-11-08 12:04:28 +08:00
parent 891b2e133d
commit 7d5147e20b
3 changed files with 240 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
JiShe.CollectBus.Common/Extensions/StringExtensions.cs
View File

@ -1201,7 +1201,7 @@ namespace JiShe.CollectBus.Common.Extensions
/// </summary> /// </summary>
/// <param name="str"></param> /// <param name="str"></param>
/// <returns></returns> /// <returns></returns>
public static bool IsEE(this string str) public static bool IsErrorData(this string str)
{ {
if (str == "EE") if (str == "EE")
return true; return true;

314
JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs
View File

@ -5,6 +5,7 @@ using JiShe.CollectBus.Protocol.Contracts.Interfaces;
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Contracts.Models;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Net.Sockets; using System.Net.Sockets;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace JiShe.CollectBus.Protocol.Contracts.Abstracts namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
{ {
@ -56,7 +57,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
Pn = 0, Pn = 0,
Fn = 1 Fn = 1
}; };
var bytes = GetCommandBytes(reqParam); var bytes = BuildSendCommandBytes(reqParam);
if (sendAction != null) if (sendAction != null)
{ {
sendAction(bytes); sendAction(bytes);
@ -98,7 +99,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
Pn = 0, Pn = 0,
Fn = 1 Fn = 1
}; };
var bytes = GetCommandBytes(reqParam); var bytes = BuildSendCommandBytes(reqParam);
if (sendAction != null) if (sendAction != null)
{ {
sendAction(bytes); sendAction(bytes);
@ -107,11 +108,11 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
} }
/// <summary> /// <summary>
/// 确认或否认 /// 解析确认或否认数据
/// </summary> /// </summary>
/// <param name=""></param> /// <param name=""></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task GetAnswerAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeAnswerDataAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null)
{ {
var hexStringList = messageReceivedEvent.MessageHexString.StringToPairs(); var hexStringList = messageReceivedEvent.MessageHexString.StringToPairs();
var fn = hexStringList.GetAnalyzeValue(CommandChunkEnum.FN); var fn = hexStringList.GetAnalyzeValue(CommandChunkEnum.FN);
@ -122,12 +123,12 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
} }
/// <summary> /// <summary>
/// 电表档案解析 /// 解析电表档案读取数据
/// </summary> /// </summary>
/// <param name="messageReceivedEvent"></param> /// <param name="messageReceivedEvent"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task GetAmmeterParameterAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeAmmeterParameterReadingDataAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString); var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString);
@ -202,12 +203,12 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
} }
/// <summary> /// <summary>
/// 当前正向有功电能示值 /// 解析当前正向有功电能示值抄读数据
/// </summary> /// </summary>
/// <param name="messageReceivedEvent">报文</param> /// <param name="messageReceivedEvent">报文</param>
/// <param name="sendAction">发送委托</param> /// <param name="sendAction">发送委托</param>
/// <returns></returns> /// <returns></returns>
public virtual async Task GetActivePowerIndicationAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeActivePowerIndicationReadingDataAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString); var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString);
@ -232,14 +233,14 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
index += 5; index += 5;
} }
} }
/// <summary> /// <summary>
/// 日冻结正向有功电能示值 /// 解析日冻结正向有功电能示值抄读数据
/// </summary> /// </summary>
/// <param name="messageReceivedEvent"></param> /// <param name="messageReceivedEvent"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task GetDailyFrozenAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeDailyFrozenReadingDataAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString); var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString);
//附录A.20 日月年 //附录A.20 日月年
@ -248,10 +249,14 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
var readingTimeHex = hexDatas.Skip(3).Take(5).ToList(); var readingTimeHex = hexDatas.Skip(3).Take(5).ToList();
var rateNumberHex = hexDatas.Skip(8).Take(1).FirstOrDefault().HexToDec(); var rateNumberHex = hexDatas.Skip(8).Take(1).FirstOrDefault().HexToDec();
var datas = new List<decimal>();
//附录A.14 kWh 5字节 //附录A.14 kWh 5字节
for (int i = 0; i < rateNumberHex; i++) for (int i = 0; i < rateNumberHex; i++)
{ {
var skipCount = 9 + i * 5;
var dataHexs = hexDatas.Skip(skipCount).Take(5).ToList();
var data = AnalyzeDataAccordingToA14(dataHexs[0], dataHexs[1], dataHexs[2], dataHexs[3], dataHexs[4]);
datas.Add(data);
} }
} }
@ -299,96 +304,96 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceivedEvent"></param> /// <param name="messageReceivedEvent"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task GetF25Async(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeF25ReadingDataAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString); var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString);
//A.15 分时日月年 //A.15 分时日月年
var readingTimeHex = hexDatas.Take(5).ToList(); var readingTimeHex = hexDatas.Take(5).ToList();
var readingTime = AnalysisA15(readingTimeHex[0], readingTimeHex[1], readingTimeHex[2], readingTimeHex[3], readingTimeHex[4]); var readingTime = AnalyzeDataAccordingToA15(readingTimeHex[0], readingTimeHex[1], readingTimeHex[2], readingTimeHex[3], readingTimeHex[4]);
//A.9 kW //A.9 kW
var crntTotalActivePowerHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalActivePower).Take(3).ToList(); var crntTotalActivePowerHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalActivePower).Take(3).ToList();
var crntTotalActivePower = AnalysisA09(crntTotalActivePowerHexs[0], crntTotalActivePowerHexs[1], crntTotalActivePowerHexs[2]); var crntTotalActivePower = AnalyzeDataAccordingToA09(crntTotalActivePowerHexs[0], crntTotalActivePowerHexs[1], crntTotalActivePowerHexs[2]);
var crntActivePowerOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntActivePowerOfA).Take(3).ToList(); var crntActivePowerOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntActivePowerOfA).Take(3).ToList();
var crntActivePowerOfA = AnalysisA09(crntActivePowerOfAHexs[0], crntActivePowerOfAHexs[1], crntActivePowerOfAHexs[2]); var crntActivePowerOfA = AnalyzeDataAccordingToA09(crntActivePowerOfAHexs[0], crntActivePowerOfAHexs[1], crntActivePowerOfAHexs[2]);
var crntActivePowerOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntActivePowerOfB).Take(3).ToList(); var crntActivePowerOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntActivePowerOfB).Take(3).ToList();
var crntActivePowerOfB = AnalysisA09(crntActivePowerOfBHexs[0], crntActivePowerOfBHexs[1], crntActivePowerOfBHexs[2]); var crntActivePowerOfB = AnalyzeDataAccordingToA09(crntActivePowerOfBHexs[0], crntActivePowerOfBHexs[1], crntActivePowerOfBHexs[2]);
var crntActivePowerOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntActivePowerOfC).Take(3).ToList(); var crntActivePowerOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntActivePowerOfC).Take(3).ToList();
var crntActivePowerOfC = AnalysisA09(crntActivePowerOfCHexs[0], crntActivePowerOfCHexs[1], crntActivePowerOfCHexs[2]); var crntActivePowerOfC = AnalyzeDataAccordingToA09(crntActivePowerOfCHexs[0], crntActivePowerOfCHexs[1], crntActivePowerOfCHexs[2]);
var crntTotalReactivePowerHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalReactivePower).Take(3).ToList(); var crntTotalReactivePowerHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalReactivePower).Take(3).ToList();
var crntTotalReactivePower = AnalysisA09(crntTotalReactivePowerHexs[0], crntTotalReactivePowerHexs[1], crntTotalReactivePowerHexs[2]); var crntTotalReactivePower = AnalyzeDataAccordingToA09(crntTotalReactivePowerHexs[0], crntTotalReactivePowerHexs[1], crntTotalReactivePowerHexs[2]);
var crntReactivePowerOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntReactivePowerOfA).Take(3).ToList(); var crntReactivePowerOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntReactivePowerOfA).Take(3).ToList();
var crntReactivePowerOfA = AnalysisA09(crntReactivePowerOfAHexs[0], crntReactivePowerOfAHexs[1], crntReactivePowerOfAHexs[2]); var crntReactivePowerOfA = AnalyzeDataAccordingToA09(crntReactivePowerOfAHexs[0], crntReactivePowerOfAHexs[1], crntReactivePowerOfAHexs[2]);
var crntReactivePowerOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntReactivePowerOfB).Take(3).ToList(); var crntReactivePowerOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntReactivePowerOfB).Take(3).ToList();
var crntReactivePowerOfB = AnalysisA09(crntReactivePowerOfBHexs[0], crntReactivePowerOfBHexs[1], crntReactivePowerOfBHexs[2]); var crntReactivePowerOfB = AnalyzeDataAccordingToA09(crntReactivePowerOfBHexs[0], crntReactivePowerOfBHexs[1], crntReactivePowerOfBHexs[2]);
var crntReactivePowerOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntReactivePowerOfC).Take(2).ToList(); var crntReactivePowerOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntReactivePowerOfC).Take(2).ToList();
var crntReactivePowerOfC = AnalysisA09(crntReactivePowerOfCHexs[0], crntReactivePowerOfCHexs[1], crntReactivePowerOfCHexs[2]); var crntReactivePowerOfC = AnalyzeDataAccordingToA09(crntReactivePowerOfCHexs[0], crntReactivePowerOfCHexs[1], crntReactivePowerOfCHexs[2]);
//A.5 % //A.5 %
var crntTotalPowerFactorHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalPowerFactor).Take(2).ToList(); var crntTotalPowerFactorHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalPowerFactor).Take(2).ToList();
var crntTotalPowerFactor = AnalysisA05(crntTotalPowerFactorHexs[0], crntTotalPowerFactorHexs[1]); var crntTotalPowerFactor = AnalyzeDataAccordingToA05(crntTotalPowerFactorHexs[0], crntTotalPowerFactorHexs[1]);
var crntPowerFactorOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntPowerFactorOfA).Take(2).ToList(); var crntPowerFactorOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntPowerFactorOfA).Take(2).ToList();
var crntPowerFactorOfA = AnalysisA05(crntPowerFactorOfAHexs[0], crntPowerFactorOfAHexs[1]); var crntPowerFactorOfA = AnalyzeDataAccordingToA05(crntPowerFactorOfAHexs[0], crntPowerFactorOfAHexs[1]);
var crntPowerFactorOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntPowerFactorOfB).Take(2).ToList(); var crntPowerFactorOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntPowerFactorOfB).Take(2).ToList();
var crntPowerFactorOfB = AnalysisA05(crntPowerFactorOfBHexs[0], crntPowerFactorOfBHexs[1]); var crntPowerFactorOfB = AnalyzeDataAccordingToA05(crntPowerFactorOfBHexs[0], crntPowerFactorOfBHexs[1]);
var crntPowerFactorOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntPowerFactorOfC).Take(2).ToList(); var crntPowerFactorOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntPowerFactorOfC).Take(2).ToList();
var crntPowerFactorOfC = AnalysisA05(crntPowerFactorOfCHexs[0], crntPowerFactorOfCHexs[1]); var crntPowerFactorOfC = AnalyzeDataAccordingToA05(crntPowerFactorOfCHexs[0], crntPowerFactorOfCHexs[1]);
//A.7 V //A.7 V
var crntVoltageOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntVoltageOfA).Take(2).ToList(); var crntVoltageOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntVoltageOfA).Take(2).ToList();
var crntVoltageOfA = AnalysisA07(crntVoltageOfAHexs[0], crntVoltageOfAHexs[1]); var crntVoltageOfA = AnalyzeDataAccordingToA07(crntVoltageOfAHexs[0], crntVoltageOfAHexs[1]);
var crntVoltageOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntVoltageOfB).Take(2).ToList(); var crntVoltageOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntVoltageOfB).Take(2).ToList();
var crntVoltageOfB = AnalysisA07(crntVoltageOfBHexs[0], crntVoltageOfBHexs[1]); var crntVoltageOfB = AnalyzeDataAccordingToA07(crntVoltageOfBHexs[0], crntVoltageOfBHexs[1]);
var crntVoltageOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntVoltageOfC).Take(2).ToList(); var crntVoltageOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntVoltageOfC).Take(2).ToList();
var crntVoltageOfC = AnalysisA07(crntVoltageOfCHexs[0], crntVoltageOfCHexs[1]); var crntVoltageOfC = AnalyzeDataAccordingToA07(crntVoltageOfCHexs[0], crntVoltageOfCHexs[1]);
//A.25 A //A.25 A
var crntCurrentOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntCurrentOfA).Take(3).ToList(); var crntCurrentOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntCurrentOfA).Take(3).ToList();
var crntCurrentOfA = AnalysisA25(crntCurrentOfAHexs[0], crntCurrentOfAHexs[1], crntCurrentOfAHexs[2]); var crntCurrentOfA = AnalyzeDataAccordingToA25(crntCurrentOfAHexs[0], crntCurrentOfAHexs[1], crntCurrentOfAHexs[2]);
var crntCurrentOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntCurrentOfB).Take(3).ToList(); var crntCurrentOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntCurrentOfB).Take(3).ToList();
var crntCurrentOfB = AnalysisA25(crntCurrentOfBHexs[0], crntCurrentOfBHexs[1], crntCurrentOfBHexs[2]); var crntCurrentOfB = AnalyzeDataAccordingToA25(crntCurrentOfBHexs[0], crntCurrentOfBHexs[1], crntCurrentOfBHexs[2]);
var crntCurrentOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntCurrentOfC).Take(3).ToList(); var crntCurrentOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntCurrentOfC).Take(3).ToList();
var crntCurrentOfC = AnalysisA25(crntCurrentOfCHexs[0], crntCurrentOfCHexs[1], crntCurrentOfCHexs[2]); var crntCurrentOfC = AnalyzeDataAccordingToA25(crntCurrentOfCHexs[0], crntCurrentOfCHexs[1], crntCurrentOfCHexs[2]);
var crntZeroSequenceCurrentHexs = hexDatas.Skip((int)F25DataItemEnum.CrntZeroSequenceCurrent).Take(3).ToList(); var crntZeroSequenceCurrentHexs = hexDatas.Skip((int)F25DataItemEnum.CrntZeroSequenceCurrent).Take(3).ToList();
var crntZeroSequenceCurrent = AnalysisA25(crntZeroSequenceCurrentHexs[0], crntZeroSequenceCurrentHexs[1], crntZeroSequenceCurrentHexs[2]); var crntZeroSequenceCurrent = AnalyzeDataAccordingToA25(crntZeroSequenceCurrentHexs[0], crntZeroSequenceCurrentHexs[1], crntZeroSequenceCurrentHexs[2]);
//A.9 kVA //A.9 kVA
var crntTotalApparentPowerHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalApparentPower).Take(3).ToList(); var crntTotalApparentPowerHexs = hexDatas.Skip((int)F25DataItemEnum.CrntTotalApparentPower).Take(3).ToList();
var crntTotalApparentPower = AnalysisA09(crntTotalApparentPowerHexs[0], crntTotalApparentPowerHexs[1], crntTotalApparentPowerHexs[2]); var crntTotalApparentPower = AnalyzeDataAccordingToA09(crntTotalApparentPowerHexs[0], crntTotalApparentPowerHexs[1], crntTotalApparentPowerHexs[2]);
var crntApparentPowerOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntApparentPowerOfA).Take(3).ToList(); var crntApparentPowerOfAHexs = hexDatas.Skip((int)F25DataItemEnum.CrntApparentPowerOfA).Take(3).ToList();
var crntApparentPowerOfA = AnalysisA09(crntApparentPowerOfAHexs[0], crntApparentPowerOfAHexs[1], crntApparentPowerOfAHexs[2]); var crntApparentPowerOfA = AnalyzeDataAccordingToA09(crntApparentPowerOfAHexs[0], crntApparentPowerOfAHexs[1], crntApparentPowerOfAHexs[2]);
var crntApparentPowerOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntApparentPowerOfB).Take(3).ToList(); var crntApparentPowerOfBHexs = hexDatas.Skip((int)F25DataItemEnum.CrntApparentPowerOfB).Take(3).ToList();
var crntApparentPowerOfB = AnalysisA09(crntApparentPowerOfBHexs[0], crntApparentPowerOfBHexs[1], crntApparentPowerOfBHexs[2]); var crntApparentPowerOfB = AnalyzeDataAccordingToA09(crntApparentPowerOfBHexs[0], crntApparentPowerOfBHexs[1], crntApparentPowerOfBHexs[2]);
var crntApparentPowerOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntApparentPowerOfC).Take(3).ToList(); var crntApparentPowerOfCHexs = hexDatas.Skip((int)F25DataItemEnum.CrntApparentPowerOfC).Take(3).ToList();
var crntApparentPowerOfC = AnalysisA09(crntApparentPowerOfCHexs[0], crntApparentPowerOfCHexs[1], crntApparentPowerOfCHexs[2]); var crntApparentPowerOfC = AnalyzeDataAccordingToA09(crntApparentPowerOfCHexs[0], crntApparentPowerOfCHexs[1], crntApparentPowerOfCHexs[2]);
} }
/// <summary> /// <summary>
/// 透明转发 命令 应答 /// 解析透明转发 应答结果
/// </summary> /// </summary>
/// <param name="messageReceivedEvent"></param> /// <param name="messageReceivedEvent"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task GetTransparentForwardingResultAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeTransparentForwardingAnswerResultAsync(MessageReceivedHeartbeatEvent messageReceivedEvent, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString); var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString);
@ -401,7 +406,12 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
var transparentForwardingFlag = (TransparentForwardingFlagEnum)result; var transparentForwardingFlag = (TransparentForwardingFlagEnum)result;
} }
private static List<string> GetHexDatas(string messageHexString) /// <summary>
/// 获取命令数据单元-数据体
/// </summary>
/// <param name="messageHexString"></param>
/// <returns></returns>
public static List<string> GetHexDatas(string messageHexString)
{ {
var hexStringList = messageHexString.StringToPairs(); var hexStringList = messageHexString.StringToPairs();
var hexDatas = (List<string>)hexStringList.GetAnalyzeValue(CommandChunkEnum.Data); var hexDatas = (List<string>)hexStringList.GetAnalyzeValue(CommandChunkEnum.Data);
@ -412,7 +422,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// 解析时间标签 /// 解析时间标签
/// </summary> /// </summary>
/// <param name="hexDatas"></param> /// <param name="hexDatas"></param>
private void AnalysisTp(List<string> hexDatas) public void AnalysisTp(List<string> hexDatas)
{ {
var pFC = hexDatas[0].HexToDec();//启动帧帧序号计数器 var pFC = hexDatas[0].HexToDec();//启动帧帧序号计数器
var seconds = Convert.ToInt32(hexDatas[1]); // 获取当前秒数 var seconds = Convert.ToInt32(hexDatas[1]); // 获取当前秒数
@ -422,15 +432,17 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
var delayTime = hexDatas[5].HexToDec();//延迟时间 min var delayTime = hexDatas[5].HexToDec();//延迟时间 min
} }
#region 报文指定的数据格式
/// <summary> /// <summary>
/// 数据格式05 /// 根据A05解析数据
/// </summary> /// </summary>
/// <param name="singleDigitNumberAndDeciles">个位和十分位</param> /// <param name="singleDigitNumberAndDeciles">个位和十分位</param>
/// <param name="hundredDigitNumbersAndTenDigitNumber">百位和十位</param> /// <param name="hundredDigitNumbersAndTenDigitNumber">百位和十位</param>
/// <returns></returns> /// <returns></returns>
private decimal AnalysisA05(string singleDigitNumberAndDeciles, string hundredDigitNumbersAndTenDigitNumber) public decimal AnalyzeDataAccordingToA05(string singleDigitNumberAndDeciles, string hundredDigitNumbersAndTenDigitNumber)
{ {
if (singleDigitNumberAndDeciles.IsEE() && hundredDigitNumbersAndTenDigitNumber.IsEE()) if (singleDigitNumberAndDeciles.IsErrorData() && hundredDigitNumbersAndTenDigitNumber.IsErrorData())
{ {
return 0; return 0;
} }
@ -438,7 +450,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
var hundredDigitNumbers = bin1.Substring(1, 3).BinToDec();//百位 var hundredDigitNumbers = bin1.Substring(1, 3).BinToDec();//百位
var tenDigitNumber = bin1.Substring(4).BinToDec();//十位 var tenDigitNumber = bin1.Substring(4).BinToDec();//十位
var bin2 = singleDigitNumberAndDeciles.HexToBin().PadLeft(8,'0'); var bin2 = singleDigitNumberAndDeciles.HexToBin().PadLeft(8, '0');
var singleDigitNumber = bin1.Substring(0, 4).BinToDec();//个位 var singleDigitNumber = bin1.Substring(0, 4).BinToDec();//个位
var deciles = bin1.Substring(4).BinToDec();//十分位 var deciles = bin1.Substring(4).BinToDec();//十分位
@ -452,9 +464,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="singleDigitNumberAndDeciles">个位、十分位</param> /// <param name="singleDigitNumberAndDeciles">个位、十分位</param>
/// <param name="hundredDigitNumbersAndTenDigitNumber">百位、十位</param> /// <param name="hundredDigitNumbersAndTenDigitNumber">百位、十位</param>
/// <returns></returns> /// <returns></returns>
private decimal AnalysisA07(string singleDigitNumberAndDeciles,string hundredDigitNumbersAndTenDigitNumber) public decimal AnalyzeDataAccordingToA07(string singleDigitNumberAndDeciles, string hundredDigitNumbersAndTenDigitNumber)
{ {
if (singleDigitNumberAndDeciles.IsEE() && hundredDigitNumbersAndTenDigitNumber.IsEE()) if (singleDigitNumberAndDeciles.IsErrorData() && hundredDigitNumbersAndTenDigitNumber.IsErrorData())
{ {
return 0; return 0;
} }
@ -477,9 +489,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="decilesAndPercentile">十分位和百分位</param> /// <param name="decilesAndPercentile">十分位和百分位</param>
/// <param name="tenAndSingleDigit">十位和个位</param> /// <param name="tenAndSingleDigit">十位和个位</param>
/// <returns></returns> /// <returns></returns>
private decimal AnalysisA09(string thousandthPercentileAndTenThousandPositions, string decilesAndPercentile, string tenAndSingleDigit) public decimal AnalyzeDataAccordingToA09(string thousandthPercentileAndTenThousandPositions, string decilesAndPercentile, string tenAndSingleDigit)
{ {
if (thousandthPercentileAndTenThousandPositions.IsEE() && decilesAndPercentile.IsEE() && tenAndSingleDigit.IsEE()) if (thousandthPercentileAndTenThousandPositions.IsErrorData() && decilesAndPercentile.IsErrorData() && tenAndSingleDigit.IsErrorData())
{ {
return 0; return 0;
} }
@ -499,11 +511,11 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
//var deciles = bin2.Substring(0, 4).BinToDec();//十分位 //var deciles = bin2.Substring(0, 4).BinToDec();//十分位
//var percentile = bin2.Substring(4).BinToDec();//百分位 //var percentile = bin2.Substring(4).BinToDec();//百分位
} }
/// <summary> /// <summary>
/// 数据格式12 TODO:待优化 /// 数据格式12
/// </summary> /// </summary>
/// <param name="tenDigitAndSingleDigitNumber">十位 个位</param> /// <param name="tenDigitAndSingleDigitNumber">十位 个位</param>
/// <param name="thousandAndHundredsOfPosition">千位 百位</param> /// <param name="thousandAndHundredsOfPosition">千位 百位</param>
@ -512,9 +524,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="hundredMillionAndBillionOfPosition">十亿位 亿位</param> /// <param name="hundredMillionAndBillionOfPosition">十亿位 亿位</param>
/// <param name="hundredBillionsAndBillionsOfPosition">千亿位 百亿位</param> /// <param name="hundredBillionsAndBillionsOfPosition">千亿位 百亿位</param>
/// <returns></returns> /// <returns></returns>
private string AnalysisA12(string tenDigitAndSingleDigitNumber, string thousandAndHundredsOfPosition, string hundredThousandAndTenThousandOfPosition, public string AnalyzeDataAccordingToA12(string tenDigitAndSingleDigitNumber, string thousandAndHundredsOfPosition, string hundredThousandAndTenThousandOfPosition,
string millionsAndMillionOfPosition, string hundredMillionAndBillionOfPosition, string hundredBillionsAndBillionsOfPosition) string millionsAndMillionOfPosition, string hundredMillionAndBillionOfPosition, string hundredBillionsAndBillionsOfPosition)
{ {
var value = $"{hundredBillionsAndBillionsOfPosition}{hundredMillionAndBillionOfPosition}{millionsAndMillionOfPosition}" + var value = $"{hundredBillionsAndBillionsOfPosition}{hundredMillionAndBillionOfPosition}{millionsAndMillionOfPosition}" +
$"{hundredThousandAndTenThousandOfPosition}{thousandAndHundredsOfPosition}{tenDigitAndSingleDigitNumber}"; $"{hundredThousandAndTenThousandOfPosition}{thousandAndHundredsOfPosition}{tenDigitAndSingleDigitNumber}";
@ -530,11 +542,11 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="thousandAndHundredsOfPosition">千位、百位</param> /// <param name="thousandAndHundredsOfPosition">千位、百位</param>
/// <param name="hundredThousandAndTenThousandOfPosition">十万位、万位</param> /// <param name="hundredThousandAndTenThousandOfPosition">十万位、万位</param>
/// <returns></returns> /// <returns></returns>
private decimal AnalysisA14(string tenThousandPositionsAndThousandthPercentile, string decilesAndPercentile, public decimal AnalyzeDataAccordingToA14(string tenThousandPositionsAndThousandthPercentile, string decilesAndPercentile,
string tenDigitNumberAndSingleDigitNumber, string thousandAndHundredsOfPosition, string hundredThousandAndTenThousandOfPosition) string tenDigitNumberAndSingleDigitNumber, string thousandAndHundredsOfPosition, string hundredThousandAndTenThousandOfPosition)
{ {
if (tenThousandPositionsAndThousandthPercentile.IsEE() && decilesAndPercentile.IsEE() && tenDigitNumberAndSingleDigitNumber.IsEE() if (tenThousandPositionsAndThousandthPercentile.IsErrorData() && decilesAndPercentile.IsErrorData() && tenDigitNumberAndSingleDigitNumber.IsErrorData()
&& thousandAndHundredsOfPosition.IsEE() && hundredThousandAndTenThousandOfPosition.IsEE()) && thousandAndHundredsOfPosition.IsErrorData() && hundredThousandAndTenThousandOfPosition.IsErrorData())
return 0; return 0;
var value = decimal.Parse($"{hundredThousandAndTenThousandOfPosition}{thousandAndHundredsOfPosition}" + var value = decimal.Parse($"{hundredThousandAndTenThousandOfPosition}{thousandAndHundredsOfPosition}" +
@ -552,8 +564,8 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="monthHex"></param> /// <param name="monthHex"></param>
/// <param name="yearHex"></param> /// <param name="yearHex"></param>
/// <returns></returns> /// <returns></returns>
private DateTime AnalysisA15(string minuteHex, string hourHex, string dayHex, string monthHex, string yearHex) public DateTime AnalyzeDataAccordingToA15(string minuteHex, string hourHex, string dayHex, string monthHex, string yearHex)
{ {
var centuryString = (DateTime.Now.Year / 100).ToString(); var centuryString = (DateTime.Now.Year / 100).ToString();
var time = DateTime.Parse($"{centuryString}{yearHex}-{monthHex}-{dayHex} {hourHex}:{minuteHex}:00"); var time = DateTime.Parse($"{centuryString}{yearHex}-{monthHex}-{dayHex} {hourHex}:{minuteHex}:00");
return time; return time;
@ -588,28 +600,14 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="monthHex"></param> /// <param name="monthHex"></param>
/// <param name="yearHex"></param> /// <param name="yearHex"></param>
/// <returns></returns> /// <returns></returns>
private DateTime AnalysisA20(string dayHex, string monthHex, string yearHex) public DateTime AnalyzeDataAccordingToA20(string dayHex, string monthHex, string yearHex)
{ {
var centuryString = (DateTime.Now.Year / 100).ToString(); var centuryString = (DateTime.Now.Year / 100).ToString();
var time = DateTime.Parse($"{centuryString}{yearHex}-{monthHex}-{dayHex}"); var time = DateTime.Parse($"{centuryString}{yearHex}-{monthHex}-{dayHex}");
return time; return time;
//var bin1 = hex1.HexToBin().PadLeft(8, '0');
//var tenDigitNumberOfYear = bin1.Substring(0, 4).BinToDec();//十位
//var singleDigitNumberOfYear = bin1.Substring(4).BinToDec();//个位
//var bin2 = hex2.HexToBin().PadLeft(8, '0');
//var tenDigitNumberOfMonth = bin2.Substring(0, 4).BinToDec();//十位
//var singleDigitNumberOfMonth = bin2.Substring(4).BinToDec();//个位
//var bin3 = hex3.HexToBin().PadLeft(8, '0');
//var tenDigitNumberOfDay = bin3.Substring(0, 4).BinToDec();//十位
//var singleDigitNumberOfDay = bin3.Substring(4).BinToDec();//个位
} }
/// <summary> /// <summary>
/// 数据格式25 /// 数据格式25
/// </summary> /// </summary>
@ -618,9 +616,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="hundredDigitNumbersAndTenDigitNumber">百位、十位</param> /// <param name="hundredDigitNumbersAndTenDigitNumber">百位、十位</param>
/// <returns></returns> /// <returns></returns>
private decimal AnalysisA25(string percentileAndThousandthPercentile,string singleDigitNumberAndDeciles, string hundredDigitNumbersAndTenDigitNumber) public decimal AnalyzeDataAccordingToA25(string percentileAndThousandthPercentile, string singleDigitNumberAndDeciles, string hundredDigitNumbersAndTenDigitNumber)
{ {
if (percentileAndThousandthPercentile.IsEE() && singleDigitNumberAndDeciles.IsEE() && hundredDigitNumbersAndTenDigitNumber.IsEE()) if (percentileAndThousandthPercentile.IsErrorData() && singleDigitNumberAndDeciles.IsErrorData() && hundredDigitNumbersAndTenDigitNumber.IsErrorData())
return 0; return 0;
var bin1 = hundredDigitNumbersAndTenDigitNumber.HexToBin().PadLeft(8, '0'); var bin1 = hundredDigitNumbersAndTenDigitNumber.HexToBin().PadLeft(8, '0');
@ -636,10 +634,172 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
return value; return value;
} }
#endregion
#region 通用解析 #region 下行命令
public byte[] GetCommandBytes(ReqParameter reqParameter, List<string>? dataUnit = null) /// <summary>
/// 构建电表参数设置-下发命令
/// </summary>
/// <param name="reqParameter"></param>
/// <param name="meterParameters"></param>
/// <returns></returns>
public byte[] BuildAmmeterParameterSetSendCmd(ReqParameter reqParameter, List<AmmeterParameter> meterParameters)
{
var dataUnit = BuildAmmeterParameterSendDataUnit(meterParameters);
var bytes = BuildSendCommandBytes(reqParameter, dataUnit);
return bytes;
}
/// <summary>
/// 构建电表参数读取-下发命令
/// </summary>
/// <param name="reqParameter"></param>
/// <param name="meterNumberList">对象序号</param>
public void BuildAmmeterParameterReadingSendCmd(ReqParameter reqParameter, List<int> meterNumberList)
{
var dataUnit = new List<string>();
var countHex = meterNumberList.Count().DecToHex().PadLeft(4, '0');
var countHexPairs = countHex.StringToPairs();
countHexPairs.Reverse();
dataUnit.AddRange(countHexPairs);
foreach (var number in meterNumberList)
{
var numberHex = number.DecToHex().PadLeft(4, '0');
var numberHexPairs = numberHex.StringToPairs();
numberHexPairs.Reverse();
dataUnit.AddRange(numberHexPairs);
}
var bytes = BuildSendCommandBytes(reqParameter, dataUnit);
}
/// <summary>
/// 构建电表参数设置-下发数据单元
/// </summary>
/// <param name="meterParameters"></param>
/// <returns></returns>
public List<string> BuildAmmeterParameterSendDataUnit(List<AmmeterParameter> meterParameters)
{
var hexDatas = new List<string>();
var countHex = meterParameters.Count().DecToHex().PadLeft(4, '0');
hexDatas.Add(countHex);
//TODO 优化代码：目标数据入参，返回类型为出参
for (int i = 0; i <= meterParameters.Count - 1; i++)
{
var meter = meterParameters[i];
var indexHex = (i + 1).DecToHex().PadLeft(4, '0');
hexDatas.Add(indexHex);
var pnHex = meter.Pn.DecToHex().PadLeft(4, '0');
hexDatas.Add(pnHex);
var baudRateBin = meter.BaudRate.DecToBin().PadLeft(3, '0');
var portBin = meter.Port.DecToBin().PadLeft(5, '0');
var baudRateAndPortHex = $"{baudRateBin}{portBin}".BinToHex().PadLeft(2, '0');
hexDatas.Add(baudRateAndPortHex);
var protocolTypeHex = ((int)meter.ProtocolType).DecToHex().PadLeft(2, '0');
hexDatas.Add(protocolTypeHex);
hexDatas.Add(meter.Address);
hexDatas.Add(meter.Password.PadLeft(12, '0'));
var rateNumberBin = $"0000{meter.RateNumber.DecToBin().PadLeft(4, '0')}";
var rateNumberHex = rateNumberBin.BinToHex().PadLeft(2, '0');
hexDatas.Add(rateNumberHex);
var intBitNumberBin = (meter.IntegerBitNumber - 4).DecToBin().PadLeft(2, '0');
var decBitNumberBin = (meter.DecimalBitNumber - 1).DecToBin().PadLeft(2, '0');
var intAndDecBitNumberBin = $"0000{intBitNumberBin}{decBitNumberBin}";
var intAndDecBitNumberHex = intAndDecBitNumberBin.BinToHex().PadLeft(2, '0');
hexDatas.Add(intAndDecBitNumberHex);
hexDatas.Add(meter.CollectorAddress.PadLeft(12, '0'));
var userCategoryNumberBin = meter.UserCategoryNumber.DecToBin().PadLeft(4, '0');
var userSubclassNumberBin = meter.UserSubclassNumber.DecToBin().PadLeft(4, '0');
var userNumberHex = $"{userCategoryNumberBin}{userSubclassNumberBin}".BinToHex().PadLeft(2, '0');
hexDatas.Add(userNumberHex);
}
//高位在前，低位在后
var datas = new List<string>();
foreach (var hexData in hexDatas)
{
if (hexData.Length == 2)
datas.Add(hexData);
else
{
var lst = hexData.StringToPairs();
lst.Reverse();
datas.AddRange(lst);
}
}
datas.AddRange(GetPW());
return datas;
}
/// <summary>
/// 构建透明转发-下发数据单元
/// </summary>
/// <param name="port">终端通信端口 1~31</param>
/// <param name="baudRate">0~7 对应300,600,1200,2400,4800,7200,9600,19200</param>
/// <param name="stopBit"></param>
/// <param name="parity"></param>
/// <param name="dataBit"></param>
/// <returns></returns>
public List<string> BuildTransparentForwardingSendDataUnit(int port, BaudRate baudRate, StopBit stopBit, Parity parity, DataBit dataBit,
int waitContentTimeout, int waitByteTimeout, List<string> datas)
{
var dataUnit = new List<string>();
var portHex = port.DecToHex().PadLeft(2, '0');
dataUnit.Add(portHex);
var baudRateBin = ((int)baudRate).DecToBin().PadLeft(3, '0');
var stopBitBin = ((int)stopBit).DecToBin();
var parityBin = parity != Parity.None ? $"1{((int)parity).DecToBin()}" : $"0{((int)parity).DecToBin()}";
var dataBitBin = ((int)dataBit).DecToBin().PadLeft(2, '0');
var controlHex = $"{baudRateBin}{stopBitBin}{parityBin}{dataBitBin}".BinToHex().PadLeft(2, '0'); ;
dataUnit.Add(controlHex);
var waitContentTimeoutBin = $"1{waitContentTimeout.DecToBin().PadLeft(7, '0')}";
var waitContentTimeoutHex = waitContentTimeoutBin.BinToHex().PadLeft(2, '0');
var waitByteTimeoutHex = waitByteTimeout.DecToHex().PadLeft(2, '0');
dataUnit.Add(waitContentTimeoutHex);
dataUnit.Add(waitByteTimeoutHex);
var countHex = datas.Count.DecToHex().PadLeft(4, '0');
var countHexPairs = countHex.StringToPairs();
countHexPairs.Reverse();
dataUnit.AddRange(countHexPairs);
dataUnit.AddRange(datas);
return dataUnit;
}
//AUX=消息认证码字段（PW,16个字节）
public List<string> GetPW()
{
var str = "00";
var pWList = Enumerable.Repeat(str, pWLen).ToList();
return pWList;
}
/// <summary>
/// 构建下发命令
/// </summary>
/// <param name="reqParameter"></param>
/// <param name="dataUnit"></param>
/// <returns></returns>
public byte[] BuildSendCommandBytes(ReqParameter reqParameter, List<string>? dataUnit = null)
{ {
var cmdStrList = new List<string>(); var cmdStrList = new List<string>();
var userDatas = GetUserData(reqParameter, dataUnit); var userDatas = GetUserData(reqParameter, dataUnit);

4
JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
View File

@ -253,7 +253,7 @@ namespace JiShe.CollectBus.Protocol
Pn = 0, Pn = 0,
Fn = 1 Fn = 1
}; };
commandReulst.ReplyBytes = GetCommandBytes(reqParam); commandReulst.ReplyBytes = BuildSendCommandBytes(reqParam);
} }
else if (commandReulst.Fn == 2)//退出登录 else if (commandReulst.Fn == 2)//退出登录
{ {
@ -292,7 +292,7 @@ namespace JiShe.CollectBus.Protocol
Pn = 0, Pn = 0,
Fn = 1 Fn = 1
}; };
commandReulst.ReplyBytes = GetCommandBytes(reqParam); commandReulst.ReplyBytes = BuildSendCommandBytes(reqParam);
} }
} }
#endregion #endregion