From b6833ab41416dd68a30f7cd368a802aa3a0a2e21 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 11 七月 2024 20:32:10 +0800
Subject: [PATCH] 1、完善代码； 2、生成新模块pipIrr-mwTest-rtu
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java | 373 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 243 insertions(+), 130 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
index ee7b49d..d0f7034 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
@@ -310,7 +310,7 @@
long l = 0;
long[] ls = new long[len] ;
for(int i = 0 ; i < len; i++){
- ls[i] = bs[i] ;
+ ls[i] = bs[i] & 0xFF ;
}
for(int i = len-1 ; i >= 0; i--){
ls[(len - 1) - i] <<= 8 * i ;
@@ -334,14 +334,14 @@
boolean b = isOutOfArrLength(bs.length, (from - 1) + 8);
if (b) {
long s = 0;
- long s0 = bs[from + 0] ;// 鏈�浣庝綅
- long s1 = bs[from + 1] ;
- long s2 = bs[from + 2] ;
- long s3 = bs[from + 3] ;
- long s4 = bs[from + 4] ;
- long s5 = bs[from + 5] ;
- long s6 = bs[from + 6] ;
- long s7 = bs[from + 7] ;
+ long s0 = bs[from + 0] & 0xFF ;// 鏈�浣庝綅
+ long s1 = bs[from + 1] & 0xFF ;
+ long s2 = bs[from + 2] & 0xFF ;
+ long s3 = bs[from + 3] & 0xFF ;
+ long s4 = bs[from + 4] & 0xFF ;
+ long s5 = bs[from + 5] & 0xFF ;
+ long s6 = bs[from + 6] & 0xFF ;
+ long s7 = bs[from + 7] & 0xFF ;
// s7涓嶅彉
s6 <<= 8;
@@ -371,7 +371,7 @@
short len = (short)(end - from + 1) ;
long[] ls = new long[len] ;
for(short i = 0 ; i < len; i++){
- ls[i] = bs[from + i] ;
+ ls[i] = bs[from + i] & 0xFF ;
}
for(short i = (short)(len-1) ; i >= 0; i--){
ls[i] <<= 8 * (len - (i + 1)) ;
@@ -400,7 +400,7 @@
long l = 0;
long[] ls = new long[len] ;
for(int i = 0 ; i < len; i++){
- ls[i] = bs[i] ;
+ ls[i] = bs[i] & 0xFF ;
}
for(int i = 0 ; i < len; i++){
ls[(len - 1) - i] <<= 8 * i ;
@@ -424,14 +424,14 @@
boolean b = isOutOfArrLength(bs.length, (from - 1) + 8);
if (b) {
long s = 0;
- long s0 = bs[from] ;// 鏈�浣庝綅
- long s1 = bs[from + 1] ;
- long s2 = bs[from + 2] ;
- long s3 = bs[from + 3] ;
- long s4 = bs[from + 4] ;
- long s5 = bs[from + 5] ;
- long s6 = bs[from + 6] ;
- long s7 = bs[from + 7] ;
+ long s0 = bs[from] & 0xFF ;// 鏈�浣庝綅
+ long s1 = bs[from + 1] & 0xFF ;
+ long s2 = bs[from + 2] & 0xFF ;
+ long s3 = bs[from + 3] & 0xFF ;
+ long s4 = bs[from + 4] & 0xFF ;
+ long s5 = bs[from + 5] & 0xFF ;
+ long s6 = bs[from + 6] & 0xFF ;
+ long s7 = bs[from + 7] & 0xFF ;
// s0涓嶅彉
s1 <<= 8;
@@ -462,7 +462,7 @@
short len = (short)(end - from + 1) ;
long[] ls = new long[len] ;
for(short i = 0 ; i < len; i++){
- ls[i] = bs[from + i] ;
+ ls[i] = bs[from + i] & 0xFF ;
}
for(short i = 0 ; i < len; i++){
ls[i] <<= 8 * i ;
@@ -531,10 +531,10 @@
boolean b = isOutOfArrLength(bs.length, (from - 1) + 4);
if (b) {
int s = 0;
- int s0 = bs[from + 0] ;// 鏈�浣庝綅
- int s1 = bs[from + 1] ;
- int s2 = bs[from + 2] ;
- int s3 = bs[from + 3] ;
+ int s0 = bs[from + 0] & 0xFF ;// 鏈�浣庝綅
+ int s1 = bs[from + 1] & 0xFF ;
+ int s2 = bs[from + 2] & 0xFF ;
+ int s3 = bs[from + 3] & 0xFF ;
// s3涓嶅彉
s2 <<= 8;
@@ -558,10 +558,10 @@
boolean b = isOutOfArrLength(bs.length, (from - 1) + 4);
if (b) {
int s = 0;
- int s0 = bs[from + 0] ;// 鏈�浣庝綅
- int s1 = bs[from + 1] ;
- int s2 = bs[from + 2] ;
- int s3 = bs[from + 3] ;
+ int s0 = bs[from + 0] & 0xFF ;// 鏈�浣庝綅
+ int s1 = bs[from + 1] & 0xFF ;
+ int s2 = bs[from + 2] & 0xFF ;
+ int s3 = bs[from + 3] & 0xFF ;
// s0涓嶅彉
s1 <<= 8;
@@ -654,8 +654,8 @@
boolean b = isOutOfArrLength(bs.length, (from - 1) + 2);
if (b) {
int s = 0;
- int s0 = bs[from + 0] ;
- int s1 = bs[from + 1] ;
+ int s0 = bs[from + 0] & 0xFF ;
+ int s1 = bs[from + 1] & 0xFF ;
// s1涓嶅彉
s0 <<= 8;
@@ -677,8 +677,8 @@
boolean b = isOutOfArrLength(bs.length, (from - 1) + 2);
if (b) {
int s = 0;
- int s0 = bs[from + 0] ;
- int s1 = bs[from + 1] ;
+ int s0 = bs[from + 0] & 0xFF ;
+ int s1 = bs[from + 1] & 0xFF ;
// s0涓嶅彉
s1 <<= 8;
@@ -892,47 +892,107 @@
* @return 杩斿洖 String
*/
public static String bytes2Hex(byte[] src, boolean hasBlank){
- StringBuilder stringBuilder = new StringBuilder("");
- if (src == null || src.length <= 0) {
- return null;
- }
- for (int i = 0; i < src.length; i++) {
- int v = src[i] & 0xFF;
- String str = Integer.toHexString(v);
- if (str.length() < 2) {
- str = "0" + str;
- }
- if (hasBlank) {
- if (i == 0) {
- stringBuilder.append(str);
- } else {
- stringBuilder.append(" " + str);
- }
- } else {
- stringBuilder.append(str);
- }
- }
- return stringBuilder.toString().toUpperCase(Locale.US);
+ return bytes2Hex_BE(src, hasBlank) ;
}
+
+ /**
+ * 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓�
+ *
+ * @param src byte[]
+ * @param hasBlank 16杩涘埗鏄惁鐢ㄧ┖鏍煎垎闅�
+ * @return 杩斿洖 String
+ */
+ public static String bytes2Hex_BE(byte[] src, boolean hasBlank){
+ StringBuilder stringBuilder = new StringBuilder("");
+ if (src == null || src.length <= 0) {
+ return null;
+ }
+ for (int i = 0; i < src.length; i++) {
+ int v = src[i] & 0xFF;
+ String str = Integer.toHexString(v);
+ if (str.length() < 2) {
+ str = "0" + str;
+ }
+ if (hasBlank) {
+ if (i == 0) {
+ stringBuilder.append(str);
+ } else {
+ stringBuilder.append(" " + str);
+ }
+ } else {
+ stringBuilder.append(str);
+ }
+ }
+ return stringBuilder.toString().toUpperCase(Locale.US);
+ }
+ /**
+ * 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓�
+ *
+ * @param src byte[]
+ * @param hasBlank 16杩涘埗鏄惁鐢ㄧ┖鏍煎垎闅�
+ * @return 杩斿洖 String
+ */
+ public static String bytes2Hex_LE(byte[] src, boolean hasBlank){
+ StringBuilder stringBuilder = new StringBuilder("");
+ if (src == null || src.length <= 0) {
+ return null;
+ }
+ for (int i = src.length - 1 ; i >= 0; i--) {
+ int v = src[i] & 0xFF;
+ String str = Integer.toHexString(v);
+ if (str.length() < 2) {
+ str = "0" + str;
+ }
+ if (hasBlank) {
+ if (i == 0) {
+ stringBuilder.append(str);
+ } else {
+ stringBuilder.append(" " + str);
+ }
+ } else {
+ stringBuilder.append(str);
+ }
+ }
+ return stringBuilder.toString().toUpperCase(Locale.US);
+ }
/**
* 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓�
*
- * @param src byte[]
+ * @param bs byte[]
* @param hasBlank 16杩涘埗鏄惁鐢ㄧ┖鏍煎垎闅�
* @param from 寮�濮嬩綅
* @param len 闀垮害
* @return 杩斿洖 String
*/
- public static String bytes2Hex(byte[] src, boolean hasBlank, int from, int len){
- if (src == null || src.length <= 0 || src.length < from + len) {
+ public static String bytes2Hex(byte[] bs, boolean hasBlank, int from, int len){
+ if (bs == null || bs.length <= 0 || bs.length < from + len) {
return null;
}
byte[] bb = new byte[len];
for (int i = 0 ; i < len; i++) {
- bb[i] = src[from + i];
+ bb[i] = bs[from + i];
}
return bytes2Hex(bb, hasBlank) ;
}
+ /**
+ * 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓�
+ *
+ * @param bs byte[]
+ * @param hasBlank 16杩涘埗鏄惁鐢ㄧ┖鏍煎垎闅�
+ * @param from 寮�濮嬩綅
+ * @param len 闀垮害
+ * @return 杩斿洖 String
+ */
+ public static String bytes2Hex_LE(byte[] bs, boolean hasBlank, int from, int len){
+ if (bs == null || bs.length <= 0 || bs.length < from + len) {
+ return null;
+ }
+ byte[] bb = new byte[len];
+ for (int i = 0 ; i < len; i++) {
+ bb[i] = bs[from + i];
+ }
+ return bytes2Hex_LE(bb, hasBlank) ;
+ }
/**
* 鍗佸叚杩涘埗杞瓧鑺傛暟缁�
* @param hex the hex string
@@ -975,78 +1035,132 @@
return fromIndex ;
}
+ /**
+ * 鍗佸叚杩涘埗杞瓧鑺傛暟缁�
+ * @param hex the hex string
+ * @return 杩斿洖 byte[]
+ */
+ public static int hex2Bytes_LE(String hex, byte[] bs, int fromIndex) {
+ if (hex == null || hex.equals("")) {
+ return fromIndex;
+ }
+ hex = hex.toUpperCase(Locale.ENGLISH);
+ int length = hex.length() / 2;
+ char[] hexChars = hex.toCharArray();
+ byte[] d = new byte[length];
+ for (int i = 0; i < length; i++) {
+ int pos = i * 2;
+ d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
+ }
+ for(int i = 0 ; i < d.length; i++){
+ bs[fromIndex++] = d[(d.length - 1) - i] ;
+ }
+ return fromIndex ;
+ }
+
+
+
private static final char[] HEX_CHAR = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
- /**
- * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
- *
- * @param bytes 寰呰浆鎹yte[]
- * @return 杩斿洖 杞崲鍚庣殑瀛楃涓�
- */
- public static String bytesToHex(byte[] bytes) {
- //涓�涓猙yte涓�8浣嶏紝鍙敤涓や釜鍗佸叚杩涘埗浣嶆爣璇�
- char[] buf = new char[bytes.length * 2];
- int a = 0;
- int index = 0;
- for (byte b : bytes) { // 浣跨敤闄や笌鍙栦綑杩涜杞崲
- if (b < 0) {
- a = 256 + b;
- } else {
- a = b;
- }
-
- buf[index++] = HEX_CHAR[a / 16];
- buf[index++] = HEX_CHAR[a % 16];
- }
- return new String(buf);
- }
- /**
- * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
- *
- * @param bytes 寰呰浆鎹yte[]
- * @return 杩斿洖 杞崲鍚庣殑瀛楃涓�
- */
- public static String bytesToHex(byte[] bytes, int startIndex, int endIndex) {
- byte[] bs = new byte[endIndex - startIndex + 1] ;
- byte j = 0 ;
- for(int i = startIndex; i <= endIndex; i++){
- bs[j++] = bytes[i] ;
- }
- //涓�涓猙yte涓�8浣嶏紝鍙敤涓や釜鍗佸叚杩涘埗浣嶆爣璇�
- char[] buf = new char[bs.length * 2];
- int a = 0;
- int index = 0;
- for (byte b : bs) { // 浣跨敤闄や笌鍙栦綑杩涜杞崲
- if (b < 0) {
- a = 256 + b;
- } else {
- a = b;
- }
-
- buf[index++] = HEX_CHAR[a / 16];
- buf[index++] = HEX_CHAR[a % 16];
- }
- return new String(buf);
- }
-
- /**
- * 灏�16杩涘埗瀛楃涓茶浆鎹负byte[]
- *
- * @param str 寰呰浆鎹㈠瓧绗︿覆
- * @return 杩斿洖 杞崲鍚庣殑byte[]
- */
- public static byte[] hexToBytes(String str) {
- if (str == null || "".equals(str.trim())) {
- return new byte[0];
- }
-
- byte[] bytes = new byte[str.length() / 2];
- for (int i = 0; i < str.length() / 2; i++) {
- String subStr = str.substring(i * 2, i * 2 + 2);
- bytes[i] = (byte) Integer.parseInt(subStr, 16);
- }
-
- return bytes;
- }
+// /**
+// * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
+// *
+// * @param bytes 寰呰浆鎹yte[]
+// * @return 杩斿洖 杞崲鍚庣殑瀛楃涓�
+// */
+// public static String bytesToHex(byte[] bytes) {
+// //涓�涓猙yte涓�8浣嶏紝鍙敤涓や釜鍗佸叚杩涘埗浣嶆爣璇�
+// char[] buf = new char[bytes.length * 2];
+// int a = 0;
+// int index = 0;
+// for (byte b : bytes) { // 浣跨敤闄や笌鍙栦綑杩涜杞崲
+// if (b < 0) {
+// a = 256 + b;
+// } else {
+// a = b;
+// }
+//
+// buf[index++] = HEX_CHAR[a / 16];
+// buf[index++] = HEX_CHAR[a % 16];
+// }
+// return new String(buf);
+// }
+// /**
+// * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
+// *
+// * @param bytes 寰呰浆鎹yte[]
+// * @return 杩斿洖 杞崲鍚庣殑瀛楃涓�
+// */
+// public static String bytesToHex_BE(byte[] bytes, int startIndex, int endIndex) {
+// byte[] bs = new byte[endIndex - startIndex + 1] ;
+// byte j = 0 ;
+// for(int i = startIndex; i <= endIndex; i++){
+// bs[j++] = bytes[i] ;
+// }
+// //涓�涓猙yte涓�8浣嶏紝鍙敤涓や釜鍗佸叚杩涘埗浣嶆爣璇�
+// char[] buf = new char[bs.length * 2];
+// int a = 0;
+// int index = 0;
+// for (byte b : bs) { // 浣跨敤闄や笌鍙栦綑杩涜杞崲
+// if (b < 0) {
+// a = 256 + b;
+// } else {
+// a = b;
+// }
+//
+// buf[index++] = HEX_CHAR[a / 16];
+// buf[index++] = HEX_CHAR[a % 16];
+// }
+// return new String(buf);
+// }
+//
+// /**
+// * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
+// *
+// * @param bytes 寰呰浆鎹yte[]
+// * @return 杩斿洖 杞崲鍚庣殑瀛楃涓�
+// */
+// public static String bytesToHex_LE(byte[] bytes, int startIndex, int endIndex) {
+// byte[] bs = new byte[endIndex - startIndex + 1] ;
+// byte j = 0 ;
+// for(int i = endIndex; i >= startIndex; i--){
+// bs[j++] = bytes[i] ;
+// }
+// //涓�涓猙yte涓�8浣嶏紝鍙敤涓や釜鍗佸叚杩涘埗浣嶆爣璇�
+// char[] buf = new char[bs.length * 2];
+// int a = 0;
+// int index = 0;
+// for (byte b : bs) { // 浣跨敤闄や笌鍙栦綑杩涜杞崲
+// if (b < 0) {
+// a = 256 + b;
+// } else {
+// a = b;
+// }
+//
+// buf[index++] = HEX_CHAR[a / 16];
+// buf[index++] = HEX_CHAR[a % 16];
+// }
+// return new String(buf);
+// }
+//
+// /**
+// * 灏�16杩涘埗瀛楃涓茶浆鎹负byte[]
+// *
+// * @param str 寰呰浆鎹㈠瓧绗︿覆
+// * @return 杩斿洖 杞崲鍚庣殑byte[]
+// */
+// public static byte[] hexToBytes(String str) {
+// if (str == null || "".equals(str.trim())) {
+// return new byte[0];
+// }
+//
+// byte[] bytes = new byte[str.length() / 2];
+// for (int i = 0; i < str.length() / 2; i++) {
+// String subStr = str.substring(i * 2, i * 2 + 2);
+// bytes[i] = (byte) Integer.parseInt(subStr, 16);
+// }
+//
+// return bytes;
+// }
/**
* Convert char to byte
@@ -1306,8 +1420,7 @@
public static long BCD2Long_LE(byte[] b, int startIndex, int endIndex)throws Exception {
String str = "";
str = decodeBCD_LE(b, startIndex, endIndex - startIndex + 1);
- long n = Long.parseLong(str);
- return n;
+ return Long.parseLong(str);
}
/**
--
Gitblit v1.8.0