From 1ccdcb4a890687d59b272f5397e8b41ae4ce2254 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 07 十一月 2023 16:23:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
index 3181820..be01a5c 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
@@ -1,10 +1,12 @@
package com.ruoyi.inspect.service.impl;
import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.camera.service.ICameraSdkService;
+import com.ruoyi.device.camera.service.impl.CameraSdkServiceImpl;
import com.ruoyi.utils.sdk.common.GlobalVariable;
-import com.ruoyi.utils.sdk.hiksdk.service.IHikClientService;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikSdkStrategy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -28,7 +30,7 @@
@Resource
ArdVideoInspectTaskMapper ardVideoInspectTaskMapper;
@Resource
- private IHikClientService hikClientService;
+ private ICameraSdkService cameraSdkService;
public static Map<String, InspectionTask> taskMap;//宸插惎鍔ㄤ换鍔ap
@@ -77,7 +79,7 @@
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(ardVideoInspectTask.getCameraId());
cmd.setChanNo(ardVideoInspectTask.getChannel());
- hikClientService.recordStopNotToMinio(cmd);
+ cameraSdkService.recordStopNotToMinio(cmd);
GlobalVariable.previewMap.remove(cameraId);
}
/*鍋滄浠诲姟*/
--
Gitblit v1.9.3