修改禁引可视域

‘liusuyi’

2023-10-30 3c450768402293d86350e8420f365210c83233fa

 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java

@@ -7,13 +7,12 @@
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.dhsdk.service.IDhClientService;

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.beans.factory.SmartInitializingSingleton;

import org.springframework.boot.ApplicationArguments;

import org.springframework.boot.ApplicationRunner;

import org.springframework.stereotype.Service;



import javax.annotation.PostConstruct;

import javax.annotation.Resource;

import java.util.Date;

import java.util.HashMap;

@@ -29,7 +28,7 @@
 **/

@Service

@Slf4j(topic = "SDK")

public class CameraSdkServiceImpl implements ICameraSdkService {

public class CameraSdkServiceImpl implements ICameraSdkService, ApplicationRunner {

    @Resource

    private IArdCamerasService ardCamerasService;

    @Resource

@@ -38,22 +37,16 @@
    IDhClientService dhClientService;

    @Resource

    RedisCache redisCache;

    @Resource

    AsyncLogin asyncLogin;







    //初始化SDK

    @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 +62,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;

                }

            }