分支自 ard/ruoyi-api
上一版本: e4d7da0f | 补丁 | 提交 | 忽略空白
‘liusuyi’
2023-11-30 ffceac5d832e278f985c1df5685005d59b643495 
雷达报警坐标从兴趣点获取
已修改1个文件
15 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java


@@ -995,8 +995,13 @@


                        String uuid = IdUtils.simpleUUID();


                        String radarId = radarAlarmData.getRadarId();


                        String alarmpointName = ardAlarmRadar.getName();//兴趣点名称


                        Double longitude = ardAlarmRadar.getLongitude();


                        Double latitude = ardAlarmRadar.getLatitude();


                        ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);


                        if(well==null)


                        {


                            return;


                        }


                        Double longitude = well.getLongitude();


                        Double latitude = well.getLatitude();


                        String targetId = ardAlarmRadar.getTargetId();


                        switch (ardAlarmRadar.getAlarmType()) {


                            case "运动目标检测":


@@ -1004,7 +1009,7 @@


                                ardAlarmRadarMove.setId(uuid);


                                ardAlarmRadarMove.setTargetId(targetId);


                                ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());


                                ardAlarmRadarMove.setCreateTime(DateUtils.covertTime(new Date()));


                                ardAlarmRadarMove.setCreateTime(new Date());


                                ardAlarmRadarMove.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");


                                ardAlarmRadarMove.setAlarmType("运动目标检测");


                                ardAlarmRadarMove.setLongitude(longitude);


@@ -1059,7 +1064,7 @@


                                ardAlarmRadarFire.setId(uuid);


                                ardAlarmRadarFire.setTargetId(targetId);


                                ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());


                                ardAlarmRadarFire.setCreateTime(DateUtils.covertTime(new Date()));


                                ardAlarmRadarFire.setCreateTime(new Date());


                                ardAlarmRadarFire.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");


                                ardAlarmRadarFire.setAlarmType("热源检测");


                                ardAlarmRadarFire.setLongitude(longitude);


@@ -1108,7 +1113,7 @@


                                ardAlarmRadarPump.setId(uuid);


                                ardAlarmRadarPump.setTargetId(targetId);


                                ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());


                                ardAlarmRadarPump.setCreateTime(DateUtils.covertTime(new Date()));


                                ardAlarmRadarPump.setCreateTime(new Date());


                                ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");


                                ardAlarmRadarPump.setAlarmType("雷达抽油机停机");


                                ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());