From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 f21a76e..b27c2be 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
@@ -1,8 +1,7 @@
package com.dy.common.mw.protocol.p206V202404;
import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
-import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
-import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
+
import com.dy.common.util.ByteUtil;
import com.dy.common.util.ByteUtilUnsigned;
import com.dy.common.util.CRC16;
@@ -17,8 +16,8 @@
* @param ioSession 浼氳瘽
*/
public void setThisProtocolArr2IoSession(IoSession ioSession){
- ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V1.protocolName) ;
- ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V1.protocolVer) ;
+ ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V202404.protocolName) ;
+ ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V202404.protocolVer) ;
}
/**
* 妫�鏌ュご
@@ -123,8 +122,8 @@
* @throws Exception 寮傚父
*/
public int parseDataLen4Ug(byte[] bs)throws Exception{
- int len = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V2.UG_dataLenIndex_start) ;
- return len - ProtocolConstantV206V2.UG_lenCmd - ProtocolConstantV206V2.UG_lenRtuAddr ;
+ int len = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V202404.UG_dataLenIndex_start) ;
+ return len - ProtocolConstantV206V202404.UG_lenCmd - ProtocolConstantV206V202404.UG_lenRtuAddr ;
}
@@ -253,20 +252,21 @@
}
/**
- * 0x00:姝ｅ父鍒峰崱寮�娉�/闃�鐢ㄦ按
- * 0x01:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按
- * 0x02:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按
- * 0x03:娴嬭瘯鍗★紝
+ * 1涓狧EX
+ * 0x01:姝ｅ父鍒峰崱寮�娉�/闃�鐢ㄦ按
+ * 0x02:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x08:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x0b:宸℃鍗★紝
* 0x04:鍏跺畠
* @param type
* @return
*/
public static String openValveType(byte type){
return switch (type) {
- case 0 -> "鍒峰崱寮�闃�";
- case 1 -> "涓績绔欏紑闃�";
- case 2 -> "鐢ㄦ埛杩滅▼寮�闃�";
- case 3 -> "娴嬭瘯鍗″紑闃�";
+ case 1 -> "鍒峰崱寮�闃�";
+ case 2 -> "涓績绔欏紑闃�";
+ case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
+ case 11 -> "宸℃鍗″紑闃�";
case 4 -> "鍏跺畠寮�闃�";
default -> "鏈煡";
};
@@ -281,10 +281,10 @@
*/
public static byte openType2P206V1(byte type){
return switch (type) {
- case 0 -> (byte)1 ;
- case 1 -> (byte)3 ;
- case 2 -> (byte)8 ;
- case 3 -> (byte)11 ;
+ case 1 -> (byte)1 ;
+ case 2 -> (byte)3 ;
+ case 8 -> (byte)8 ;
+ case 11 -> (byte)11 ;
default -> (byte)-1;
};
}
--
Gitblit v1.8.0