From dc85547a4e5b3d377c7613efa32fc6cc0ab2e8c1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 11 四月 2024 09:23:14 +0800
Subject: [PATCH] app光电查询rtsp路径修改提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
index 3ca2b61..d6ed2c3 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
@@ -1,10 +1,14 @@
 package com.ruoyi.quartz.task;
 
 
+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.camera.service.ICameraSdkService;
 import com.ruoyi.media.domain.Vtdu;
 import com.ruoyi.media.service.IMediaService;
 import com.ruoyi.media.service.IVtduService;
@@ -14,6 +18,7 @@
 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.List;
 
@@ -33,14 +38,11 @@
     @Resource
     IArdCamerasService iArdCamerasService;
     @Resource
-    HikvisionSDK hikClientService;
-    @Resource
-    DahuaSDK dhClientService;
-    @Resource
     IVtduService vtduService;
     @Resource
     IMediaService mediaService;
-
+    @Resource
+    private ICameraSdkService cameraSdkService;
     /**
      * 鍚屾鐩告満鍦ㄧ嚎鐘舵��
      * 鍒樿嫃涔�
@@ -48,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) {

--
Gitblit v1.9.3