From 9e51d9b9d84942bcef593eb662d2cfe870684c77 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 16:38:33 +0800
Subject: [PATCH] RTu

---
 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java |   48 +++++++++++-------------------------------------
 1 files changed, 11 insertions(+), 37 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 bc888e1..97591be 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
@@ -48,7 +48,6 @@
             dhClientService.loginAll();//鐧诲綍鍏ㄩ儴澶у崕鐩告満
         }
     }
-
     @Override
     public void syncLogin(ArdCameras cameras) {
 
@@ -60,15 +59,10 @@
     }
 
     @Override
-    public void loginAll() {
-
-    }
-
-    @Override
     public boolean logout(String cameraId) {
         return false;
     }
-
+    //鍦ㄧ嚎妫�娴�
     @Override
     public boolean isOnLine(CameraCmd cmd) {
         try {
@@ -89,7 +83,7 @@
             return false;
         }
     }
-
+    //浜戝彴鎺у埗
     @Override
     public boolean pTZControl(CameraCmd cmd) {
         try {
@@ -110,7 +104,6 @@
             return false;
         }
     }
-
     //璁剧疆鑱氱劍鍊�
     @Override
     public boolean setFocusPos(CameraCmd cmd) {
@@ -132,8 +125,6 @@
         }
         return result;
     }
-
-
     //鑾峰彇鑱氱劍鍊�
     @Override
     public Map<String, Object> getFocusPos(CameraCmd cmd) {
@@ -154,7 +145,6 @@
         }
         return map;
     }
-
     //璁剧疆棰勭疆浣�
     @Override
     public boolean setPreset(CameraCmd cmd) {
@@ -167,7 +157,7 @@
                 if (factory.equals("1")) {
                     result = hikClientService.setPreset(cmd);
                 } else if (factory.equals("2")) {
-
+                    result = dhClientService.setPreset(cmd);
                 }
             }
         } catch (Exception ex) {
@@ -175,7 +165,6 @@
         }
         return result;
     }
-
     //璋冪敤棰勭疆浣�
     @Override
     public boolean gotoPreset(CameraCmd cmd) {
@@ -188,7 +177,7 @@
                 if (factory.equals("1")) {
                     result = hikClientService.gotoPreset(cmd);
                 } else if (factory.equals("2")) {
-
+                    result = dhClientService.gotoPreset(cmd);
                 }
             }
         } catch (Exception ex) {
@@ -196,7 +185,6 @@
         }
         return result;
     }
-
     //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
     @Override
     public Map<String, String> getVideoCompressionCfg(CameraCmd cmd) {
@@ -217,7 +205,6 @@
         }
         return map;
     }
-
     //閫忛浘寮�鍏�
     @Override
     public boolean controlDefogcfg(CameraCmd cmd) {
@@ -238,7 +225,6 @@
         }
         return result;
     }
-
     //绾㈠寮�鍏�
     @Override
     public boolean controlInfrarecfg(CameraCmd cmd) {
@@ -259,8 +245,6 @@
         }
         return result;
     }
-
-
     //鎵嬪姩/鑷姩鑱氱劍
     @Override
     public boolean controlFocusMode(CameraCmd cmd) {
@@ -273,7 +257,7 @@
                 if (factory.equals("1")) {
                     result = hikClientService.controlFocusMode(cmd);
                 } else if (factory.equals("2")) {
-
+                    result = dhClientService.controlFocusMode(cmd);
                 }
             }
         } catch (Exception ex) {
@@ -281,7 +265,6 @@
         }
         return result;
     }
-
     //鑾峰彇鑱氱劍妯″紡
     @Override
     public String getFocusMode(CameraCmd cmd) {
@@ -302,7 +285,6 @@
         }
         return result;
     }
-
     //浜戝彴鍔犵儹
     @Override
     public boolean controlPTHeateRpwron(CameraCmd cmd) {
@@ -323,7 +305,6 @@
         }
         return result;
     }
-
     //闀滃ご鍔犵儹
     @Override
     public boolean controlCameraDeicing(CameraCmd cmd) {
@@ -344,7 +325,6 @@
         }
         return result;
     }
-
     //鎿嶆帶閿佸畾
     @Override
     public boolean controlLock(CameraCmd cmd) {
@@ -365,8 +345,6 @@
         }
         return result;
     }
-
-
     //璁剧疆瑙ｉ攣
     @Override
     public boolean controlUnLock(CameraCmd cmd) {
@@ -387,7 +365,6 @@
         }
         return result;
     }
-
     //鑾峰彇浜戝彴閿佸畾淇℃伅
     @Override
     public int getPTZLockInfo(CameraCmd cmd) {
@@ -413,7 +390,7 @@
     public String captureJPEGPicture(CameraCmd cmd) {
         return null;
     }
-
+    //鎶撳浘
     @Override
     public String picCutCate(CameraCmd cmd) {
         String url = "";
@@ -453,7 +430,6 @@
         }
         return map;
     }
-
     //鑾峰彇ptz鑼冨洿
     @Override
     public Map<String, Object> getPtzScope(CameraCmd cmd) {
@@ -474,7 +450,7 @@
         }
         return map;
     }
-
+    //璁剧疆ptz
     @Override
     public boolean setPtz(CameraCmd cmd) {
         boolean result = false;
@@ -494,7 +470,7 @@
         }
         return result;
     }
-
+    //璁剧疆闆舵柟浣嶈
     @Override
     public boolean setZeroPtz(CameraCmd cmd) {
         boolean result = false;
@@ -514,8 +490,6 @@
         }
         return result;
     }
-
-
     //寮曞鎸囧悜鐩爣
     @Override
     public boolean guideTargetPosition(CameraCmd cmd) {
@@ -536,7 +510,7 @@
         }
         return result;
     }
-
+    //寮�濮嬪綍鍍�
     @Override
     public boolean recordStart(CameraCmd cmd) {
         boolean result = false;
@@ -556,7 +530,7 @@
         }
         return result;
     }
-
+    //鍋滄褰曞儚骞跺瓨鍏inio
     @Override
     public String recordStopToMinio(CameraCmd cmd) {
         String url = "";
@@ -576,7 +550,7 @@
         }
         return url;
     }
-
+    //鍋滄褰曞儚骞朵笉瀛樺叆minio
     @Override
     public void recordStopNotToMinio(CameraCmd cmd) {
 

--
Gitblit v1.9.3