g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-29 14:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

dlt645添加数据标识校验

Browse Source
This commit is contained in:
Kimdiego2098
2023-08-27 16:30:32 +08:00
parent 082c08e5f9
commit ae840758f7
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007DataHandleAdapter.cs
View File

@@ -141,6 +141,8 @@ public class DLT645_2007DataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapter
}
if ((response[headCodeIndex + 8] & 0x40) == 0x40)//控制码bit6为1时，返回错误
{
byte byte1 = (byte)(response[headCodeIndex + 10] - 0x33);
@@ -149,13 +151,35 @@ public class DLT645_2007DataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapter
request.ResultCode = ResultCode.Fail;
return FilterResult.Success;
}
else
if (send[sendHeadCodeIndex + 8] == (byte)ControlCode.Read ||
send[sendHeadCodeIndex + 8] == (byte)ControlCode.Write
)
{
request.Content = response.RemoveBegin(headCodeIndex + 10).RemoveLast(response.Length + 2 - len - headCodeIndex);
request.ResultCode = ResultCode.Success;
return FilterResult.Success;
//数据标识不符合时，返回错误
if (
(response[headCodeIndex + 10] == send[sendHeadCodeIndex + 10]) &&
(response[headCodeIndex + 11] == send[sendHeadCodeIndex + 11]) &&
(response[headCodeIndex + 12] == send[sendHeadCodeIndex + 12]) &&
(response[headCodeIndex + 13] == send[sendHeadCodeIndex + 13])
)
{
}
else
{
request.Message = "返回数据标识不符合规则";
request.ResultCode = ResultCode.Fail;
return FilterResult.Success;
}
}
request.Content = response.RemoveBegin(headCodeIndex + 10).RemoveLast(response.Length + 2 - len - headCodeIndex);
request.ResultCode = ResultCode.Success;
return FilterResult.Success;
}
else
{