From f5ee7429caca41bde13fcfe3aa85ded38927110f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 七月 2024 10:11:31 +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 | 72 ++++++++++-------------------------
1 files changed, 21 insertions(+), 51 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 929f503..95e1da3 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
@@ -165,7 +165,22 @@
/**
* 寰楀埌鍏冲紑闃�绫诲瀷鍚嶇О
- * 寮�鍏抽榾绫诲瀷(1:鍒峰崱寮�闃�锛�2:鍒峰崱鍏抽榾锛�3:涓績绔欏紑闃�锛�4:涓績绔欏叧闃�锛�5:娆犺垂鍏抽榾锛�6:娴侀噺璁℃晠闅滃叧闃�锛�7:绱ф�ュ叧闂紱8:鐢ㄦ埛杩滅▼寮�闃�锛�9:鐢ㄦ埛杩滅▼鍏抽榾锛�10:寮�鍏抽榾鍗″叧闃�锛�11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�)
+ * 寮�鍏抽榾绫诲瀷(
+ * 1:鍒峰崱寮�闃�锛�
+ * 2:鍒峰崱鍏抽榾锛�
+ * 3:涓績绔欏紑闃�锛�
+ * 4:涓績绔欏叧闃�锛�
+ * 5:娆犺垂鍏抽榾锛�
+ * 6:娴侀噺璁℃晠闅滃叧闃�锛�
+ * 7:绱ф�ュ叧闂紱
+ * 8:鐢ㄦ埛杩滅▼寮�闃�锛�
+ * 9:鐢ㄦ埛杩滅▼鍏抽榾锛�
+ * 10:寮�鍏抽榾鍗″叧闃�锛�
+ * 11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�
+ * 12:榛戝悕鍗曞懡浠ゅ叧闃�锛�
+ * 13:鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾锛�
+ * 14:鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾锛�
+ * )
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -182,64 +197,19 @@
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
case 10 -> "寮�鍏抽榾鍗″叧闃�";
case 11 -> "寮�鍏抽榾鍗″紑闃�";
+ case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
+ case 13 -> "鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾";
+ case 14 -> "鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾";
default -> "鏈煡";
};
}
public static Boolean isCloseValveType(byte type){
return switch (type) {
- case 1 -> false ;
- case 2 -> true ;
- case 3 -> false ;
- case 4 -> true ;
- case 5 -> true ;
- case 6 -> true ;
- case 7 -> true ;
- case 8 -> false ;
- case 9 -> true ;
- case 10 -> true ;
- case 11 -> false ;
+ case 1, 3, 8, 11 -> false ;
+ case 2, 4, 5, 6, 7, 9, 10, 12, 13, 14 -> true ;
default -> null ;
};
}
-// /**
-// * 澶勭悊IC鍗＄紪鍙凤紝闈虫�诲埗瀹氱殑鍗忚瑕佹眰10浣岻C鍗＄紪鍙�
-// * @param icCardNo
-// * @return
-// */
-// public static String[] dealIcCardNo(String icCardNo){
-// if(icCardNo.length() > 10){
-// String tail = icCardNo.substring(icCardNo.length() - 10) ;
-// String head = icCardNo.substring(0, icCardNo.length() - 10) ;
-// return new String[]{head , tail} ;
-// }else if(icCardNo.length() < 10){
-// while(icCardNo.length() != 10){
-// icCardNo = "0" + icCardNo ;
-// }
-// return new String[]{null , icCardNo} ;
-// }else{
-// return new String[]{null , icCardNo} ;
-// }
-// }
-
- /*
- * 鍒嗘瀽鐗堟湰鍙�
- * @param bs 涓婅瀛楄妭鏁扮粍
- * @return 鐗堟湰鍙�
- * @throws Exception 寮傚父
- public String parseVersion(byte[] bs)throws Exception{
- short ver = ByteUtilUnsigned.byte2Byte(bs, ProtocolConstantV206V1_0_0.versionIndex) ;
- char[] cs = ("" + ver).toCharArray() ;
- StringBuilder vs = new StringBuilder() ;
- for(byte i = 0 ; i < cs.length; i++){
- if(i == 0){
- vs.append(cs[i]) ;
- }else{
- vs.append(".").append(cs[i]) ;
- }
- }
- return vs.toString() ;
- }
- */
}
--
Gitblit v1.8.0