From 85b0ee4bae215560010d0e6d0641705923a1aaa3 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Fri, 03 Nov 2023 10:42:53 +0800
Subject: [PATCH] 优化工具类
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 3 +--
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 2 +-
src/main/java/com/ard/utils/other/ByteUtils.java | 42 ++++++++++++++++++++----------------------
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
index 7deea3e..aea22b1 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
@@ -48,7 +48,7 @@
@Override
public boolean invoke(int lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP);//设备IP地址
+ String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP).trim();//设备IP地址
Integer wLinkPort = Integer.valueOf(pAlarmer.wLinkPort);//设备通讯端口
CameraEventInfo info;
String sTime;//事件时间
diff --git a/src/main/java/com/ard/utils/other/ByteUtils.java b/src/main/java/com/ard/utils/other/ByteUtils.java
index f89e0e9..bda4b8c 100644
--- a/src/main/java/com/ard/utils/other/ByteUtils.java
+++ b/src/main/java/com/ard/utils/other/ByteUtils.java
@@ -5,7 +5,10 @@
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
import java.util.zip.CRC32;
+
+import static oracle.security.pki.util.SignatureAlgorithms.i;
/**
* @Description: 字节工具类
@@ -27,20 +30,13 @@
* byte数组转中文字符串
*/
public static String bytesToStringZh(byte[] bytes) {
- String zhStr = "";
+ ByteBuffer buffer = ByteBuffer.wrap(bytes); // byteArray 是包含字节数组的变量
try {
- int position = ByteUtils.findIndexOfDoubleZero(bytes);
- if (position != -1) {
- byte[] result = new byte[position];
- System.arraycopy(bytes, 0, result, 0, position);
- zhStr = new String(result, "GBK");
- } else {
- zhStr = new String(bytes, "GBK");
- }
+ return new String(buffer.array(), "GBK");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
- return zhStr;
+ return "";
}
/**
@@ -71,19 +67,18 @@
* byte数组转整型
*/
public static int bytesToDecimal(byte[] byteArray) {
- int decimalValue = 0;
- for (int i = 0; i < byteArray.length; i++) {
- decimalValue = (decimalValue << 8) | (byteArray[i] & 0xFF);
- }
- return decimalValue;
+ ByteBuffer buffer = ByteBuffer.wrap(byteArray); // byteArray 是包含字节数组的变量
+ return buffer.getInt();
}
+
/**
* byte数组转Double
*/
public static double bytesToDouble(byte[] byteArray) {
- // 创建一个ByteBuffer并设置字节顺序为大端
+ // 创建一个ByteBuffer
ByteBuffer buffer = ByteBuffer.wrap(byteArray);
+ //设置字节顺序为大端
buffer.order(ByteOrder.LITTLE_ENDIAN);
// 从ByteBuffer中获取double值
double doubleValue = buffer.getDouble();
@@ -124,17 +119,19 @@
return buffer.array();
}
+
/**
* double转byte数组
*/
public static byte[] doubleToBytes(double d) {
- long value = Double.doubleToRawLongBits(d);
- byte[] byteRet = new byte[8];
- for (int i = 0; i < 8; i++) {
- byteRet[i] = (byte) ((value >> 8 * i) & 0xff);
- }
- return byteRet;
+ // 创建一个 ByteBuffer，分配足够的空间来存储一个 float 值
+ ByteBuffer buffer = ByteBuffer.allocate(Double.BYTES);
+ // 将 float 值写入 ByteBuffer
+ buffer.putDouble(d);
+ // 获取字节数组
+ return buffer.array();
}
+
/**
* float转byte数组
*/
@@ -146,6 +143,7 @@
// 获取字节数组
return buffer.array();
}
+
/**
* byte数组拼接
*/
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index be814de..15258ce 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -464,11 +464,10 @@
float ty= ByteUtils.bytesToFloat(fTy);
log.debug("俯仰:" + ty);
Map<String,Object>forceGuideMap=new HashMap<>();
- forceGuideMap.put("distance",distance);
forceGuideMap.put("p",tx);
forceGuideMap.put("t",ty);
+ forceGuideMap.put("z",1);
forceGuideMap.put("radarId",radarId);
- forceGuideMap.put("radarName",radarName);
//endregion
MqttProducer.publish(2, false, "radarForceGuide", JSON.toJSONString(forceGuideMap));
}
--
Gitblit v1.9.3