From e0dddc5d1b6b56c282e0cd2df4c4c95db37ffe68 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 10 五月 2025 08:57:29 +0800
Subject: [PATCH] 补充缺失的import
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 1e71d09..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,10 +252,12 @@
}
/**
- * 0x01锛氬埛鍗″紑闃�
- * 0x02锛氫腑蹇冪珯寮�闃�
- * 0x08锛氱敤鎴稟pp杩滅▼寮�闃�
- * 0x0B锛氬贰妫�鍗″紑闃�
+ * 1涓狧EX
+ * 0x01:姝ｅ父鍒峰崱寮�娉�/闃�鐢ㄦ按
+ * 0x02:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x08:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x0b:宸℃鍗★紝
+ * 0x04:鍏跺畠
* @param type
* @return
*/
@@ -264,8 +265,9 @@
return switch (type) {
case 1 -> "鍒峰崱寮�闃�";
case 2 -> "涓績绔欏紑闃�";
- case 8 -> "鐢ㄦ埛App杩滅▼寮�闃�";
+ case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 11 -> "宸℃鍗″紑闃�";
+ case 4 -> "鍏跺畠寮�闃�";
default -> "鏈煡";
};
}
@@ -281,7 +283,7 @@
return switch (type) {
case 1 -> (byte)1 ;
case 2 -> (byte)3 ;
- case 8 -> (byte)3 ;
+ case 8 -> (byte)8 ;
case 11 -> (byte)11 ;
default -> (byte)-1;
};
@@ -344,13 +346,13 @@
public static byte closeType2P206V1(byte type){
return switch (type) {
case 0 -> (byte)2;
- case 1,2 -> (byte)4;
+ case 1,11 -> (byte)4;
+ case 2 -> (byte)9;
case 3 -> (byte)12;
- case 4,5 -> (byte)6;
- case 6,7,10 -> (byte)5;
+ case 4,5,10 -> (byte)6;
+ case 6,7 -> (byte)5;
case 8 -> (byte)16;
case 9,12 -> (byte)7;
- case 11 -> (byte)9;
default -> (byte)-1;
};
}
--
Gitblit v1.8.0