From ff55f15de19cb5bf02fa4d2313f4882ef9b3a452 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 30 四月 2025 10:47:34 +0800
Subject: [PATCH] 表阀一体机上报心跳数据最小间隔经常改动，时常不通知软件开发人员，所以通信中间件根据最小上报数据间隔会切断设备网络连接，为此改变中间件配置，最小心跳间隔改为在properties文件中配置。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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..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,20 +253,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 +282,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