更新webrtc-streamer版本 为了避免通道数和通道号混淆修改sdk请求参数channelNum为chanNo sdk接口增加聚焦值获取

‘liusuyi’

2023-09-07 07cac52e0b64a78361ce4a353604c94bd1186a6c

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

@@ -1,14 +1,11 @@
package com.ruoyi.inspect.service.impl;

import com.ruoyi.constant.Global;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
@@ -25,7 +22,7 @@
 **/

@Component
@Slf4j(topic = "PatrolInspectionTask")
@Slf4j(topic = "patrolInspectionTask")
public class InspectionTaskManager {

    @Resource
@@ -50,12 +47,8 @@
            log.info("手动巡检任务已启动：" + taskId);
            return;
        }
//        /*每次启动任务清空任务当前步骤信息*/
        /*每次启动任务清空任务当前步骤信息*/
        ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
//        ardVideoInspectTask.setCurrentStepId("");
//        ardVideoInspectTask.setCurrentStepStartTime("");
//        ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);

        String cameraId = ardVideoInspectTask.getCameraId();
        /*将当前相机的所有任务当前时间置空*/
        ardVideoInspectTask=new ArdVideoInspectTask();
@@ -65,11 +58,6 @@
            for (ArdVideoInspectTask VideoInspectTask : ardVideoInspectTasks) {
                VideoInspectTask.setCurrentStepStartTime("");
                ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(VideoInspectTask);
                /*清楚任务录像记录*/
                if(Global.task_record.contains(VideoInspectTask.getId()))
                {
                    Global.task_record.remove(VideoInspectTask.getId());
                }
            }
        }
        /*开启任务*/
@@ -84,24 +72,19 @@
        ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
        /*将关联的相机录像关闭*/
        String cameraId = ardVideoInspectTask.getCameraId();
        Integer userId = GlobalVariable.loginMap.get(cameraId);//获取当前相机的登录ID
        if( GlobalVariable.user_real_Map.containsKey(userId))
        if( GlobalVariable.previewMap.containsKey(cameraId))
        {   //当前相机正在录像，则停止录像
            CameraCmd cmd = new CameraCmd();
            cmd.setCameraId(ardVideoInspectTask.getCameraId());
            cmd.setChannelNum(ardVideoInspectTask.getChannel());
            cmd.setEnable(false);//停止录像
            cmd.setUploadMinio(false);
            hikClientService.recordToMinio(cmd);
            GlobalVariable.user_real_Map.remove(userId);
            cmd.setChanNo(ardVideoInspectTask.getChannel());
            hikClientService.recordStopNotToMinio(cmd);
            GlobalVariable.previewMap.remove(cameraId);
        }

        /*停止任务*/
        InspectionTask task = taskMap.get(taskId);
        if (task != null) {
            task.stop();
            taskMap.remove(taskId);
            Global.task_record.remove(taskId);
            log.info("手动巡检任务已停止：" + taskId);
            /*将任务步骤信息清空*/
            ardVideoInspectTask.setCurrentStepId("");