From b1dc9988b9587add132a01faa6bc09e162fe1491 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 七月 2024 21:39:38 +0800
Subject: [PATCH] 1、开关阀报中增加农户关联； 2、工作报中增加农户关联； 3、取水口损失流量完善； 4、实现取水日取水量统计。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 2 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 c1b8d7f..0817c1b 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
@@ -81,12 +81,30 @@
*/
public String parseRtuAddr(byte[] bs)throws Exception{
String rtuAddrBCD = "" + ByteUtil.BCD2Long_BE(bs, ProtocolConstantV206V1_0_0.rtuAddr1Index_start, ProtocolConstantV206V1_0_0.rtuAddr1Index_end) ;
- String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_BE(bs, ProtocolConstantV206V1_0_0.rtuAddr2Index_start) ;
- while(rtuAddrStr.length() < 4){
+ String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.rtuAddr2Index_start) ;
+ while(rtuAddrStr.length() <= 5){
rtuAddrStr = "0" + rtuAddrStr ;
}
return rtuAddrBCD + rtuAddrStr ;
}
+
+
+ /**
+ * 鍒嗘瀽Rtu鍦板潃
+ * @param bs 涓婅瀛楄妭鏁扮粍
+ * @param index 鍚浣�
+ * @return 鎺у埗鍣ㄥ湴鍧�
+ * @throws Exception 寮傚父
+ */
+ public String parseRtuAddr(byte[] bs, int index)throws Exception{
+ String rtuAddrBCD = "" + ByteUtil.BCD2Long_BE(bs, index, index + 2) ;//鍦板潃鏄ぇ绔ā寮�
+ String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index + 3) ;
+ while(rtuAddrStr.length() < 5){
+ rtuAddrStr = "0" + rtuAddrStr ;
+ }
+ return rtuAddrBCD + rtuAddrStr ;
+ }
+
/**
* 鍒嗘瀽鍔熻兘鐮�
@@ -128,9 +146,26 @@
//DIR = 0
return b ;
}
+ /**
+ * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)锛�
+ * @param type 瀛楄妭
+ * @return 鍚嶇О
+ */
+ public static String icCardType(byte type){
+ return switch (type) {
+ case 0 -> "鏃犲崱";
+ case 1 -> "鐢ㄦ埛鍗�";
+ case 2 -> "绠＄悊鍛樺崱";
+ case 3 -> "璋冭瘯鍗�";
+ case 4 -> "寮�鍏抽榾鍗�";
+ case 5 -> "娓呯┖鍗�";
+ default -> "鏈煡";
+ };
+ }
/**
* 寰楀埌鍏冲紑闃�绫诲瀷鍚嶇О
+ * 寮�鍏抽榾绫诲瀷(1:鍒峰崱寮�闃�锛�2:鍒峰崱鍏抽榾锛�3:涓績绔欏紑闃�锛�4:涓績绔欏叧闃�锛�5:娆犺垂鍏抽榾锛�6:娴侀噺璁℃晠闅滃叧闃�锛�7:绱ф�ュ叧闂紱8:鐢ㄦ埛杩滅▼寮�闃�锛�9:鐢ㄦ埛杩滅▼鍏抽榾锛�10:寮�鍏抽榾鍗″叧闃�锛�11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�)
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -145,9 +180,47 @@
case 7 -> "绱ф�ュ叧闃�";
case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
+ case 10 -> "寮�鍏抽榾鍗″叧闃�";
+ case 11 -> "寮�鍏抽榾鍗″紑闃�";
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 ;
+ 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} ;
+ }
+ }
/*
* 鍒嗘瀽鐗堟湰鍙�
--
Gitblit v1.8.0