From 39293248581ed183cdaa28527bbc7153b70d93b4 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 29 六月 2023 12:09:38 +0800
Subject: [PATCH] 增加雷达名称推送mqtt

---
 src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java b/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java
index b1f74a4..bb05e68 100644
--- a/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java
@@ -238,7 +238,7 @@
                     //  log.info("鎶ヨ淇℃伅锛�" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + alarmType + "銆恆larmTime銆�" + alarmTime + "銆恉istance銆�" + Distance + "銆怭銆�" + fTx + "銆怲銆�" + fTy + "銆怷銆�" + alarmXY[0] + "銆怸銆�" + alarmXY[1]);
                     ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
                     ardAlarmRadar.setTargetId(id);
-                    ardAlarmRadar.setName(alarmPointName + "(" + name + ")");
+                    ardAlarmRadar.setName(alarmPointName);
                     ardAlarmRadar.setLongitude(alarmXY[0]);
                     ardAlarmRadar.setLatitude(alarmXY[1]);
                     ardAlarmRadar.setAlarmType(alarmType);
@@ -246,6 +246,7 @@
                 }
                 RadarAlarmData radarAlarmData = new RadarAlarmData();
                 radarAlarmData.setRadarId(id);
+                radarAlarmData.setRadarName(name);
                 radarAlarmData.setAlarmTime(alarmTime);
                 radarAlarmData.setArdAlarmRadars(radarAlarmInfos);
                 MqttConsumer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData));

--
Gitblit v1.9.3