Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-08 d803609b8a2e43afcf5921f42f29ce7f6e68fb84

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

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



import com.alibaba.fastjson2.JSONObject;



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.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.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,9 +33,9 @@
    @Resource

    IArdCamerasService iArdCamerasService;

    @Resource

    IHikClientService hikClientService;

    HikvisionSDK hikClientService;

    @Resource

    IDhClientService dhClientService;

    DahuaSDK dhClientService;

    @Resource

    IVtduService vtduService;

    @Resource