解决手动巡检启动2次的问题

liusuyi

2023-06-03 4a9566ba1c800535504462b06a93b1a6e5092f28

 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;
@@ -15,7 +16,7 @@
import java.util.Map;

/**
 * @Description:
 * @Description: 巡检任务管理
 * @ClassName: InspectionTaskManager
 * @Author: 刘苏义
 * @Date: 2023年06月01日10:40
@@ -31,7 +32,7 @@
    @Resource
    private IHikClientService hikClientService;

    public static Map<String, InspectionTask> taskMap;
    public static Map<String, InspectionTask> taskMap;//已启动任务map

    public InspectionTaskManager() {
        taskMap = new HashMap<>();
@@ -41,24 +42,46 @@
        return taskMap;
    }

    /*启动任务*/
    public void startInspectionTask(String taskId) {
        if(taskMap.containsKey(taskId))
        {
            log.info("巡检任务已启动：" + taskId);
            return;
        }
        /*每次启动任务清空任务当前步骤信息*/
        ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
        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);
        log.info("巡检任务已启动：" + taskId);
        log.info("巡检任务启动：" + taskId);
    }

    /*停止任务*/
    public void stopInspectionTask(String taskId) {
        /*将任务步骤信息清空*/
        ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
        ardVideoInspectTask.setCurrentStepId("");
        ardVideoInspectTask.setCurrentStepStartTime("");
        ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);

        /*将关联的相机录像关闭*/
        Integer userId = GlobalVariable.loginMap.get(ardVideoInspectTask.getCameraId());//获取当前相机的登录ID
        if( GlobalVariable.user_real_Map.containsKey(userId))
        {   //当前相机正在录像，则停止录像
@@ -66,7 +89,9 @@
            cmd.setCameraId(ardVideoInspectTask.getCameraId());
            cmd.setChannelNum(ardVideoInspectTask.getChannel());
            cmd.setEnable(false);//停止录像
            cmd.setUploadMinio(false);
            hikClientService.recordToMinio(cmd);
            GlobalVariable.user_real_Map.remove(userId);
        }
        InspectionTask task = taskMap.get(taskId);
        if (task != null) {