From 70aeac289c132085e91d59dc82bc1facd41889fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:33:53 +0800
Subject: [PATCH] 有关表阀一体机（王江海制定）通信协议： 1、根据新版本协议，解析部分更新； 2、根据测试一体阀协议数据处理需求与逻辑，进行表阀一体机数据处理。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 dd0eedd..9f25e16 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
@@ -38,7 +38,7 @@
return false ;
}
}else if((byte)(bs[2] & 0xF8) == ProtocolConstantV206V202404.P_Head_Byte){
- //濡傛灉鎺у埗鍩熴�佸湴鍧�鍩熴�佺敤鎴锋暟鎹煙(搴旂敤灞�)鐨勫瓧鑺傛�绘暟澶т簬255锛屽垯閫氳繃鎵╁睍绗簩涓紑濮嬪瓧绗�0x68鐨勪綆3浣嶄綔涓洪暱L鐨勯珮浣嶆墿灞�
+ //濡傛灉鎺у埗鍩熴�佸湴鍧�鍩熴�佺敤鎴锋暟鎹煙(搴旂敤灞�)鐨勫瓧鑺傛�绘暟澶т簬255锛屽垯閫氳繃鎵╁睍绗簩涓紑濮嬪瓧绗�0x69鐨勪綆3浣嶄綔涓洪暱L鐨勯珮浣嶆墿灞�
//0xF8浜岃繘鍒讹細 11111000
if(bs[3] == (byte)0x80 || bs[3] == (byte)0x81){
return true ;
@@ -273,6 +273,15 @@
};
}
+ public static String ctrlDevType(String hex){
+ return switch (hex) {
+ case "01" -> "娴嬫帶涓�浣撻榾";
+ case "02" -> "琛ㄩ榾涓�浣撴満";
+ case "57" -> "浜曠數鎺у埗鍣�";
+ default -> "鏈煡";
+ };
+ }
+
/*
* 鍒嗘瀽鐗堟湰鍙�
* @param bs 涓婅瀛楄妭鏁扮粍
--
Gitblit v1.8.0