构建下发命令
This commit is contained in:
parent
7d5147e20b
commit
e20b7753d2
@ -1,4 +1,10 @@
|
||||
using JiShe.CollectBus.Common.Enums;
|
||||
using JiShe.CollectBus.Common.Extensions;
|
||||
using JiShe.CollectBus.Common.Models;
|
||||
using JiShe.CollectBus.Protocol.Contracts.Models;
|
||||
using JiShe.CollectBus.RabbitMQ.Senders;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using TouchSocket.Sockets;
|
||||
|
||||
namespace JiShe.CollectBus.Api.Controllers
|
||||
{
|
||||
@ -12,9 +18,11 @@ namespace JiShe.CollectBus.Api.Controllers
|
||||
};
|
||||
|
||||
private readonly ILogger<WeatherForecastController> _logger;
|
||||
private readonly INSender _nSender;
|
||||
|
||||
public WeatherForecastController(ILogger<WeatherForecastController> logger)
|
||||
public WeatherForecastController(INSender nSender, ILogger<WeatherForecastController> logger)
|
||||
{
|
||||
_nSender = nSender;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
@ -29,5 +37,102 @@ namespace JiShe.CollectBus.Api.Controllers
|
||||
})
|
||||
.ToArray();
|
||||
}
|
||||
|
||||
[HttpGet(Name = "AmmeterParameterSend")]
|
||||
public async Task<bool> AmmeterParameterSendAsync() {
|
||||
|
||||
var listMeter = new List<AmmeterParameter>() { new AmmeterParameter(){
|
||||
Pn = 1,
|
||||
BaudRate = 3,
|
||||
Port = 2,
|
||||
ProtocolType = CommunicationProtocolType.DLT6452007,
|
||||
Address = "312408006642",
|
||||
Password = "000000",
|
||||
RateNumber = 4,
|
||||
IntegerBitNumber = 4,
|
||||
DecimalBitNumber = 4,
|
||||
CollectorAddress = "000000000000",
|
||||
UserCategoryNumber = 0,
|
||||
UserSubclassNumber = 0
|
||||
}};
|
||||
var bytes = HexStringExtensions.BuildAmmeterParameterSetSendCmd(new ReqParameter2()
|
||||
{
|
||||
AFN = AFN.设置参数,
|
||||
FunCode = (int)CMasterStationFunCode.请求1级数据,
|
||||
A = "322009872",
|
||||
Seq = new Seq()
|
||||
{
|
||||
TpV = TpV.附加信息域中无时间标签,
|
||||
FIRFIN = FIRFIN.单帧,
|
||||
CON = CON.需要对该帧进行确认,
|
||||
PRSEQ = 10,
|
||||
},
|
||||
MSA = 13,
|
||||
Pn = 0,
|
||||
Fn = 10
|
||||
}, listMeter);
|
||||
|
||||
// await _nSender.SendToIssuedAsync(new MessageIssuedEvent { DeviceNo = "322009872", Message = bytes, Type = IssuedEventType.Data,MessageId = Guid.NewGuid().ToString() });
|
||||
return true;
|
||||
}
|
||||
|
||||
[HttpGet(Name = "AmmeterParameterReading")]
|
||||
public bool AmmeterParameterReading()
|
||||
{
|
||||
HexStringExtensions.BuildAmmeterParameterReadingSendCmd(new ReqParameter2()
|
||||
{
|
||||
AFN = AFN.查询参数,
|
||||
FunCode = (int)CMasterStationFunCode.请求2级数据,
|
||||
A = "322009872",
|
||||
Seq = new Seq()
|
||||
{
|
||||
TpV = TpV.附加信息域中无时间标签,
|
||||
FIRFIN = FIRFIN.单帧,
|
||||
CON = CON.不需要对该帧进行确认,
|
||||
PRSEQ = 2,
|
||||
},
|
||||
MSA = 13,
|
||||
Pn = 0,
|
||||
Fn = 10
|
||||
}, new List<int>() { 1, 2 });
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
[HttpGet(Name = "ActivePowerIndicationReading")]
|
||||
public bool ActivePowerIndicationReading()
|
||||
{
|
||||
|
||||
//var str = "68A600A6006888203290261A0A6200000201010001000100621E426622082431000000000000040300000000000000CA16";
|
||||
//var cmdResult = new BuildCommand().AnalysisCmd(str);
|
||||
//if(cmdResult != null)
|
||||
//{
|
||||
// var list = new BuildCommand().AnalysisAFN04F10DataUnit(cmdResult.HexDatas);
|
||||
//}
|
||||
HexStringExtensions.BuildSendCommandBytes(new ReqParameter2()
|
||||
{
|
||||
AFN = AFN.请求实时数据,
|
||||
FunCode = (int)CMasterStationFunCode.请求2级数据,
|
||||
A = "322009872",
|
||||
Seq = new Seq()
|
||||
{
|
||||
TpV = TpV.附加信息域中无时间标签,
|
||||
FIRFIN = FIRFIN.单帧,
|
||||
CON = CON.不需要对该帧进行确认,
|
||||
PRSEQ = 2,
|
||||
},
|
||||
MSA = 13,
|
||||
Pn = 1,
|
||||
Fn = 129
|
||||
});
|
||||
|
||||
//HexStringExtensions.AmmeterValveControl("312408006642", "", "000000", true);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,4 +10,9 @@
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
|
||||
<ProjectReference Include="..\JiShe.CollectBus.RabbitMQ\JiShe.CollectBus.RabbitMQ.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -1,12 +1,5 @@
|
||||
using JiShe.CollectBus.Common.Enums;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using JiShe.CollectBus.Common.Models;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace JiShe.CollectBus.Common.Extensions
|
||||
{
|
||||
@ -25,7 +18,6 @@ namespace JiShe.CollectBus.Common.Extensions
|
||||
|
||||
private const int FixedLength = 18;
|
||||
|
||||
|
||||
public static object GetAnalyzeValue(this List<string> hexStringList, CommandChunkEnum chunk)
|
||||
{
|
||||
if (hexStringList.Count < hearderLen || hexStringList[0] != startStr || hexStringList[5] != startStr || hexStringList.Count < FixedLength)
|
||||
@ -84,6 +76,454 @@ namespace JiShe.CollectBus.Common.Extensions
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsStartStr(this string str)
|
||||
{
|
||||
return str == startStr ? true : false;
|
||||
}
|
||||
|
||||
#region 下行命令
|
||||
|
||||
/// <summary>
|
||||
/// 构建电表参数设置-下发命令
|
||||
/// </summary>
|
||||
/// <param name="reqParameter"></param>
|
||||
/// <param name="meterParameters"></param>
|
||||
/// <returns></returns>
|
||||
public static 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 static 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="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 static 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;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 构建下发命令
|
||||
/// </summary>
|
||||
/// <param name="reqParameter"></param>
|
||||
/// <param name="dataUnit"></param>
|
||||
/// <returns></returns>
|
||||
public static byte[] BuildSendCommandBytes(ReqParameter reqParameter, List<string>? dataUnit = null)
|
||||
{
|
||||
var cmdStrList = new List<string>();
|
||||
var userDatas = BuildUserData(reqParameter, dataUnit);
|
||||
var hearders = BuildHeaders(userDatas.Count);
|
||||
var cs = GetCS(userDatas);
|
||||
cmdStrList.AddRange(hearders);
|
||||
cmdStrList.AddRange(userDatas);
|
||||
cmdStrList.Add(cs);
|
||||
cmdStrList.Add(endStr);
|
||||
var bytes = cmdStrList.Select(x => Convert.ToByte(x, 16)).ToArray();
|
||||
return bytes;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 组装电表阀控下发数据单元
|
||||
/// </summary>
|
||||
/// <param name="address">电表地址</param>
|
||||
/// <param name="specialnocode">特殊控制码</param>
|
||||
/// <param name="password">密码</param>
|
||||
/// <param name="state">是否为开阀</param>
|
||||
/// <returns></returns>
|
||||
public static List<string> BuildAmmeterValveControlSendDataUnit(string address, string specialnocode, string password, bool state, string modelCode = "")
|
||||
{
|
||||
address = address.Trim().TrimStart('0');
|
||||
if (address.Length < 12) address = address.PadLeft(12, '0');
|
||||
string Code = string.Empty;
|
||||
|
||||
if (state)
|
||||
{
|
||||
if (string.IsNullOrEmpty(specialnocode))
|
||||
Code = "1B";
|
||||
else
|
||||
Code = specialnocode == "1B" || specialnocode == "1C" ? specialnocode : "1C";
|
||||
}
|
||||
else
|
||||
Code = "1A";//跳闸
|
||||
|
||||
if (specialnocode == "1W")
|
||||
{
|
||||
if (state)
|
||||
Code = "1A";
|
||||
else
|
||||
Code = "1C";
|
||||
}
|
||||
|
||||
var pwdLevel = "02";
|
||||
if (modelCode == "HL_DTSU2625" || modelCode == "DDZY9866")
|
||||
pwdLevel = "04";
|
||||
else if (modelCode == "DDS2705")
|
||||
pwdLevel = "03";
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(password) && password.Contains("|"))
|
||||
{
|
||||
var sp = password.Split('|');
|
||||
pwdLevel = sp[1];
|
||||
password = sp[0];
|
||||
}
|
||||
|
||||
string strDate = DateTime.Now.AddYears(3).ToString("000012ddMMyy").StrAddSpan();
|
||||
if (specialnocode == "1D" || modelCode == "SZBD_DDZY1225")
|
||||
strDate = "FF FF FF FF FF FF";
|
||||
string strP = password.StrAddSpan().StrReverseOrder();
|
||||
string strSJY = " " + pwdLevel + " " + strP + " 01 00 00 00 " + Code + " 00 " + strDate;
|
||||
string strLen = (strSJY.Replace(" ", "").Length / 2).ToString("X2");
|
||||
string strReturn = "68 " + address.StrAddSpan().StrReverseOrder() + " 68 1C " + strLen + " " + StrAddHex33(strSJY) + " ";
|
||||
string strSum = strReturn.Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries).Select(i => Convert.ToInt32(i, 16)).Sum().ToString("X");
|
||||
strReturn += strSum.Substring(strSum.Length - 2) + " 16";
|
||||
|
||||
return strReturn.Split(' ').ToList();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 构建电表参数设置-下发数据单元
|
||||
/// </summary>
|
||||
/// <param name="meterParameters"></param>
|
||||
/// <returns></returns>
|
||||
private static 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;
|
||||
}
|
||||
|
||||
|
||||
//AUX=消息认证码字段(PW,16个字节)
|
||||
private static List<string> GetPW()
|
||||
{
|
||||
var str = "00";
|
||||
var pWList = Enumerable.Repeat(str, pWLen).ToList();
|
||||
return pWList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 帧校验和
|
||||
/// </summary>
|
||||
/// <param name="userData">用户数据区</param>
|
||||
/// <returns></returns>
|
||||
private static string GetCS(List<string> userData)
|
||||
{
|
||||
byte sum = 0;
|
||||
foreach (var d in userData)
|
||||
{
|
||||
var b = Convert.ToByte(d, 16);
|
||||
sum += b;
|
||||
}
|
||||
return sum.ToString("X2");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 用户数据区
|
||||
/// </summary>
|
||||
/// <param name="reqParameter"></param>
|
||||
/// <returns></returns>
|
||||
private static List<string> BuildUserData(ReqParameter reqParameter, List<string>? dataUnit)
|
||||
{
|
||||
var c = BuildC(reqParameter.FunCode, reqParameter.PRM);
|
||||
var a = BuildAList(reqParameter.A, reqParameter.MSA);
|
||||
|
||||
var linkUserData = BuildLinkUserData(reqParameter.AFN, reqParameter.Seq,
|
||||
((ReqParameter2)reqParameter).Pn, ((ReqParameter2)reqParameter).Fn, dataUnit);
|
||||
|
||||
var list = new List<string>() { c };
|
||||
list.AddRange(a);
|
||||
list.AddRange(linkUserData);
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 固定长度的报文头 起始字符+长度+长度+起始字符
|
||||
/// </summary>
|
||||
/// <param name="length"></param>
|
||||
/// <returns></returns>
|
||||
private static List<string> BuildHeaders(int length)
|
||||
{
|
||||
var headers = new List<string>();
|
||||
headers.Add(startStr);
|
||||
var l = BuildLength(length);
|
||||
headers.AddRange(l);
|
||||
headers.AddRange(l);
|
||||
headers.Add(startStr);
|
||||
return headers;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 长度 2字节 [用户数据区长度]
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private static List<string> BuildLength(int length1)
|
||||
{
|
||||
var binaryLen = length1.DecToBin();
|
||||
var protocolIdentification = Enum.Format(typeof(ProtocolIdentification),
|
||||
ProtocolIdentification.本规约使用, "d").PadLeft(2, '0');
|
||||
var lenStr = $"{binaryLen}{protocolIdentification}";
|
||||
var hexLen = lenStr.BinToHex();
|
||||
hexLen = hexLen.PadLeft(4, '0');
|
||||
var list = hexLen.StringToPairs();
|
||||
list.Reverse();
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 控制域
|
||||
/// </summary>
|
||||
/// <param name="funCode">功能码</param>
|
||||
/// <param name="fcb"></param>
|
||||
/// <param name="fcv"></param>
|
||||
/// <returns></returns>
|
||||
private static string BuildC(int funCode, PRM pRM, int fcb = 0, FCV fcv = FCV.FCB位无效)
|
||||
{
|
||||
var cMasterStationFunCodeHex = funCode.DecToBin();
|
||||
cMasterStationFunCodeHex = cMasterStationFunCodeHex.ToString().PadLeft(4, '0');
|
||||
var strC = $"{(int)DIR.主站下行报文}{(int)pRM}{fcb}{(int)fcv}{cMasterStationFunCodeHex}";
|
||||
var hexC = strC.BinToHex().PadLeft(2, '0');
|
||||
return hexC;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 地址域 3220 09872
|
||||
/// </summary>
|
||||
/// <param name="a1">行政区划码 BCD码 3220=2032</param>
|
||||
/// <param name="a2">逻辑地址 BIN 09872=2690=>9026</param>
|
||||
/// <param name="a3">主站地址 BIN 0~127</param>
|
||||
/// <returns></returns>
|
||||
private static List<string> BuildAList(string a, int mSA)
|
||||
{
|
||||
var list = new List<string>();
|
||||
|
||||
var a1 = a.Substring(0, 4);
|
||||
var a1Pairs = a1.StringToPairs();
|
||||
a1Pairs.Reverse();
|
||||
list.AddRange(a1Pairs);
|
||||
|
||||
var a2 = Convert.ToInt32(a.Substring(4));
|
||||
var decA2 = a2.DecToHex();
|
||||
var a2Pairs = decA2.PadLeft(4, '0').StringToPairs();
|
||||
a2Pairs.Reverse();
|
||||
list.AddRange(a2Pairs);
|
||||
|
||||
//TODO:主站地址和组地址标志
|
||||
var a3Bin = $"{mSA.DecToBin().PadLeft(7, '0')}0";
|
||||
list.Add(a3Bin.BinToHex().PadLeft(2, '0'));
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
private static List<string> BuildLinkUserData(AFN aFN, Seq seq, int pn, int fn, List<string>? dataUnit)
|
||||
{
|
||||
var aFNValue = ((int)aFN).DecToHex().PadLeft(2, '0');
|
||||
var sEQ = BuildSEQ(seq.TpV, seq.FIRFIN, seq.CON, seq.PRSEQ);
|
||||
var dA = BuildDA(pn);
|
||||
var dT = BuildDT(fn);
|
||||
var list = new List<string>() { aFNValue, sEQ };
|
||||
list.AddRange(dA);
|
||||
list.AddRange(dT);
|
||||
|
||||
if (dataUnit != null)
|
||||
{
|
||||
list.AddRange(dataUnit);
|
||||
}
|
||||
//list.AddRange(GetDataUnit(aFN,seq));
|
||||
|
||||
if (seq.TpV == TpV.附加信息域中带时间标签)
|
||||
list.AddRange(BuildTp("00"));
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 帧序列域
|
||||
/// </summary>
|
||||
/// <param name="tpV"></param>
|
||||
/// <param name="fIRFIN"></param>
|
||||
/// <param name="cON"></param>
|
||||
/// <returns></returns>
|
||||
private static string BuildSEQ(TpV tpV, FIRFIN fIRFIN, CON cON, int pRSEQ)
|
||||
{
|
||||
var tpVValue = Enum.Format(typeof(TpV),
|
||||
tpV, "d");
|
||||
var fIRFINValue = Enum.Format(typeof(FIRFIN),
|
||||
fIRFIN, "d");
|
||||
var cONValue = (int)cON;
|
||||
var sEQBin = $"{tpVValue}{fIRFINValue}{cONValue}{pRSEQ.DecToBin().PadLeft(4, '0')}";
|
||||
var hexSEQ = sEQBin.BinToHex().PadLeft(2, '0');
|
||||
return hexSEQ;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 信息点标识
|
||||
/// </summary>
|
||||
/// <param name="pn">计量点</param>
|
||||
/// <returns></returns>
|
||||
private static List<string> BuildDA(int pn)
|
||||
{
|
||||
if (pn == 0)
|
||||
return new List<string>() { "00", "00" };
|
||||
var dA2 = (pn - 1) / 8 + 1;//信息点组从1开始 第几组
|
||||
var dA1 = pn - (dA2 - 1) * 8;//pn % 8
|
||||
var dA1Hex = "1".PadRight(dA1, '0').BinToHex();//对位信息 第几位 二进制有效位
|
||||
var dA2Hex = dA2.DecToHex();
|
||||
return new List<string>() { dA1Hex.PadLeft(2, '0'), dA2Hex.PadLeft(2, '0') };
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 数据单元标识
|
||||
/// </summary>
|
||||
/// <param name="fn"></param>
|
||||
/// <returns></returns>
|
||||
private static List<string> BuildDT(int fn)
|
||||
{
|
||||
var dT2 = (fn - 1) / 8;//从零开始 第几组
|
||||
var dT1 = fn - dT2 * 8;
|
||||
var dT1Hex = "1".PadRight(dT1, '0').BinToHex();//对位信息 第几位 二进制有效位
|
||||
var dT2Hex = dT2.DecToHex();
|
||||
return new List<string>() { dT1Hex.PadLeft(2, '0'), dT2Hex.PadLeft(2, '0') };
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 时间标签
|
||||
/// </summary>
|
||||
/// <param name="pFC">启动帧帧序号计数器PFC 1字节</param>
|
||||
/// <param name="delayTime">允许发送传输延时时间 min 1字节</param>
|
||||
/// <returns></returns>
|
||||
private static List<string> BuildTp(string pFC = "00", int delayTime = 0)
|
||||
{
|
||||
var now = DateTime.Now; // 获取当前时间
|
||||
var seconds = now.Second.ToString().PadLeft(2, '0'); // 获取当前秒数
|
||||
var minutes = now.Minute.ToString().PadLeft(2, '0'); // 获取当前分钟数
|
||||
var hours = now.Hour.ToString().PadLeft(2, '0'); // 获取当前小时数
|
||||
var day = now.Day.ToString().PadLeft(2, '0'); // 获取当前日期的日数
|
||||
return new List<string>() { pFC, seconds, minutes, hours, day, delayTime.ToString().PadLeft(2, '0') };
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,12 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
using JiShe.CollectBus.Common;
|
||||
|
||||
using JiShe.CollectBus.Common.Enums;
|
||||
using JiShe.CollectBus.Common.Models;
|
||||
|
||||
namespace JiShe.CollectBus.Protocol.Contracts.Models
|
||||
namespace JiShe.CollectBus.Common.Models
|
||||
{
|
||||
public class ReqParameter
|
||||
{
|
||||
@ -11,14 +11,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
|
||||
{
|
||||
public abstract class BaseProtocolPlugin(ILogger<BaseProtocolPlugin> logger) : IProtocolPlugin
|
||||
{
|
||||
//起始字符
|
||||
public const string stx = "68";
|
||||
//结束字符
|
||||
public const string end = "16";
|
||||
|
||||
//头部字节长度
|
||||
public const int hearderLen = 6;
|
||||
//消息认证码字段长度
|
||||
public const int pWLen = 16;
|
||||
public const int hearderLen = 6;
|
||||
|
||||
public const int tPLen = 6;
|
||||
|
||||
@ -57,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
|
||||
Pn = 0,
|
||||
Fn = 1
|
||||
};
|
||||
var bytes = BuildSendCommandBytes(reqParam);
|
||||
var bytes = HexStringExtensions.BuildSendCommandBytes(reqParam);
|
||||
if (sendAction != null)
|
||||
{
|
||||
sendAction(bytes);
|
||||
@ -99,7 +94,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
|
||||
Pn = 0,
|
||||
Fn = 1
|
||||
};
|
||||
var bytes = BuildSendCommandBytes(reqParam);
|
||||
var bytes = HexStringExtensions.BuildSendCommandBytes(reqParam);
|
||||
if (sendAction != null)
|
||||
{
|
||||
sendAction(bytes);
|
||||
@ -636,388 +631,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
|
||||
|
||||
#endregion
|
||||
|
||||
#region 下行命令
|
||||
|
||||
/// <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 userDatas = GetUserData(reqParameter, dataUnit);
|
||||
var hearders = GetHeaders(userDatas.Count);
|
||||
var cs = GetCS(userDatas);
|
||||
cmdStrList.AddRange(hearders);
|
||||
cmdStrList.AddRange(userDatas);
|
||||
cmdStrList.Add(cs);
|
||||
cmdStrList.Add(end);
|
||||
logger.LogInformation($"回复:{string.Join(" ", cmdStrList)}");
|
||||
var bytes = cmdStrList.Select(x => Convert.ToByte(x, 16)).ToArray();
|
||||
return bytes;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 帧校验和
|
||||
/// </summary>
|
||||
/// <param name="userData">用户数据区</param>
|
||||
/// <returns></returns>
|
||||
public string GetCS(List<string> userData)
|
||||
{
|
||||
byte sum = 0;
|
||||
foreach (var d in userData)
|
||||
{
|
||||
var b = Convert.ToByte(d, 16);
|
||||
sum += b;
|
||||
}
|
||||
return sum.ToString("X2");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 用户数据区
|
||||
/// </summary>
|
||||
/// <param name="reqParameter"></param>
|
||||
/// <returns></returns>
|
||||
public List<string> GetUserData(ReqParameter reqParameter, List<string>? dataUnit)
|
||||
{
|
||||
var c = GetC(reqParameter.FunCode, reqParameter.PRM);
|
||||
var a = GetAList(reqParameter.A, reqParameter.MSA);
|
||||
|
||||
var linkUserData = GetLinkUserData(reqParameter.AFN, reqParameter.Seq,
|
||||
((ReqParameter2)reqParameter).Pn, ((ReqParameter2)reqParameter).Fn, dataUnit);
|
||||
|
||||
var list = new List<string>() { c };
|
||||
list.AddRange(a);
|
||||
list.AddRange(linkUserData);
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 固定长度的报文头 起始字符+长度+长度+起始字符
|
||||
/// </summary>
|
||||
/// <param name="length"></param>
|
||||
/// <returns></returns>
|
||||
public List<string> GetHeaders(int length)
|
||||
{
|
||||
var headers = new List<string>();
|
||||
headers.Add(stx);
|
||||
var l = GetLength(length);
|
||||
headers.AddRange(l);
|
||||
headers.AddRange(l);
|
||||
headers.Add(stx);
|
||||
return headers;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 长度 2字节 [用户数据区长度]
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public List<string> GetLength(int length1)
|
||||
{
|
||||
var binaryLen = length1.DecToBin();
|
||||
var protocolIdentification = Enum.Format(typeof(ProtocolIdentification),
|
||||
ProtocolIdentification.本规约使用, "d").PadLeft(2, '0');
|
||||
var lenStr = $"{binaryLen}{protocolIdentification}";
|
||||
var hexLen = lenStr.BinToHex();
|
||||
hexLen = hexLen.PadLeft(4, '0');
|
||||
var list = hexLen.StringToPairs();
|
||||
list.Reverse();
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 控制域
|
||||
/// </summary>
|
||||
/// <param name="funCode">功能码</param>
|
||||
/// <param name="fcb"></param>
|
||||
/// <param name="fcv"></param>
|
||||
/// <returns></returns>
|
||||
public string GetC(int funCode, PRM pRM, int fcb = 0, FCV fcv = FCV.FCB位无效)
|
||||
{
|
||||
var cMasterStationFunCodeHex = funCode.DecToBin();
|
||||
cMasterStationFunCodeHex = cMasterStationFunCodeHex.ToString().PadLeft(4, '0');
|
||||
var strC = $"{(int)DIR.主站下行报文}{(int)pRM}{fcb}{(int)fcv}{cMasterStationFunCodeHex}";
|
||||
var hexC = strC.BinToHex().PadLeft(2, '0');
|
||||
return hexC;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 地址域 3220 09872
|
||||
/// </summary>
|
||||
/// <param name="a1">行政区划码 BCD码 3220=2032</param>
|
||||
/// <param name="a2">逻辑地址 BIN 09872=2690=>9026</param>
|
||||
/// <param name="a3">主站地址 BIN 0~127</param>
|
||||
/// <returns></returns>
|
||||
public List<string> GetAList(string a, int mSA)
|
||||
{
|
||||
var list = new List<string>();
|
||||
|
||||
var a1 = a.Substring(0, 4);
|
||||
var a1Pairs = a1.StringToPairs();
|
||||
a1Pairs.Reverse();
|
||||
list.AddRange(a1Pairs);
|
||||
|
||||
var a2 = Convert.ToInt32(a.Substring(4));
|
||||
var decA2 = a2.DecToHex();
|
||||
var a2Pairs = decA2.PadLeft(4, '0').StringToPairs();
|
||||
a2Pairs.Reverse();
|
||||
list.AddRange(a2Pairs);
|
||||
|
||||
//TODO:主站地址和组地址标志
|
||||
var a3Bin = $"{mSA.DecToBin().PadLeft(7, '0')}0";
|
||||
list.Add(a3Bin.BinToHex().PadLeft(2, '0'));
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
public List<string> GetLinkUserData(AFN aFN, Seq seq, int pn, int fn, List<string>? dataUnit)
|
||||
{
|
||||
var aFNValue = ((int)aFN).DecToHex().PadLeft(2, '0');
|
||||
var sEQ = GetSEQ(seq.TpV, seq.FIRFIN, seq.CON, seq.PRSEQ);
|
||||
var dA = GetDA(pn);
|
||||
var dT = GetDT(fn);
|
||||
var list = new List<string>() { aFNValue, sEQ };
|
||||
list.AddRange(dA);
|
||||
list.AddRange(dT);
|
||||
|
||||
if (dataUnit != null)
|
||||
{
|
||||
list.AddRange(dataUnit);
|
||||
}
|
||||
//list.AddRange(GetDataUnit(aFN,seq));
|
||||
|
||||
if (seq.TpV == TpV.附加信息域中带时间标签)
|
||||
list.AddRange(GetTp("00"));
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 帧序列域
|
||||
/// </summary>
|
||||
/// <param name="tpV"></param>
|
||||
/// <param name="fIRFIN"></param>
|
||||
/// <param name="cON"></param>
|
||||
/// <returns></returns>
|
||||
public string GetSEQ(TpV tpV, FIRFIN fIRFIN, CON cON, int pRSEQ)
|
||||
{
|
||||
var tpVValue = Enum.Format(typeof(TpV),
|
||||
tpV, "d");
|
||||
var fIRFINValue = Enum.Format(typeof(FIRFIN),
|
||||
fIRFIN, "d");
|
||||
var cONValue = (int)cON;
|
||||
var sEQBin = $"{tpVValue}{fIRFINValue}{cONValue}{pRSEQ.DecToBin().PadLeft(4, '0')}";
|
||||
var hexSEQ = sEQBin.BinToHex().PadLeft(2, '0');
|
||||
return hexSEQ;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 信息点标识
|
||||
/// </summary>
|
||||
/// <param name="pn">计量点</param>
|
||||
/// <returns></returns>
|
||||
public List<string> GetDA(int pn)
|
||||
{
|
||||
if (pn == 0)
|
||||
return new List<string>() { "00", "00" };
|
||||
var dA2 = (pn - 1) / 8 + 1;//信息点组从1开始 第几组
|
||||
var dA1 = pn - (dA2 - 1) * 8;//pn % 8
|
||||
var dA1Hex = "1".PadRight(dA1, '0').BinToHex();//对位信息 第几位 二进制有效位
|
||||
var dA2Hex = dA2.DecToHex();
|
||||
return new List<string>() { dA1Hex.PadLeft(2, '0'), dA2Hex.PadLeft(2, '0') };
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 数据单元标识
|
||||
/// </summary>
|
||||
/// <param name="fn"></param>
|
||||
/// <returns></returns>
|
||||
public List<string> GetDT(int fn)
|
||||
{
|
||||
var dT2 = (fn - 1) / 8;//从零开始 第几组
|
||||
var dT1 = fn - dT2 * 8;
|
||||
var dT1Hex = "1".PadRight(dT1, '0').BinToHex();//对位信息 第几位 二进制有效位
|
||||
var dT2Hex = dT2.DecToHex();
|
||||
return new List<string>() { dT1Hex.PadLeft(2, '0'), dT2Hex.PadLeft(2, '0') };
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 时间标签
|
||||
/// </summary>
|
||||
/// <param name="pFC">启动帧帧序号计数器PFC 1字节</param>
|
||||
/// <param name="delayTime">允许发送传输延时时间 min 1字节</param>
|
||||
/// <returns></returns>
|
||||
public List<string> GetTp(string pFC = "00", int delayTime = 0)
|
||||
{
|
||||
|
||||
var now = DateTime.Now; // 获取当前时间
|
||||
var seconds = now.Second.ToString().PadLeft(2, '0'); // 获取当前秒数
|
||||
var minutes = now.Minute.ToString().PadLeft(2, '0'); // 获取当前分钟数
|
||||
var hours = now.Hour.ToString().PadLeft(2, '0'); // 获取当前小时数
|
||||
var day = now.Day.ToString().PadLeft(2, '0'); // 获取当前日期的日数
|
||||
return new List<string>() { pFC, seconds, minutes, hours, day, delayTime.ToString().PadLeft(2, '0') };
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ namespace JiShe.CollectBus.Protocol
|
||||
return commandReulst;
|
||||
}
|
||||
//验证起始字符
|
||||
if (hexStringList[0] != stx || hexStringList[5] != stx)
|
||||
if (!hexStringList[0].IsStartStr() || !hexStringList[5].IsStartStr())
|
||||
{
|
||||
return commandReulst;
|
||||
}
|
||||
@ -253,7 +253,7 @@ namespace JiShe.CollectBus.Protocol
|
||||
Pn = 0,
|
||||
Fn = 1
|
||||
};
|
||||
commandReulst.ReplyBytes = BuildSendCommandBytes(reqParam);
|
||||
commandReulst.ReplyBytes = HexStringExtensions.BuildSendCommandBytes(reqParam);
|
||||
}
|
||||
else if (commandReulst.Fn == 2)//退出登录
|
||||
{
|
||||
@ -292,7 +292,7 @@ namespace JiShe.CollectBus.Protocol
|
||||
Pn = 0,
|
||||
Fn = 1
|
||||
};
|
||||
commandReulst.ReplyBytes = BuildSendCommandBytes(reqParam);
|
||||
commandReulst.ReplyBytes = HexStringExtensions.BuildSendCommandBytes(reqParam);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user