From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
index 2e4f73d..b561e4e 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.annotation.SdkOperate;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.Threads;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
@@ -11,6 +12,8 @@
import com.ruoyi.device.hiksdk.service.IHikClientService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@@ -29,7 +32,7 @@
**/
@Service
@Slf4j(topic = "SDK")
-public class CameraSdkServiceImpl implements ICameraSdkService {
+public class CameraSdkServiceImpl implements ICameraSdkService, ApplicationRunner {
@Resource
private IArdCamerasService ardCamerasService;
@Resource
@@ -38,22 +41,16 @@
IDhClientService dhClientService;
@Resource
RedisCache redisCache;
- @Resource
- AsyncLogin asyncLogin;
-
-
- //鍒濆鍖朣DK
- @PostConstruct
@Override
- public void loginAll() {
+ public void run(ApplicationArguments args) throws Exception {
try {
List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
for (ArdCameras camera : ardCameras) {
if ("1".equals(camera.getFactory())) {
- asyncLogin.hikLogin(camera);
+ hikClientService.login(camera);
} else if ("2".equals(camera.getFactory())) {
- asyncLogin.dhLogin(camera);
+ dhClientService.login(camera);
}
}
} catch (Exception ex) {
@@ -69,10 +66,10 @@
if (ardCamera != null) {
String factory = ardCamera.getFactory();
if (factory.equals("1")) {
- asyncLogin.hikLogin(ardCamera);
+ hikClientService.login(ardCamera);
result = true;
} else if (factory.equals("2")) {
- asyncLogin.dhLogin(ardCamera);
+ dhClientService.login(ardCamera);
result = true;
}
}
--
Gitblit v1.9.3