From 7f85ca5468e097f1749ab1ed812046cb8eb979b7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 四月 2025 17:58:48 +0800
Subject: [PATCH] 表阀一体机与测控一体阀协议中的阀门状态不兼容，做兼容处理。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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..394daf3 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
@@ -253,10 +253,12 @@
}
/**
- * 0x01锛氬埛鍗″紑闃�
- * 0x02锛氫腑蹇冪珯寮�闃�
- * 0x08锛氱敤鎴稟pp杩滅▼寮�闃�
- * 0x0B锛氬贰妫�鍗″紑闃�
+ * 1涓狧EX
+ * 0x01:姝ｅ父鍒峰崱寮�娉�/闃�鐢ㄦ按
+ * 0x02:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x08:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x0b:宸℃鍗★紝
+ * 0x04:鍏跺畠
* @param type
* @return
*/
@@ -264,8 +266,9 @@
return switch (type) {
case 1 -> "鍒峰崱寮�闃�";
case 2 -> "涓績绔欏紑闃�";
- case 8 -> "鐢ㄦ埛App杩滅▼寮�闃�";
+ case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 11 -> "宸℃鍗″紑闃�";
+ case 4 -> "鍏跺畠寮�闃�";
default -> "鏈煡";
};
}
@@ -281,7 +284,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 +347,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