增加雷达名称推送mqtt

‘liusuyi’

2023-06-29 39293248581ed183cdaa28527bbc7153b70d93b4

增加雷达名称推送mqtt

 src/main/java/com/ard/alarm/radar/domain/ArdAlarmRadar.java

@@ -3,7 +3,7 @@
import lombok.Data;

/**
 * @Description:
 * @Description: 雷达报警信息
 * @ClassName: RadarAlarmInfo
 * @Author: 刘苏义
 * @Date: 2023年06月27日15:49

 src/main/java/com/ard/alarm/radar/domain/RadarAlarmData.java

@@ -5,7 +5,7 @@
import java.util.List;

/**
 * @Description:
 * @Description: 上报雷达数据
 * @ClassName: RadarAlarmData
 * @Author: 刘苏义
 * @Date: 2023年06月28日13:42
@@ -14,6 +14,7 @@
@Data
public class RadarAlarmData {
    String radarId;
    String radarName;
    String alarmTime;
    List<ArdAlarmRadar> ardAlarmRadars;
}

 src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java

@@ -238,7 +238,7 @@
                    //  log.info("报警信息：" + "【id】" + id + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime + "【distance】" + Distance + "【P】" + fTx + "【T】" + fTy + "【X】" + alarmXY[0] + "【Y】" + 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));