Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-04-15 dae6e068207ad1bff32dafd8c71f12d8a2a59aa2

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java

@@ -1,25 +1,25 @@
package com.ruoyi.quartz.task;



import com.alibaba.fastjson2.JSONObject;



import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.domain.entity.SysUser;

import com.ruoyi.device.camera.domain.ArdCameras;

import com.ruoyi.device.camera.domain.CameraCmd;

import com.ruoyi.device.camera.factory.CameraSDK;

import com.ruoyi.device.camera.factory.CameraSDKFactory;

import com.ruoyi.device.camera.service.IArdCamerasService;

import com.ruoyi.device.channel.domain.ArdChannel;

import com.ruoyi.utils.sdk.dhsdk.service.IDhClientService;

import com.ruoyi.utils.sdk.hiksdk.service.IHikClientService;

import com.ruoyi.media.domain.Items;

import com.ruoyi.media.domain.JsonsRoot;

import com.ruoyi.device.camera.service.ICameraSdkService;

import com.ruoyi.media.domain.Vtdu;

import com.ruoyi.media.service.IMediaService;

import com.ruoyi.media.service.IVtduService;

import com.ruoyi.rongcloud.service.RongCloudService;

import com.ruoyi.system.service.ISysUserService;

import com.ruoyi.utils.sdk.dhsdk.service.impl.DahuaSDK;

import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;

import lombok.extern.slf4j.Slf4j;

import org.springframework.stereotype.Component;



import javax.annotation.Resource;

import java.util.ArrayList;

import java.util.List;



/**

@@ -38,14 +38,11 @@
    @Resource

    IArdCamerasService iArdCamerasService;

    @Resource

    IHikClientService hikClientService;

    @Resource

    IDhClientService dhClientService;

    @Resource

    IVtduService vtduService;

    @Resource

    IMediaService mediaService;



    @Resource

    private ICameraSdkService cameraSdkService;

    /**

     * 同步相机在线状态

     * 刘苏义

@@ -53,19 +50,13 @@
     */

    public void cameraState() {

        try {

           ArdCameras ardCamera = new ArdCameras();

            ArdCameras ardCamera = new ArdCameras();

            //调用查询方法

            List<ArdCameras> ardCameras = iArdCamerasService.selectArdCamerasListNoDataScope(ardCamera);

            for (ArdCameras camera : ardCameras) {

                CameraCmd cmd = new CameraCmd();

                cmd.setCameraId(camera.getId());

                boolean onLineNew = false;

                // 判断是1还是2

                if (camera.getFactory().equals("1")) {

                    onLineNew = hikClientService.isOnLine(cmd);

                } else if (camera.getFactory().equals("2")) {

                    onLineNew = dhClientService.isOnLine(cmd);

                }

                boolean onLineNew = cameraSdkService.isOnLine(cmd);

                boolean onLineOld = "1".equals(camera.getState());

                if (onLineNew != onLineOld) {

                    if (onLineNew) {