From 9aa66699aaa610be66f5bd0c22e90cae114311f9 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 07 七月 2023 17:15:16 +0800
Subject: [PATCH] 优化外联设备报警解析并上传mqtt
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index c79496d..5a7e3ac 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -297,15 +297,7 @@
// log.info("鎶ヨ绫诲瀷:" + alarmType);
byte[] szName = Arrays.copyOfRange(data, index + 64, index + 96);
- int position = ByteUtils.findIndexOfDoubleZero(szName);
- String alarmPointName;
- if (position != -1) {
- byte[] result = new byte[position];
- System.arraycopy(szName, 0, result, 0, position);
- alarmPointName = new String(result, "GBK");
- } else {
- alarmPointName = new String(szName, "GBK");
- }
+ String alarmPointName = ByteUtils.bytesToStringZh(szName);
// log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + alarmPointName);
byte[] afTx = Arrays.copyOfRange(data, index + 96, index + 100);
afTx = ByteUtils.toLittleEndian(afTx);
@@ -405,15 +397,7 @@
byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64);
//log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + DatatypeConverter.printHexBinary(szName));
- int position = ByteUtils.findIndexOfDoubleZero(szName);
- String alarmPointName;
- if (position != -1) {
- byte[] result = new byte[position];
- System.arraycopy(szName, 0, result, 0, position);
- alarmPointName = new String(result, "GBK");
- } else {
- alarmPointName = new String(szName, "GBK");
- }
+ String alarmPointName = ByteUtils.bytesToStringZh(szName);
// log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + alarmPointName);
//log.info("鎶ヨ淇℃伅锛�" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + alarmType + "銆恆larmTime銆�" + alarmTime);
ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
--
Gitblit v1.9.3