报警引导增加优先井配置ptz引导

‘liusuyi’

2023-12-09 6b4a4baa1048b1ed148580802ab06a78bbbd3db7

 ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java

@@ -1,6 +1,7 @@
package com.ruoyi.inspect.service.impl;



import java.util.*;



import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;

import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;

import com.ruoyi.common.utils.DateUtils;

@@ -21,6 +22,7 @@
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;

import com.ruoyi.inspect.domain.ArdVideoInspectTask;

import com.ruoyi.inspect.service.IArdVideoInspectTaskService;



import javax.annotation.PostConstruct;

import javax.annotation.Resource;



@@ -440,9 +442,8 @@
                    targetPositon[2] = ardAlarmpointsWell.getAltitude();

                    /*获取相机坐标*/

                    ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);

                    if(StringUtils.isNull(cameras))

                    {

                        log.debug("找不到相机:"+cameraId);

                    if (StringUtils.isNull(cameras)) {

                        log.debug("找不到相机:" + cameraId);

                        return;

                    }

                    double[] cameraPositon = new double[3];

@@ -456,7 +457,17 @@
                    cmd.setTargetPosition(targetPositon);

                    cmd.setOperator("sys_patrol_inspect");

                    cmd.setExpired(step.getRecordingTime() * 60);

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);

                    Map<String, Double> ptzMap = new HashMap<>();

                    ptzMap.put("p", ardAlarmpointsWell.getGuideP());

                    ptzMap.put("t", ardAlarmpointsWell.getGuideT());

                    ptzMap.put("z", ardAlarmpointsWell.getGuideZ());

                    cmd.setPtzMap(ptzMap);

                    boolean setTargetPosition;

                    if (cmd.getPtzMap().get("p") != null) {

                        setTargetPosition = cameraSdkService.setPtz(cmd);

                    } else {

                        setTargetPosition = cameraSdkService.guideTargetPosition(cmd);

                    }

                    if (setTargetPosition) {

                        /*控制相机巡检成功，开始录像*/

                        cameraSdkService.recordStart(cmd);

@@ -498,9 +509,8 @@
                    targetPositon[2] = ardAlarmpointsWell.getAltitude();

                    /*获取相机坐标*/

                    ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);

                    if(StringUtils.isNull(cameras))

                    {

                        log.debug("找不到相机:"+cameraId);

                    if (StringUtils.isNull(cameras)) {

                        log.debug("找不到相机:" + cameraId);

                        return;

                    }

                    double[] cameraPositon = new double[3];

@@ -514,7 +524,17 @@
                    cmd.setTargetPosition(targetPositon);

                    cmd.setOperator("sys_patrol_inspect");

                    cmd.setExpired(step.getRecordingTime() * 60);

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);

                    Map<String, Double> ptzMap = new HashMap<>();

                    ptzMap.put("p", ardAlarmpointsWell.getGuideP());

                    ptzMap.put("t", ardAlarmpointsWell.getGuideT());

                    ptzMap.put("z", ardAlarmpointsWell.getGuideZ());

                    cmd.setPtzMap(ptzMap);

                    boolean setTargetPosition;

                    if (cmd.getPtzMap().get("p") != null) {

                        setTargetPosition = cameraSdkService.setPtz(cmd);

                    } else {

                        setTargetPosition = cameraSdkService.guideTargetPosition(cmd);

                    }

                    if (!setTargetPosition) {

                        /*控制失败,当前步骤启动时间置null*/

                        ardVideoInspectTask.setCurrentStepStartTime("");

@@ -649,6 +669,7 @@


    /**

     * 获取相机的空闲时段

     *

     * @param cameraId

     * @return

     */