From 5eaeea576c1f9e5446d9ee7376d1a13305999c4e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:32 +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/p206V1_0_0/CommonV1_0_1.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
index 02f388b..c95f317 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -180,11 +180,15 @@
* 12:榛戝悕鍗曞懡浠ゅ叧闃�锛�
* 13:杩滅▼瀹氭椂鍏抽榾锛�
* 14:杩滅▼瀹氶噺鍏抽榾锛�
+ * 16:绠￠亾鏃犳按鑷姩鍏抽榾锛�(鐜嬫睙娴峰崗璁�)
* )
* @param type 瀛楄妭
* @return 鍚嶇О
*/
- public static String openCloseValveType(byte type){
+ public static String openCloseValveType(Byte type){
+ if(type == null){
+ return "" ;
+ }
return switch (type) {
case 1 -> "鍒峰崱寮�闃�";
case 2 -> "鍒峰崱鍏抽榾";
@@ -200,6 +204,7 @@
case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
case 13 -> "杩滅▼瀹氭椂鍏抽榾";
case 14 -> "杩滅▼瀹氶噺鍏抽榾";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
default -> "鏈煡";
};
}
--
Gitblit v1.8.0