From 1fe74a6aba7cc02e6a5c00a227ff815639f825de Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 七月 2024 20:52:45 +0800
Subject: [PATCH] 1、实现RTU模拟器，并实现心跳上报、开阀上报、关阀上报； 2、基于RTU模拟器的开关阀上报，设计通信中间件上行数据处理任务的bug;
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
index 86f8b00..9918155 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
@@ -15,14 +15,22 @@
public Boolean isThisProtocolHead(byte[] bs) throws Exception{
if(bs == null){
return null ;
- }else if(bs.length >= (ProtocolConstantV206V202404.ctrlIndex - 1)
+ }else if(bs.length >= ProtocolConstantV206V202404.ctrlIndex
&& bs[0] == ProtocolConstantV206V202404.P_Head_Byte){
if(bs[2] == ProtocolConstantV206V202404.P_Head_Byte){
- return true ;
+ if(bs[3] == (byte)0x80 || bs[3] == (byte)0x81){
+ return true ;
+ }else{
+ return false ;
+ }
}else if((byte)(bs[2] & 0xF8) == ProtocolConstantV206V202404.P_Head_Byte){
//濡傛灉鎺у埗鍩熴�佸湴鍧�鍩熴�佺敤鎴锋暟鎹煙(搴旂敤灞�)鐨勫瓧鑺傛�绘暟澶т簬255锛屽垯閫氳繃鎵╁睍绗簩涓紑濮嬪瓧绗�0x68鐨勪綆3浣嶄綔涓洪暱L鐨勯珮浣嶆墿灞�
//0xF8浜岃繘鍒讹細 11111000
- return true ;
+ if(bs[3] == (byte)0x80 || bs[3] == (byte)0x81){
+ return true ;
+ }else{
+ return false ;
+ }
}else{
return false ;
}
--
Gitblit v1.8.0