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 2025-02-27 17:02:50 +08:00
parent 73803cab65
commit de1654327f
8 changed files with 691 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/EquitDubgInput.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.EnergySystem.Dto
{
public class EquitDubgInput: BaseInput
{
public string ItemCode { get; set; }
public int FocusID { get; set; }
public string Data { get; set; }
/// <summary>
/// 表计类型
/// 电表= 1,水表= 2,燃气表= 3,热能表= 4,
/// </summary>
public int MeterType { get; set; }
public bool IsManual { get; set; } = true;
public string TaskId { get; set; }
}
}

102
src/JiShe.CollectBus.Application/EnergySystem/EnergySystemAppService.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Net; using System.Net;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using DeviceDetectorNET.Class.Device;
using DotNetCore.CAP; using DotNetCore.CAP;
using JiShe.CollectBus.Common.BuildSendDatas; using JiShe.CollectBus.Common.BuildSendDatas;
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
@ -18,6 +19,7 @@ using MassTransit;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json; using Newtonsoft.Json;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using YamlDotNet.Core;
namespace JiShe.CollectBus.EnergySystem namespace JiShe.CollectBus.EnergySystem
{ {
@ -191,6 +193,101 @@ namespace JiShe.CollectBus.EnergySystem
return result; return result;
} }
[HttpPost("Handmould/EquitDubg")]
public async Task<BaseResultDto> EquitDubg(EquitDubgInput input)
{
var result = new BaseResultDto();
try
{
byte[] bytes = null;
var address = $"{input.AreaCode}{input.Address}";
bool isManual = !input.AreaCode.Equals("5110");//低功耗集中器不是长连接，在连接的那一刻再发送
switch (input.ItemCode)
{
case "01_1":
bytes = Build3761SendData.BuildConrRebootSendCmd(address);
break;
case "0C_2":
bytes = Build3761SendData.BuildTerminalCalendarClockSendCmd(address);
break;
case "04_3":
if (string.IsNullOrWhiteSpace(input.Data))
{
result.Status = false;
result.Msg = "传入参数错误";
return result;
}
var communicationParametersSetData = JsonConvert.DeserializeObject<CommunicationParametersSetDataInput>(input.Data);
var masterIPAndPortArr = communicationParametersSetData.MasterIPandPort.Split(':');
var masterIP = masterIPAndPortArr[0];
var materPort = masterIPAndPortArr[1];
if (!masterIP.IsValidIPv4() || !materPort.IsValidPort())
{
result.Status = false;
result.Msg = "主站IP和端口格式错误";
return result;
}
var backupIPAndPortArr = communicationParametersSetData.BackupIPandPort.Split(':');
var backupIP = backupIPAndPortArr[0];
var backupPort = backupIPAndPortArr[1];
if (!backupIP.IsValidIPv4() || !backupPort.IsValidPort())
{
result.Status = false;
result.Msg = "主站IP和端口格式错误";
return result;
}
bytes = Build3761SendData.BuildCommunicationParametersSetSendCmd(address, masterIP, materPort,
backupIP, backupPort, communicationParametersSetData.APN);
break;
case "05_31":
bytes = Build3761SendData.BuildConrCheckTimeSendCmd(address, DateTime.Now, isManual);
break;
case "0A_10":
if (string.IsNullOrWhiteSpace(input.Data))
{
result.Status = false;
result.Msg = "传入参数错误";
return result;
}
var pnList = input.Data.Split(',').Select(int.Parse).ToList();
bytes = Build3761SendData.BuildAmmeterParameterReadingSendCmd(address, pnList);
break;
default:
break;
}
if (bytes != null)
{
await _capBus.PublishAsync(ProtocolConst.SubscriberIssuedEventName, new IssuedEventMessage
{
//ClientId = messageReceived.ClientId,
DeviceNo = address,
Message = bytes,
Type = IssuedEventType.Data,
MessageId = NewId.NextGuid().ToString()
});
if (isManual)
{
//等待设备返回结果
}
}
}
catch (Exception ex)
{
result.Status = false;
result.Msg = ex.Message;
}
result.Status = true;
result.Msg = "操作成功";
return result;
}
/// <summary> /// <summary>
/// 通讯参数设置 AFN:04 FN:3 /// 通讯参数设置 AFN:04 FN:3
/// </summary> /// </summary>
@ -275,8 +372,9 @@ namespace JiShe.CollectBus.EnergySystem
{ {
var result = new BaseResultDto(); var result = new BaseResultDto();
var address = $"{input.AreaCode}{input.Address}"; var address = $"{input.AreaCode}{input.Address}";
bool isManual = !input.AreaCode.Equals("5110");//低功耗集中器不是长连接，在连接的那一刻再发送
var bytes = Build3761SendData.BuildConrCheckTimeSendCmd(address,DateTime.Now); var bytes = Build3761SendData.BuildConrCheckTimeSendCmd(address,DateTime.Now, isManual);
await _capBus.PublishAsync(ProtocolConst.SubscriberIssuedEventName, new IssuedEventMessage await _capBus.PublishAsync(ProtocolConst.SubscriberIssuedEventName, new IssuedEventMessage
{ {
//ClientId = messageReceived.ClientId, //ClientId = messageReceived.ClientId,
@ -445,7 +543,7 @@ namespace JiShe.CollectBus.EnergySystem
}).ToList() }).ToList()
}).ToList() }).ToList()
}).ToList(); }).ToList();
var bytesList = Build3761SendData.BuildAmmeterSetTimeSetSendCmd(address, ammeter.Code, ammeter.Address, var bytesList = Build3761SendData.BuildAmmeterSetTimeSetSendCmd(address,ammeter.Address,ammeter.Password,
ammeter.PortNumber ?? 2, ammeter.BaudRate, timeDataList); ammeter.PortNumber ?? 2, ammeter.BaudRate, timeDataList);
foreach (var bytes in bytesList) foreach (var bytes in bytesList)

576
src/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs
View File

@ -1,12 +1,14 @@
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.Common.Models;
using Nito.AsyncEx;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace JiShe.CollectBus.Common.BuildSendDatas namespace JiShe.CollectBus.Common.BuildSendDatas
{ {
@ -156,7 +158,7 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
return new List<byte[]> { bytes1, bytes2, bytes3, bytes4, bytes5, bytes6, bytes7, bytes8, bytes9, bytes10 }; return new List<byte[]> { bytes1, bytes2, bytes3, bytes4, bytes5, bytes6, bytes7, bytes8, bytes9, bytes10 };
} }
#region 旧版
/// <summary> /// <summary>
/// 构建设置时段下发命令 /// 构建设置时段下发命令
/// </summary> /// </summary>
@ -167,185 +169,320 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
/// <param name="baudRate"></param> /// <param name="baudRate"></param>
/// <param name="data"></param> /// <param name="data"></param>
/// <returns></returns> /// <returns></returns>
public static List<byte[]> BuildAmmeterSetTimeSetSendCmd(string address, string ammeterAddress, string modelCode, int port, string baudRate, List<TimeSetDetail> data) //public static List<byte[]> BuildAmmeterSetTimeSetSendCmd(string address, string ammeterAddress, string modelCode, int port, string baudRate, List<TimeSetDetail> data)
//{
// List<byte[]> bytesList = new List<byte[]>();
// if (modelCode == "DTSU193")
// {
// return null;
// }
// else if (modelCode == "PMAC9523")
// {
// var dataUnitList = Build645SendData.BuildPMAC9523AmmeterSetTimeSetSendDataUnit(ammeterAddress, data);
// foreach (var dataUnit in dataUnitList)
// {
// var bytes = BuildTransparentForwardingSendCmd(address, port, baudRate, dataUnit, StopBit.Stop1, Parity.None);
// bytesList.Add(bytes);
// }
// }
// else
// {
// #region 采用TimeSet方法设置 弃用
// //List<string> fm = null;
// //SendInfo sendInfo = null;
// //List<SendInfo> tempSi = new List<SendInfo>();
// ////判断是否需要进入编程模式，获取编程模式指令
// //var pm = ProgramModelConfig.ProgramModels.FirstOrDefault(n => n.BrandName == meterInfo.brand_name
// //&& n.Model == meterInfo.model_name);
// //if (pm != null)
// //{
// // if (pm.IsEnter)
// // {
// // //编程指令
// // var bccmd= pm.cmdData;
// // //替换表地址
// // var addressList= Protocol.QGDW3761.DataTypeConvert.CutStr(meterInfo.meter_address, 2, true);
// // var addressstr = string.Join(" ",addressList);
// // bccmd = bccmd.Replace("AA AA AA AA AA AA", addressstr);
// // fm = bccmd.Split(' ').ToList();
// // //生成CRC
// // var CRC = Protocol.QGDW3761.DataTypeConvert.GetCRC(fm);
// // fm.Add(CRC);
// // fm.Add("16");
// // confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// // sendInfo = new SendInfo
// // (
// // confirmResult.msa,
// // confirmResult.cmd16,
// // MeterType.Ammeter,
// // CmdType.ProgramModel,
// // null,
// // sDto
// // );
// // si.Add(sendInfo);
// // }
// // //年时区数
// // int yearTimeZoneCount = 0;
// // //日时段数
// // int dayTimeZoneCount = 0;
// // //费率
// // int rate = 0;
// // //发送两套时区
// // for (int j = 1; j <= 2; j++)
// // {
// // //发送时区表数据
// // var timeZoneData = GenerateTimeZone(sDto);
// // yearTimeZoneCount = timeZoneData.Count / 3;
// // fm = GenerateCTCommand($"040{j}0000", string.Join("", timeZoneData));
// // confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// // sendInfo = new SendInfo
// // (
// // confirmResult.msa,
// // confirmResult.cmd16,
// // MeterType.Ammeter,
// // CmdType.SetTimeSet,
// // null,
// // sDto
// // );
// // tempSi.Add(sendInfo);
// // //发送日时段数据
// // for (int i = 1; i <= sDto.data.Count; i++)
// // {
// // var dayTimeZone = GenerateDayTimeZone(sDto.data[i - 1].data);
// // fm = GenerateCTCommand($"040{j}000{i}", string.Join("", dayTimeZone));
// // confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// // sendInfo = new SendInfo
// // (
// // confirmResult.msa,
// // confirmResult.cmd16,
// // MeterType.Ammeter,
// // CmdType.SetTimeSet,
// // null,
// // sDto
// // );
// // tempSi.Add(sendInfo);
// // //计算日时段数
// // var dz = dayTimeZone.Count / 3;
// // if (dz > dayTimeZoneCount) dayTimeZoneCount = dz;
// // //计算费率
// // foreach(var detail in sDto.data[i - 1].data)
// // {
// // int rt = Convert.ToInt32(detail.rate);
// // if (rt > rate) rate = rt;
// // }
// // }
// // }
// // #region 年时区数（NN）
// // fm = GenerateCTCommand($"04000201", yearTimeZoneCount.ToString().PadLeft(2, '0'));
// // confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// // sendInfo = new SendInfo
// // (
// // confirmResult.msa,
// // confirmResult.cmd16,
// // MeterType.Ammeter,
// // CmdType.SetTimeSet,
// // null,
// // sDto
// // );
// // si.Add(sendInfo);
// // #endregion
// // #region 日时段数据（NN）
// // fm = GenerateCTCommand($"04000202", sDto.data.Count.ToString().PadLeft(2, '0'));
// // confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// // sendInfo = new SendInfo
// // (
// // confirmResult.msa,
// // confirmResult.cmd16,
// // MeterType.Ammeter,
// // CmdType.SetTimeSet,
// // null,
// // sDto
// // );
// // si.Add(sendInfo);
// // #endregion
// // #region 日时段数(每日切换数)（NN）
// // fm = GenerateCTCommand($"04000203", dayTimeZoneCount.ToString().PadLeft(2, '0'));
// // confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// // sendInfo = new SendInfo
// // (
// // confirmResult.msa,
// // confirmResult.cmd16,
// // MeterType.Ammeter,
// // CmdType.SetTimeSet,
// // null,
// // sDto
// // );
// // si.Add(sendInfo);
// // #endregion
// // #region 费率数（NN）
// // fm = GenerateCTCommand($"04000204", rate.ToString().PadLeft(2, '0'));
// // confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// // sendInfo = new SendInfo
// // (
// // confirmResult.msa,
// // confirmResult.cmd16,
// // MeterType.Ammeter,
// // CmdType.SetTimeSet,
// // null,
// // sDto
// // );
// // si.Add(sendInfo);
// // #endregion
// // si.AddRange(tempSi);
// // tempSi.Clear();
// // // si[si.Count - 1].cmdType = CmdType.SetTimeSet;//取最后一条指令的结果返回
// //}
// #endregion
// }
// return bytesList;
//}
#endregion
/// <summary>
/// 构建时段设置下发命令
/// </summary>
/// <param name="address"></param>
/// <param name="ammeterAddress"></param>
/// <param name="password"></param>
/// <param name="port"></param>
/// <param name="baudRate"></param>
/// <param name="timeSetDetails"></param>
/// <returns></returns>
public static List<byte[]> BuildAmmeterSetTimeSetSendCmd(string address, string ammeterAddress,string password,int port, string baudRate, List<TimeSetDetail> timeSetDetails)
{ {
List<byte[]> bytesList = new List<byte[]>(); List<byte[]> bytesList = new List<byte[]>();
if (modelCode == "DTSU193") //Cmd写死 programmodel.json
string cmd = "";
var generateBCDataUnit = Build645SendData.BuildAmmeterGenerateBCCommand(ComandCodeEnum.SpecialMeter_A, ammeterAddress, cmd, password,
"", "");
var bytes = BuildTransparentForwardingSendCmd(address, port, baudRate, generateBCDataUnit, StopBit.Stop1, Parity.None);
bytesList.Add(bytes);
List<SetAmmeterJFPGEntity> listdata = new List<SetAmmeterJFPGEntity>();
List<SetAmmeterJFPGEntity> templistdata = new List<SetAmmeterJFPGEntity>();
#region 排序
var timeSets = timeSetDetails;
Dictionary<int, TimeSetDetail> dicTsDetails = new Dictionary<int, TimeSetDetail>();
foreach (var timeSet in timeSets)
{ {
return null; int firstMonty = timeSet.Months[0];
if (!dicTsDetails.Keys.Contains(firstMonty))
dicTsDetails.Add(firstMonty, timeSet);
} }
else if (modelCode == "PMAC9523")
var sortKeys = dicTsDetails.Keys.OrderBy(n => n).ToList();
List<TimeSetDetail> orderTsDetails = new List<TimeSetDetail>();
foreach (var key in sortKeys)
{ {
var dataUnitList = Build645SendData.BuildPMAC9523AmmeterSetTimeSetSendDataUnit(ammeterAddress, data); orderTsDetails.Add(dicTsDetails[key]);
foreach (var dataUnit in dataUnitList) }
timeSetDetails = orderTsDetails;
#endregion
//年时区数
int yearTimeZoneCount = 0;
//日时段数/日切换数
int dayTimeZoneCount = 0;
//费率
int rate = 0;
for (int j = 1; j <= 2; j++)
{
SetAmmeterJFPGEntity setJFPGTool = new SetAmmeterJFPGEntity();
setJFPGTool.ComandCode = ComandCodeEnum.SpecialMeter_B;
//发送时区表数据
var timeZoneData = GenerateTimeZone(timeSetDetails);
setJFPGTool.DataMark = $"040{j}0000";
setJFPGTool.Data = timeZoneData;
templistdata.Add(setJFPGTool);
yearTimeZoneCount = timeZoneData.Length / 6;
//发送日时段数据
for (int i = 1; i <= timeSets.Count; i++)
{ {
var bytes = BuildTransparentForwardingSendCmd(address, port, baudRate, dataUnit, StopBit.Stop1, Parity.None); setJFPGTool = new SetAmmeterJFPGEntity();
bytesList.Add(bytes);
setJFPGTool.ComandCode = ComandCodeEnum.SpecialMeter_B;
var dayTimeZone = GenerateDayTimeZone(timeSets[i - 1].Data);
var dataMark = $"040{j}000{i}";
setJFPGTool.DataMark = dataMark;
setJFPGTool.Data = dayTimeZone;
templistdata.Add(setJFPGTool);
//计算日时段数
var dz = dayTimeZone.Length / 6;
if (dz > dayTimeZoneCount) dayTimeZoneCount = dz;
//计算费率
foreach (var detail in timeSets[i - 1].Data)
{
var rt = Convert.ToInt32(detail.Rate);
if (rt > rate) rate = rt;
}
} }
} }
else #region 年时区数（NN）
listdata.Add(new SetAmmeterJFPGEntity()
{ {
#region 采用TimeSet方法设置 弃用 Data = yearTimeZoneCount.ToString().PadLeft(2, '0'),
//List<string> fm = null; DataMark = "04000201",
//SendInfo sendInfo = null; ComandCode = ComandCodeEnum.SpecialMeter_B
//List<SendInfo> tempSi = new List<SendInfo>(); });
////判断是否需要进入编程模式，获取编程模式指令 #endregion
//var pm = ProgramModelConfig.ProgramModels.FirstOrDefault(n => n.BrandName == meterInfo.brand_name #region 日时段数（NN）
//&& n.Model == meterInfo.model_name); listdata.Add(new SetAmmeterJFPGEntity()
//if (pm != null) {
//{ Data = timeSets.Count.ToString().PadLeft(2, '0'),
// if (pm.IsEnter) DataMark = "04000202",
// { ComandCode = ComandCodeEnum.SpecialMeter_B
// //编程指令 });
// var bccmd= pm.cmdData; #endregion
// //替换表地址 #region 日切换数（NN）
// var addressList= Protocol.QGDW3761.DataTypeConvert.CutStr(meterInfo.meter_address, 2, true); listdata.Add(new SetAmmeterJFPGEntity()
// var addressstr = string.Join(" ",addressList); {
// bccmd = bccmd.Replace("AA AA AA AA AA AA", addressstr); Data = dayTimeZoneCount.ToString().PadLeft(2, '0'),
// fm = bccmd.Split(' ').ToList(); DataMark = "04000203",
ComandCode = ComandCodeEnum.SpecialMeter_B
});
#endregion
#region 费率数（NN）
listdata.Add(new SetAmmeterJFPGEntity()
{
Data = rate.ToString().PadLeft(2, '0'),
DataMark = "04000204",
ComandCode = ComandCodeEnum.SpecialMeter_B
});
#endregion
// //生成CRC listdata.AddRange(templistdata);
// var CRC = Protocol.QGDW3761.DataTypeConvert.GetCRC(fm); templistdata.Clear();
// fm.Add(CRC);
// fm.Add("16");
// confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true); foreach (var item in listdata)
// sendInfo = new SendInfo {
// ( var timeSetDataUnit =
// confirmResult.msa, Build645SendData.BuildAmmeterTimeSetSendDataUnit(ammeterAddress, password, item.DataMark,
// confirmResult.cmd16, item.Data);
// MeterType.Ammeter, var timeSetBytes = BuildTransparentForwardingSendCmd(address, port, baudRate, timeSetDataUnit, StopBit.Stop1, Parity.None);
// CmdType.ProgramModel, bytesList.Add(timeSetBytes);
// null,
// sDto
// );
// si.Add(sendInfo);
// }
// //年时区数
// int yearTimeZoneCount = 0;
// //日时段数
// int dayTimeZoneCount = 0;
// //费率
// int rate = 0;
// //发送两套时区
// for (int j = 1; j <= 2; j++)
// {
// //发送时区表数据
// var timeZoneData = GenerateTimeZone(sDto);
// yearTimeZoneCount = timeZoneData.Count / 3;
// fm = GenerateCTCommand($"040{j}0000", string.Join("", timeZoneData));
// confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// sendInfo = new SendInfo
// (
// confirmResult.msa,
// confirmResult.cmd16,
// MeterType.Ammeter,
// CmdType.SetTimeSet,
// null,
// sDto
// );
// tempSi.Add(sendInfo);
// //发送日时段数据
// for (int i = 1; i <= sDto.data.Count; i++)
// {
// var dayTimeZone = GenerateDayTimeZone(sDto.data[i - 1].data);
// fm = GenerateCTCommand($"040{j}000{i}", string.Join("", dayTimeZone));
// confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// sendInfo = new SendInfo
// (
// confirmResult.msa,
// confirmResult.cmd16,
// MeterType.Ammeter,
// CmdType.SetTimeSet,
// null,
// sDto
// );
// tempSi.Add(sendInfo);
// //计算日时段数
// var dz = dayTimeZone.Count / 3;
// if (dz > dayTimeZoneCount) dayTimeZoneCount = dz;
// //计算费率
// foreach(var detail in sDto.data[i - 1].data)
// {
// int rt = Convert.ToInt32(detail.rate);
// if (rt > rate) rate = rt;
// }
// }
// }
// #region 年时区数（NN）
// fm = GenerateCTCommand($"04000201", yearTimeZoneCount.ToString().PadLeft(2, '0'));
// confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// sendInfo = new SendInfo
// (
// confirmResult.msa,
// confirmResult.cmd16,
// MeterType.Ammeter,
// CmdType.SetTimeSet,
// null,
// sDto
// );
// si.Add(sendInfo);
// #endregion
// #region 日时段数据（NN）
// fm = GenerateCTCommand($"04000202", sDto.data.Count.ToString().PadLeft(2, '0'));
// confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// sendInfo = new SendInfo
// (
// confirmResult.msa,
// confirmResult.cmd16,
// MeterType.Ammeter,
// CmdType.SetTimeSet,
// null,
// sDto
// );
// si.Add(sendInfo);
// #endregion
// #region 日时段数(每日切换数)（NN）
// fm = GenerateCTCommand($"04000203", dayTimeZoneCount.ToString().PadLeft(2, '0'));
// confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// sendInfo = new SendInfo
// (
// confirmResult.msa,
// confirmResult.cmd16,
// MeterType.Ammeter,
// CmdType.SetTimeSet,
// null,
// sDto
// );
// si.Add(sendInfo);
// #endregion
// #region 费率数（NN）
// fm = GenerateCTCommand($"04000204", rate.ToString().PadLeft(2, '0'));
// confirmResult = GatherCmdHelper.ConrTurnData(meterInfo, fm, true);
// sendInfo = new SendInfo
// (
// confirmResult.msa,
// confirmResult.cmd16,
// MeterType.Ammeter,
// CmdType.SetTimeSet,
// null,
// sDto
// );
// si.Add(sendInfo);
// #endregion
// si.AddRange(tempSi);
// tempSi.Clear();
// // si[si.Count - 1].cmdType = CmdType.SetTimeSet;//取最后一条指令的结果返回
//}
#endregion
} }
return bytesList; return bytesList;
} }
/// <summary> /// <summary>
/// 构建电表参数设置-下发命令 /// 构建电表参数设置-下发命令
/// </summary> /// </summary>
@ -1002,18 +1139,29 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
/// </summary> /// </summary>
/// <param name="address"></param> /// <param name="address"></param>
/// <param name="time"></param> /// <param name="time"></param>
/// <param name="isManual"></param>
/// <returns></returns> /// <returns></returns>
public static byte[] BuildConrCheckTimeSendCmd(string address, DateTime time) public static byte[] BuildConrCheckTimeSendCmd(string address, DateTime time,bool isManual)
{ {
var week = ((int)time.DayOfWeek).DecToBin().PadLeft(3, '0'); List<string> dataUnit;
var monthTemp = time.Month.ToString().PadLeft(2, '0'); if (isManual)
var m1 = int.Parse(monthTemp[0].ToString()).DecToBin();//十位 {
var m2 = int.Parse(monthTemp[1].ToString()).DecToBin().PadLeft(4, '0');//个位 var week = ((int)time.DayOfWeek).DecToBin().PadLeft(3, '0');
var weekAndMonthHex = (week + m1 + m2).BinToHex().ToUpper(); var monthTemp = time.Month.ToString().PadLeft(2, '0');
var m1 = int.Parse(monthTemp[0].ToString()).DecToBin();//十位
var m2 = int.Parse(monthTemp[1].ToString()).DecToBin().PadLeft(4, '0');//个位
var weekAndMonthHex = (week + m1 + m2).BinToHex().ToUpper();
var strTimeFm = time.ToString("ss mm HH dd $$ yy").Replace("$$", weekAndMonthHex);
dataUnit = strTimeFm.Replace(" ", "").StringToPairs();
}
else
{
dataUnit = new List<string>(){"EE","EE","EE","EE"};
}
var strTimeFm = time.ToString("ss mm HH dd $$ yy").Replace("$$", weekAndMonthHex);
var dataUnit = strTimeFm.Replace(" ", "").StringToPairs();
dataUnit.AddRange(GetPW()); dataUnit.AddRange(GetPW());
var reqParameter = new ReqParameter2() var reqParameter = new ReqParameter2()
{ {
AFN = AFN.控制命令, AFN = AFN.控制命令,
@ -1644,6 +1792,88 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
return new List<string>() { pFC, seconds, minutes, hours, day, delayTime.ToString().PadLeft(2, '0') }; return new List<string>() { pFC, seconds, minutes, hours, day, delayTime.ToString().PadLeft(2, '0') };
} }
/// <summary>
/// 生成时区表数据
/// </summary>
/// <param name="sDto"></param>
/// <returns></returns>
private static string GenerateTimeZone(List<TimeSetDetail> datas)
{
var fm = new List<string>();
var timeSets = datas;
for (int i = 1; i <= timeSets.Count; i++)
{
var item = timeSets[i - 1];
var months = item.Months.ToList().OrderBy(n => n).ToArray();
for (int j = 0; j < months.Length; j++)
{
if (j == 0)
{
fm.Add($"{months[j].ToString().PadLeft(2, '0')}01{i.ToString().PadLeft(2, '0')}");
}
else
{
if (months[j] - months[j - 1] > 1)
{
fm.Add($"{months[j].ToString().PadLeft(2, '0')}01{i.ToString().PadLeft(2, '0')}");
}
}
}
}
fm = fm.OrderByDescending(n => Convert.ToInt32(n)).ToList();
return string.Join("", fm.ToArray());
}
/// <summary>
/// 生成日时段数据
/// </summary>
/// <param name="sDto"></param>
/// <returns></returns>
private static string GenerateDayTimeZone(List<MutileRateDetail> sDto)
{
var fm = new List<string>();
foreach (var item in sDto)
{
var sts = item.Times.Select(n => n.StartTime).OrderBy(n => n).ToList();
for (int j = 0; j < sts.Count; j++)
{
fm.Add($"{sts[j].Replace(":", "")}{item.Rate.PadLeft(2, '0')}");
}
}
fm = fm.OrderByDescending(n => Convert.ToInt32(n)).ToList();
//处理跨天的情况 23:00-7:00 这种需要拆分为2条 需要添加一条00:00 记录 23:00 00:00
List<string> stTimes = new List<string>();
// List<string> etTimes = new List<string>();
foreach (var item in sDto)
{
stTimes.AddRange(item.Times.Select(n => n.StartTime).OrderBy(n => n).ToList());
// etTimes.AddRange(item.times.Select(n => n.endTime).OrderByDescending(n => n).ToList());
}
stTimes = stTimes.OrderBy(n => n).ToList();
if (!stTimes[0].Equals("00:00"))
{
//查出最大时间的费率
var rate = "0";
foreach (var item in sDto)
{
if (item.Times.Select(n => n.StartTime).Contains(stTimes[stTimes.Count - 1]))
{
rate = item.Rate;
break;
}
}
fm.Add($"{"00:00".Replace(":", "")}{rate.PadLeft(2, '0')}");
}
return string.Join("", fm.ToArray());
}
#endregion #endregion
} }

107
src/JiShe.CollectBus.Common/BuildSendDatas/Build645SendData.cs
View File

@ -3,6 +3,8 @@ using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.Common.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Reflection.Metadata;
using static System.Runtime.InteropServices.JavaScript.JSType; using static System.Runtime.InteropServices.JavaScript.JSType;
namespace JiShe.CollectBus.Common.BuildSendDatas namespace JiShe.CollectBus.Common.BuildSendDatas
@ -215,32 +217,90 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
/// <exception cref="ArgumentNullException"></exception> /// <exception cref="ArgumentNullException"></exception>
public static List<string> BuildAmmeterTimeSetSendDataUnit(string ammeterAddress,string password, string dataMark,string data, string s_operator= "00000001") public static List<string> BuildAmmeterTimeSetSendDataUnit(string ammeterAddress,string password, string dataMark,string data, string s_operator= "00000001")
{ {
List<string> dataUnit = BuildAmmeterTimeSetDataUnit(password, dataMark, data); var datas = data.Split(' ').ToList();
datas.Reverse();
List<string> dataUnit = BuildAmmeterTimeSetDataUnit(password, dataMark, datas);
var dataList = Build645SendCommand(ammeterAddress, "14", dataUnit); List<string> dataList = new List<string>();
dataList.Add("68");
dataList.AddRange(ammeterAddress.PadLeft(12, '0').StringToPairs(true));
dataList.Add("68");
dataList.Add("14");//控制码
//transpond.Operator = "01000000";
dataList.Add(dataUnit.Count.DecToHex().PadLeft(2, '0'));//数据域长度
dataList.AddRange(dataUnit);
var csSum = HexStringExtensions.GetCRC(dataList);// GetCheckSumsHexString(string.Join("", content).StringToHexByte());
dataList.Add(csSum);
dataList.Add("16");
return dataList; return dataList;
} }
//工具生成指令 F10 103
//internal override List<string> GenerateContent(SetJFPGToolCmdIssueEntity transpond)
//{
// //TODO:替换表计地址
// var meterAddress = string.Join("", transpond.MeterAddress.Split(2, true)).PadRight(12, '0').Split(2, false);
// var cmdArr = transpond.Cmd.Replace(" ", "").Split(2, false);
// cmdArr.RemoveRange(1, 6);
// cmdArr.InsertRange(1, meterAddress);
// //TODO:替换校验码
// var csSum = GetCheckSumsHexString(string.Join("", cmdArr.Take(cmdArr.Count - 2)).StringToHexByte());
// cmdArr.RemoveRange(cmdArr.Count - 2, 2);
// cmdArr.Add(csSum);
// cmdArr.Add("16"); /// <summary>
/// 工具生成指令 F10 103
// return cmdArr; /// </summary>
//} /// <param name="ammeterAddress"></param>
/// <param name="cmd"></param>
public static List<string> BuildAmmeterGenerateBCCommand() /// <returns></returns>
public static List<string> GenerateContent(string ammeterAddress, string cmd)
{ {
return null; //替换表计地址
var meterAddress = ammeterAddress.PadLeft(12, '0').StringToPairs(true);
var cmdArr = cmd.Replace(" ", "").StringToPairs(true);
cmdArr.RemoveRange(1, 6);
cmdArr.InsertRange(1, meterAddress);
//替换校验码
var csSum = HexStringExtensions.GetCRC(cmdArr); //GetCheckSumsHexString(string.Join("", cmdArr.Take(cmdArr.Count - 2)).StringToHexByte());
cmdArr.RemoveRange(cmdArr.Count - 2, 2);
cmdArr.Add(csSum);
cmdArr.Add("16");
return cmdArr;
}
/// <summary>
/// AFN16_F106
/// </summary>
/// <param name="comandCodeEnum"></param>
/// <param name="ammeterAddress"></param>
/// <param name="cmd"></param>
/// <param name="password"></param>
/// <param name="dataMark"></param>
/// <param name="data"></param>
/// <returns></returns>
public static List<string> BuildAmmeterGenerateBCCommand(ComandCodeEnum comandCodeEnum,string ammeterAddress,string cmd, string password, string dataMark, string data)
{
List<string> content = new List<string>();
var meterAddress = ammeterAddress.PadLeft(12, '0').StringToPairs(true);
if (comandCodeEnum == ComandCodeEnum.SpecialMeter_A)
{
//编程指令
//TODO:替换表计地址
var cmdArr = cmd.Replace(" ", "").StringToPairs();
cmdArr.RemoveRange(1, 6);
cmdArr.InsertRange(1, meterAddress);
//TODO:替换校验码
var csSum = HexStringExtensions.GetCRC(cmdArr); //GetCheckSumsHexString(string.Join("", cmdArr).StringToHexByte());
cmdArr.Add(csSum);
cmdArr.Add("16");
return cmdArr;
}
else if(comandCodeEnum == ComandCodeEnum.SpecialMeter_B)
{
content.Add("68");
content.AddRange(meterAddress);
content.Add("68");
content.Add("14");//控制码
//transpond.Operator = "01000000";
var datas = data.StringToPairs(true);
var dataUnit = BuildAmmeterTimeSetDataUnit(password, dataMark, datas);
content.Add(dataUnit.Count.DecToHex().PadLeft(2, '0'));//数据域长度
content.AddRange(dataUnit);
var csSum = HexStringExtensions.GetCRC(content); //GetCheckSumsHexString(string.Join("", content).StringToHexByte());
content.Add(csSum);
content.Add("16");
}
return content;
} }
@ -644,7 +704,6 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
return fm; return fm;
} }
private static List<string> GenerateCTCommand(string ammeterAddress, string data) private static List<string> GenerateCTCommand(string ammeterAddress, string data)
{ {
List<string> fm = new List<string>(); List<string> fm = new List<string>();
@ -715,7 +774,7 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
/// <param name="s_operator"></param> /// <param name="s_operator"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="ArgumentNullException"></exception> /// <exception cref="ArgumentNullException"></exception>
private static List<string> BuildAmmeterTimeSetDataUnit(string password, string dataMark, string data, string s_operator = "00000001") private static List<string> BuildAmmeterTimeSetDataUnit(string password, string dataMark, List<string> datas, string s_operator = "00000001")
{ {
List<string> dataUnit = new List<string>(); List<string> dataUnit = new List<string>();
if (string.IsNullOrWhiteSpace(password)) if (string.IsNullOrWhiteSpace(password))
@ -744,8 +803,6 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
dataUnit.Add(item); dataUnit.Add(item);
} }
//TODO：数据体 DATA //TODO：数据体 DATA
var datas = data.Split(' ').ToList();
datas.Reverse();
dataUnit.AddRange(datas); dataUnit.AddRange(datas);
return dataUnit; return dataUnit;
} }

21
src/JiShe.CollectBus.Common/Enums/ComandCodeEnum.cs Normal file
View File

@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.Common.Enums
{
public enum ComandCodeEnum
{
/// <summary>
/// 特殊表第一个指令
/// </summary>
SpecialMeter_A,
/// <summary>
/// 特殊表第二个指令
/// </summary>
SpecialMeter_B
}
}

26
src/JiShe.CollectBus.Common/Models/SetAmmeterJFPGEntity.cs Normal file
View File

@ -0,0 +1,26 @@
using JiShe.CollectBus.Common.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.Common.Models
{
public class SetAmmeterJFPGEntity
{
public ComandCodeEnum ComandCode { get; set; }
/// <summary>
/// 数据标识
/// </summary>
public string DataMark { get; set; }
/// <summary>
/// 数据
/// </summary>
public string Data { get; set; }
/// <summary>
/// 自定义指令
/// </summary>
public string Cmd { get; set; }
}
}

37
src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs
View File

@ -7,20 +7,10 @@ using JiShe.CollectBus.MessageReceiveds;
using JiShe.CollectBus.Protocol.Contracts.Interfaces; using JiShe.CollectBus.Protocol.Contracts.Interfaces;
using JiShe.CollectBus.Protocols; using JiShe.CollectBus.Protocols;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Linq;
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Contracts.Models;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using System;
using System.Runtime.CompilerServices;
using MassTransit.Internals.GraphValidation;
using JiShe.CollectBus.Devices;
using JiShe.CollectBus.Common.BuildSendDatas; using JiShe.CollectBus.Common.BuildSendDatas;
using JiShe.CollectBus.Protocol.Contracts.AnalysisData; using JiShe.CollectBus.Protocol.Contracts.AnalysisData;
using Newtonsoft.Json.Linq;
using System.Diagnostics.Metrics;
using Newtonsoft.Json;
using TouchSocket.Core;
using Volo.Abp.Caching;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace JiShe.CollectBus.Protocol.Contracts.Abstracts namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
@ -142,9 +132,10 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <summary> /// <summary>
/// 解析确认或否认数据 /// 解析确认或否认数据
/// </summary> /// </summary>
/// <param name=""></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task AnalyzeAnswerDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeAnswerDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexStringList = messageReceived.MessageHexString.StringToPairs(); var hexStringList = messageReceived.MessageHexString.StringToPairs();
var fn = hexStringList.GetAnalyzeValue(CommandChunkEnum.FN); var fn = hexStringList.GetAnalyzeValue(CommandChunkEnum.FN);
@ -160,7 +151,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual List<AmmeterParameter> AnalyzeAmmeterParameterReadingDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual List<AmmeterParameter> AnalyzeAmmeterParameterReadingDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);
@ -241,7 +232,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived">报文</param> /// <param name="messageReceived">报文</param>
/// <param name="sendAction">发送委托</param> /// <param name="sendAction">发送委托</param>
/// <returns></returns> /// <returns></returns>
public virtual CurrentPositiveActiveEnergyAnalyze AnalyzeActivePowerIndicationReadingDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual CurrentPositiveActiveEnergyAnalyze AnalyzeActivePowerIndicationReadingDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);
@ -287,7 +278,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual void AnalyzeDailyFrozenReadingDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual void AnalyzeDailyFrozenReadingDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);
//附录A.20 日月年 //附录A.20 日月年
@ -351,7 +342,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns>//F25ReadingAnalyze /// <returns></returns>//F25ReadingAnalyze
public virtual Analyze3761Data AnalyzeF25ReadingDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual Analyze3761Data AnalyzeF25ReadingDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);
//A.15 分时日月年 //A.15 分时日月年
@ -504,7 +495,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns>//TerminalVersionInfoAnalyze /// <returns></returns>//TerminalVersionInfoAnalyze
public virtual Analyze3761Data AnalyzeTerminalVersionInfoReadingDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual Analyze3761Data AnalyzeTerminalVersionInfoReadingDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);
@ -555,7 +546,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual Analyze3761Data AnalyzeATypeOfDataItems49ReadingDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual Analyze3761Data AnalyzeATypeOfDataItems49ReadingDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);
@ -600,7 +591,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
public virtual void AnalyzeTerminalTimeReadingDataAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual void AnalyzeTerminalTimeReadingDataAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);
var time = Appendix.Appendix_A1(hexDatas.Take(6).ToList()); var time = Appendix.Appendix_A1(hexDatas.Take(6).ToList());
@ -612,7 +603,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual TB3761FN AnalyzeReadingDataAsync(MessageReceivedHeartbeat messageReceived, public virtual TB3761FN AnalyzeReadingDataAsync(MessageReceived messageReceived,
Action<byte[]>? sendAction = null) Action<byte[]>? sendAction = null)
{ {
var hexStringList = messageReceived.MessageHexString.StringToPairs(); var hexStringList = messageReceived.MessageHexString.StringToPairs();
@ -683,7 +674,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual TB3761FN AnalyzeReadingTdcDataAsync(MessageReceivedHeartbeat messageReceived, public virtual TB3761FN AnalyzeReadingTdcDataAsync(MessageReceived messageReceived,
Action<byte[]>? sendAction = null) Action<byte[]>? sendAction = null)
{ {
@ -808,7 +799,7 @@ 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 AnalyzeTransparentForwardingAnswerAsync(MessageReceivedHeartbeat messageReceivedEvent, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeTransparentForwardingAnswerAsync(MessageReceived messageReceivedEvent, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString); var hexDatas = GetHexDatas(messageReceivedEvent.MessageHexString);
@ -835,7 +826,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
/// <param name="messageReceived"></param> /// <param name="messageReceived"></param>
/// <param name="sendAction"></param> /// <param name="sendAction"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task AnalyzeTransparentForwardingAnswerResultAsync(MessageReceivedHeartbeat messageReceived, Action<byte[]>? sendAction = null) public virtual async Task AnalyzeTransparentForwardingAnswerResultAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexDatas = GetHexDatas(messageReceived.MessageHexString); var hexDatas = GetHexDatas(messageReceived.MessageHexString);

21
src/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
View File

@ -3,7 +3,9 @@ using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.MessageReceiveds; using JiShe.CollectBus.MessageReceiveds;
using JiShe.CollectBus.Protocol.Contracts.Abstracts; using JiShe.CollectBus.Protocol.Contracts.Abstracts;
using JiShe.CollectBus.Protocol.Contracts.Models;
using JiShe.CollectBus.Protocols; using JiShe.CollectBus.Protocols;
using Newtonsoft.Json.Linq;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol
{ {
@ -21,6 +23,25 @@ namespace JiShe.CollectBus.Protocol
public override Task AnalyzeAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null) public override Task AnalyzeAsync(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
{ {
var hexStringList = messageReceived.MessageHexString.StringToPairs();
var aTuple = (Tuple<string, int>)hexStringList.GetAnalyzeValue(CommandChunkEnum.A);
var afn = (int)hexStringList.GetAnalyzeValue(CommandChunkEnum.AFN);
var fn = (int)hexStringList.GetAnalyzeValue(CommandChunkEnum.FN);
if (afn == (int)AFN.请求实时数据)
{
if (Enum.IsDefined(typeof(ATypeOfDataItems), fn)) //Enum.TryParse(afn.ToString(), out ATypeOfDataItems parseResult)
{
AnalyzeReadingDataAsync(messageReceived, sendAction);
}
}
else if(afn == (int)AFN.请求历史数据)
{
if (Enum.IsDefined(typeof(IIdataTypeItems), fn))
{
AnalyzeReadingTdcDataAsync(messageReceived, sendAction);
}
}
throw new NotImplementedException(); throw new NotImplementedException();
} }