‘liusuyi’
2023-06-03 c6ef8fb06f8f75ece7e4d6669af01bebb051d217
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
@@ -1,5 +1,6 @@
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;
@@ -53,7 +54,21 @@
        ardVideoInspectTask.setCurrentStepId("");
        ardVideoInspectTask.setCurrentStepStartTime("");
        ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
        /*将关联的相机录像关闭*/
        if( Global.task_record.contains(taskId))
        {
//            Integer userId = GlobalVariable.loginMap.get(ardVideoInspectTask.getCameraId());//获取当前相机的登录ID
//            if( GlobalVariable.user_real_Map.containsKey(userId))
//            {   //当前相机正在录像,则停止录像
//                CameraCmd cmd = new CameraCmd();
//                cmd.setCameraId(ardVideoInspectTask.getCameraId());
//                cmd.setChannelNum(ardVideoInspectTask.getChannel());
//                cmd.setEnable(false);//停止录像
//                cmd.setUploadMinio(false);
//                hikClientService.recordToMinio(cmd);
//            }
            Global.task_record.remove(taskId);
        }
        InspectionTask task = new InspectionTask(taskId);
        task.start();
        taskMap.put(taskId, task);
@@ -76,6 +91,7 @@
            cmd.setEnable(false);//停止录像
            cmd.setUploadMinio(false);
            hikClientService.recordToMinio(cmd);
            GlobalVariable.user_real_Map.remove(userId);
        }
        InspectionTask task = taskMap.get(taskId);
        if (task != null) {