From ab00d30e72fea3b9cb33dc065861e92e5d0eeb14 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 14:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 00fb04a..88678a3 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
@@ -315,7 +315,7 @@
if (factory.equals("1")) {
result = hikClientService.getFocusMode(cmd);
} else if (factory.equals("2")) {
-
+ result = dhClientService.getFocusMode(cmd);
}
}
} catch (Exception ex) {
@@ -659,7 +659,7 @@
if (factory.equals("1")) {
map = hikClientService.getGisInfo(cmd);
} else if (factory.equals("2")) {
-
+ map = dhClientService.getGisInfo(cmd);
}
}
} catch (Exception ex) {
--
Gitblit v1.9.3