From 745d5b90be7d8cdb8873b18d18b286fdc4b6913b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 05 十二月 2023 10:13:57 +0800
Subject: [PATCH] 配置文件全部更改为配置类 优化包路径
---
src/main/java/com/ard/alarm/radar/controller/RadarController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ard/alarm/radar/controller/RadarController.java b/src/main/java/com/ard/alarm/radar/controller/RadarController.java
index e4dfbad..5cd3e6c 100644
--- a/src/main/java/com/ard/alarm/radar/controller/RadarController.java
+++ b/src/main/java/com/ard/alarm/radar/controller/RadarController.java
@@ -4,11 +4,12 @@
import com.ard.alarm.radar.domain.GuideInfo;
import com.ard.alarm.radar.service.IArdEquipRadarService;
import com.ard.utils.http.AjaxResult;
-import com.ard.utils.other.ByteUtils;
-import com.ard.utils.other.GisUtils;
-import com.ard.utils.tcp.ClientInitialize;
+import com.ard.utils.util.ByteUtils;
+import com.ard.utils.util.GisUtils;
+import com.ard.utils.netty.tcp.ClientInitialize;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,7 @@
**/
@RestController
@RequestMapping("/radar")
+@Slf4j(topic = "netty")
public class RadarController {
@Resource
@@ -55,14 +57,19 @@
radarPosition[1] = latitude;
double distance = GisUtils.getDistance(radarPosition, targetPosition);
float angleInRadians = (float)Math.atan(distance / altitude);
- float t = 90-(float)Math.toDegrees(angleInRadians);
-
+ float t = (90-(float)Math.toDegrees(angleInRadians))*-1;
+ log.debug("distance锛�"+distance);
+ log.debug("p锛�"+p);
+ log.debug("t锛�"+t);
//鍙戦�佸憡璀﹀墠绔殑瑙掑害鎻愮ず
byte[] header = {0x01, 0x02, 0x01};//鍖呭ご
- byte[] payloadHeader = {0x10, 0x03, 0x40, 0x00};//璐熻浇澶�
+ byte[] payloadHeader = {0x10, 0x03, 0x20, 0x00};//璐熻浇澶�
byte[] distanceBytes = ByteUtils.decimalToBytes((int)distance);
+ distanceBytes=ByteUtils.toLittleEndian(distanceBytes);
byte[] pBytes = ByteUtils.floatToBytes(p);
+ pBytes=ByteUtils.toLittleEndian(pBytes);
byte[] tBytes = ByteUtils.floatToBytes(t);
+ tBytes=ByteUtils.toLittleEndian(tBytes);
byte[] resBytes=new byte[20];
byte[] payloadBody = ByteUtils.appendArrays(distanceBytes,pBytes,tBytes,resBytes);//璐熻浇
--
Gitblit v1.9.3