From 3c450768402293d86350e8420f365210c83233fa Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 30 十月 2023 13:28:24 +0800
Subject: [PATCH] 修改禁引可视域
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 6598897..9fd7a40 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,29 +3,21 @@
import com.ruoyi.common.annotation.SdkOperate;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.camera.service.ICameraSdkService;
-import com.ruoyi.device.channel.domain.ArdChannel;
-import com.ruoyi.device.dhsdk.lib.NetSDKLib;
-import com.ruoyi.device.dhsdk.module.RealPlayModule;
-import com.ruoyi.device.dhsdk.service.IDhClientService;
-import com.ruoyi.device.hiksdk.common.GlobalVariable;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
+import com.ruoyi.utils.sdk.dhsdk.service.IDhClientService;
+import com.ruoyi.utils.sdk.hiksdk.service.IHikClientService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-import static com.ruoyi.device.dhsdk.lib.ToolKits.getErrorCodePrint;
-import static com.ruoyi.device.dhsdk.module.LoginModule.netsdk;
-import static com.ruoyi.device.hiksdk.sdk.HCNetSDK.NET_DVR_CHECK_USER_STATUS;
/**
@@ -36,7 +28,7 @@
**/
@Service
@Slf4j(topic = "SDK")
-public class CameraSdkServiceImpl implements ICameraSdkService {
+public class CameraSdkServiceImpl implements ICameraSdkService, ApplicationRunner {
@Resource
private IArdCamerasService ardCamerasService;
@Resource
@@ -46,11 +38,20 @@
@Resource
RedisCache redisCache;
- //鍒濆鍖朣DK
@Override
- public void loginAll() {
- hikClientService.loginAll();//鐧诲綍鍏ㄩ儴娴峰悍鐩告満
- dhClientService.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())) {
+ hikClientService.login(camera);
+ } else if ("2".equals(camera.getFactory())) {
+ dhClientService.login(camera);
+ }
+ }
+ } catch (Exception ex) {
+ log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
+ }
}
//鐧诲綍
@@ -64,7 +65,8 @@
hikClientService.login(ardCamera);
result = true;
} else if (factory.equals("2")) {
- result = dhClientService.login(ardCamera);
+ dhClientService.login(ardCamera);
+ result = true;
}
}
} catch (Exception ex) {
@@ -683,4 +685,6 @@
}
return map;
}
+
+
}
--
Gitblit v1.9.3