From 0819312988ae6e041360fd354ef57a73633b7354 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 07 九月 2024 16:16:12 +0800
Subject: [PATCH] 二厂数字化工况预警与停机报警提交
---
src/main/java/com/ard/alarm/radar/controller/RadarController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 ad455e3..cf4c7e4 100644
--- a/src/main/java/com/ard/alarm/radar/controller/RadarController.java
+++ b/src/main/java/com/ard/alarm/radar/controller/RadarController.java
@@ -6,9 +6,10 @@
import com.ard.utils.http.AjaxResult;
import com.ard.utils.util.ByteUtils;
import com.ard.utils.util.GisUtils;
-import com.ard.utils.netty.tcp.ClientInitialize;
+import com.ard.utils.netty.tcp.RadarNettyTcpClient;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,6 +17,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
/**
* @Description: 闆疯揪鎺ュ彛
@@ -41,7 +44,7 @@
if (ardEquipRadar == null) {
return AjaxResult.error("闆疯揪涓嶅瓨鍦�");
}
- Channel channel = ClientInitialize.SucChannelMap.get(ardEquipRadar.getIp() + ":" + ardEquipRadar.getPort());
+ Channel channel= RadarNettyTcpClient.SERVER_MAP.get(ardEquipRadar.getIp() + ":" + ardEquipRadar.getPort());
if (channel == null) {
return AjaxResult.error("闆疯揪鏈繛鎺�");
}
@@ -76,10 +79,14 @@
byte[] payloadCrc32 = ByteUtils.parseCrc32(payload);//璐熻浇澶�+璐熻浇鐨刢rc32鏍￠獙
byte[] footer = {0x01, 0x02, 0x00};//鍖呭熬
byte[] data = ByteUtils.appendArrays(header, payload, payloadCrc32, footer);
- System.out.println(ByteUtils.printHexBinary(data));
+
ByteBuf message = channel.alloc().buffer();
message.writeBytes(data);
channel.writeAndFlush(message);
- return AjaxResult.success();
+ Map<String,Object> map = new HashMap<>();
+ map.put("distance",distance);
+ map.put("p",p);
+ map.put("t",t);
+ return AjaxResult.success(map);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3