From 46319c55f34da2763a87b09519b902b9437654ba Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 18 七月 2023 11:25:43 +0800
Subject: [PATCH] 修改管线泄露初始化方法
---
src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java b/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java
index 37d339e..82d9685 100644
--- a/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java
@@ -232,15 +232,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);
@@ -340,15 +332,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