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 | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 7ffbfa9..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
@@ -147,7 +147,7 @@
return b ;
}
/**
- * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)锛�
+ * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬贰妫�鍗★紱5锛氭竻绌哄崱)锛�
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -157,7 +157,7 @@
case 1 -> "鐢ㄦ埛鍗�";
case 2 -> "绠＄悊鍛樺崱";
case 3 -> "璋冭瘯鍗�";
- case 4 -> "寮�鍏抽榾鍗�";
+ case 4 -> "宸℃鍗�";
case 5 -> "娓呯┖鍗�";
default -> "鏈煡";
};
@@ -170,36 +170,41 @@
* 2:鍒峰崱鍏抽榾锛�
* 3:涓績绔欏紑闃�锛�
* 4:涓績绔欏叧闃�锛�
- * 5:娆犺垂鍏抽榾锛�
+ * 5:浣欓涓嶈冻鍏抽榾锛�
* 6:娴侀噺璁℃晠闅滃叧闃�锛�
* 7:绱ф�ュ叧闂紱
* 8:鐢ㄦ埛杩滅▼寮�闃�锛�
* 9:鐢ㄦ埛杩滅▼鍏抽榾锛�
- * 10:寮�鍏抽榾鍗″叧闃�锛�
- * 11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�
+ * 10:宸℃鍗″叧闃�锛�
+ * 11:宸℃鍗″埛鍗″崱寮�闃�锛�
* 12:榛戝悕鍗曞懡浠ゅ叧闃�锛�
- * 13:杩滅▼瀹氭椂鍏抽榾寮忓紑闃�锛�
- * 14:杩滅▼瀹氶噺鍏抽榾寮忓紑闃�锛�
+ * 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 -> "鍒峰崱鍏抽榾";
case 3 -> "涓績绔欏紑闃�";
case 4 -> "涓績绔欏叧闃�";
- case 5 -> "娆犺垂鍏抽榾";
+ case 5 -> "浣欓涓嶈冻鍏抽榾";
case 6 -> "娴侀噺璁℃晠闅滃叧闃�";
case 7 -> "绱ф�ュ叧闃�";
case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
- case 10 -> "寮�鍏抽榾鍗″叧闃�";
- case 11 -> "寮�鍏抽榾鍗″紑闃�";
+ case 10 -> "宸℃鍗″叧闃�";
+ case 11 -> "宸℃鍗″紑闃�";
case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
- case 13 -> "杩滅▼瀹氭椂鍏抽榾寮忓紑闃�";
- case 14 -> "杩滅▼瀹氶噺鍏抽榾寮忓紑闃�";
+ case 13 -> "杩滅▼瀹氭椂鍏抽榾";
+ case 14 -> "杩滅▼瀹氶噺鍏抽榾";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
default -> "鏈煡";
};
}
--
Gitblit v1.8.0