From 4920f3a1290f2061f7b81db78ce0dab7b6ae8fc2 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期二, 08 八月 2023 09:02:32 +0800 Subject: [PATCH] 优化 --- src/main/java/com/ard/utils/tcp/ClientHandler.java | 28 ++++++++++------------------ 1 files changed, 10 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 5a7e3ac..dc27a7c 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; @@ -307,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(); -- Gitblit v1.9.3