雷达历史查询接口增加录像1录像2

‘liusuyi’

2023-07-01 b8efcd7ee94cc4ab6088e4e2d8c2e09f3cd4a1cc

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java

@@ -343,7 +343,13 @@
                    int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
                    if (aat > 0) {
                        log.debug("tube入库成功：" + ardAlarmTube);
                        double[] coordinate=new double[]{ardAlarmTube.getLongitude(),ardAlarmTube.getLatitude()};
                        Double longitude = ardAlarmTube.getLongitude();
                        Double latitude = ardAlarmTube.getLatitude();
                        if(StringUtils.isNull(longitude)||StringUtils.isNull(latitude))
                        {
                            return;
                        }
                        double[] coordinate=new double[]{longitude,latitude};
                        String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
                        if (StringUtils.isNotEmpty(nearbyCameraId)) {
                            messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak",ardAlarmTube.getCreateTime(), 1,1,coordinate);
@@ -400,8 +406,11 @@
                            ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
                            if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
                            {

                                String cameraId = ardAlarmpointsWell.getCameraId();
                                if(cameraIdWithTower.equals(cameraId))
                                {
                                    return;
                                }
                                log.info("获取到报警点关联的光电:"+cameraId);
                                //如果报警点关联了光电
                                messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), 1,2,coordinate);
@@ -427,6 +436,10 @@
                                if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
                                {
                                    String cameraId = ardAlarmpointsWell.getCameraId();
                                    if(cameraIdWithTower.equals(cameraId))
                                    {
                                        return;
                                    }
                                    log.info("获取到报警点关联的光电:"+cameraId);
                                    //如果报警点关联了光电
                                    messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,2,coordinate);
@@ -440,7 +453,6 @@
                    //endregion
                    break;
            }
            GuidePriorityQueue.printPriorityQueue();//打印队列
        } catch (Exception ex) {
            log.error("接收报警异常:" + ex.getMessage());
        }
@@ -482,6 +494,8 @@
        guideTask.setTargetPosition(targetPosition);
        //消息入队
        queueManager.addTaskToQueue(cameraId, guideTask);
        //打印队列
        GuidePriorityQueue.printPriorityQueue();
    }

    /**