Merge remote-tracking branch 'origin/master'

Administrator

2023-08-25 7f21d4f22ec711d6aa89900b07e0b5ac31dbac42

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

@@ -22,7 +22,7 @@
 **/

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

    @Resource
@@ -77,9 +77,7 @@
            CameraCmd cmd = new CameraCmd();
            cmd.setCameraId(ardVideoInspectTask.getCameraId());
            cmd.setChannelNum(ardVideoInspectTask.getChannel());
            cmd.setEnable(false);//停止录像
            cmd.setUploadMinio(false);
            hikClientService.recordToMinio(cmd);
            hikClientService.recordStopNotToMinio(cmd);
            GlobalVariable.previewMap.remove(cameraId);
        }
        /*停止任务*/