From 46c29b51e13cabb8cee80b3f8aedf08dac8f91b1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 05 May 2023 12:00:32 +0800
Subject: [PATCH] 新增海康视频预置点查询接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 16 +++++++++++++++-
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java | 5 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 21 +++++++++++++++++++++
4 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
index 3d4b714..67e8999 100644
--- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
+++ b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
@@ -40,8 +40,8 @@
PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
//自定义注册
- PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
- PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
+// PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
+// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
index d6322c4..db18645 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
@@ -95,4 +95,9 @@
*/
public static final String regionInfoUrls = "/api/resource/v1/region/regionCatalog/regionInfo";
+ /**
+ * 查询监控点的预置点信息
+ */
+ public static final String presetsSearchesUrls = "/api/video/v1/presets/searches";
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
index 5210a49..0a612b4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
@@ -115,7 +115,7 @@
public R handleCameraPosition(HkVO hk) {
// 获取海康播放url
String result = controlling(HkConstant.controllingURLs,
- hk.getCameraIndexCode(),hk.getAction(),hk.getCommand(),hk.getSpeed(),null);
+ hk.getCameraIndexCode(),hk.getAction(),hk.getCommand(),hk.getSpeed(),hk.getPresetIndex());
// 返回
return R.data(result);
}
@@ -136,6 +136,20 @@
}
/**
+ * 查询监控点的预置点信息
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-查询监控点的预置点信息", notes = "海康设备-查询监控点的预置点信息")
+ @GetMapping(value = "/presetsSearchesUrls")
+ public R presetsSearchesUrls(HkVO hk) {
+ // 获取海康播放url
+ String result = presetsSearches(HkConstant.presetsSearchesUrls,hk.getCameraIndexCode());
+ // 返回
+ return R.data(result);
+ }
+
+ /**
* 抓图
* @param hk 查询参数
* @return
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
index e8ebc61..05afa6d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
@@ -174,6 +174,27 @@
}
/**
+ * 查询监控点的预置点信息
+ *
+ * @param url 查询监控点的预置点信息URL
+ * @param cameraIndexCode 监控点唯一标识
+ * @return
+ */
+ public static String presetsSearches(String url,String cameraIndexCode) {
+ /**
+ * 组装请求参数
+ */
+ JSONObject jsonBody = new JSONObject();
+ jsonBody.put("cameraIndexCode", cameraIndexCode);
+ String body = jsonBody.toJSONString();
+ /**
+ * 调用接口
+ */
+ return common(url,body);
+ }
+
+
+ /**
* 云台控制
*
* @param url 云台控制url
--
Gitblit v1.9.3