From 6f34a6a7e99d4015cd5e8bc3669eea9107ac5837 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 24 八月 2023 10:42:50 +0800
Subject: [PATCH] 开启防盗电定时器
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 58 +++++++++++++++++-----------------------------------------
1 files changed, 17 insertions(+), 41 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..b7ebb4d 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -1,24 +1,14 @@
package com.ard.utils.tcp;
-
-/**
- * @Description:
- * @ClassName: ClientHandler
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�07鏈�05鏃�13:13
- * @Version: 1.0
- **/
-
import com.alibaba.fastjson2.JSON;
import com.ard.alarm.radar.domain.ArdAlarmRadar;
import com.ard.alarm.radar.domain.ArdEquipRadar;
import com.ard.alarm.radar.domain.RadarAlarmData;
-import com.ard.utils.ByteUtils;
-import com.ard.utils.GisUtils;
+import com.ard.utils.other.ByteUtils;
+import com.ard.utils.other.GisUtils;
import com.ard.utils.mqtt.MqttConsumer;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelId;
-import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.SimpleChannelInboundHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -31,12 +21,14 @@
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-
/**
- * 瀹㈡埛绔鐞嗗櫒
- *
- * @author lijiamin
- */
+ * @Description: 瀹㈡埛绔鐞嗗櫒
+ * @ClassName: ClientHandler
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�07鏈�05鏃�13:13
+ * @Version: 1.0
+ **/
+
@Slf4j(topic = "netty")
public class ClientHandler extends SimpleChannelInboundHandler<ByteBuf> {
private ChannelHandlerContext context;
@@ -151,7 +143,7 @@
byte[] heart = ByteUtils.appendArrays(header, payload, payloadCrc32, footer);
// byte[] heart = {0x01, 0x02, 0x01, 0x10, 0x00, 0x00, 0x00, (byte) 0x83, (byte) 0x88, 0x5d, 0x71, 0x01, 0x02, 0x00};
String hexString = DatatypeConverter.printHexBinary(heart);
- log.info("鍙戦�佸績璺�:" + hexString);
+ log.debug("鍙戦�佸績璺�:" + hexString);
message.writeBytes(heart);
context.writeAndFlush(message);
@@ -180,9 +172,9 @@
//region crc鏍￠獙-鐩墠浠呯敤浜庢樉绀烘牎楠岀粨鏋�
Boolean crc32Check = MessageParsing.CRC32Check(data);
if (!crc32Check) {
- log.info("CRC32鏍￠獙涓嶉�氳繃");
+ log.debug("CRC32鏍￠獙涓嶉�氳繃");
} else {
- log.info("CRC32鏍￠獙閫氳繃");
+ log.debug("CRC32鏍￠獙閫氳繃");
}
//endregion
//log.info("鍘熷鏁版嵁:" + DatatypeConverter.printHexBinary(data));
@@ -216,7 +208,7 @@
if (targetNum == 0) {
return;
}
- log.info("鐩爣鎬荤偣鏁�(杞暣鍨�):" + targetNum);
+ log.debug("鐩爣鎬荤偣鏁�(杞暣鍨�):" + targetNum);
//瑙ｆ瀽NET_TARGET_UNIT(64鏄疦ET_TARGET_HEAD鐨勫瓧鑺傛暟)
int uintSize = (payloadSizeToDecimal - 64) / targetNum;
@@ -297,15 +289,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);
@@ -315,7 +299,7 @@
afTy = ByteUtils.toLittleEndian(afTy);
float fTy = ByteUtils.bytesToFloat(afTy);
// log.info("鍨傜洿瑙掑害:" + fTy);
- Double[] radarXY = {radarLagitude, radarLagitude};
+ Double[] radarXY = {radarLongitude, radarLagitude};
Double[] alarmXY = GisUtils.CalculateCoordinates(radarXY, Distance, (double) fTx);
// log.info("鎶ヨ淇℃伅锛�" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + alarmType + "銆恆larmTime銆�" + alarmTime + "銆恉istance銆�" + Distance + "銆怭銆�" + fTx + "銆怲銆�" + fTy + "銆怷銆�" + alarmXY[0] + "銆怸銆�" + alarmXY[1]);
ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
@@ -343,7 +327,7 @@
byte[] wTargetNum = Arrays.copyOfRange(data, 8, 10);
wTargetNum = ByteUtils.toLittleEndian(wTargetNum);
targetNum = ByteUtils.bytesToDecimal(wTargetNum);
- log.info("鐩爣鎬荤偣鏁�(杞暣鍨�):" + targetNum);
+ log.debug("鐩爣鎬荤偣鏁�(杞暣鍨�):" + targetNum);
if (targetNum == 0) {
return;
}
@@ -405,15 +389,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