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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
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 47d3063..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
@@ -66,6 +66,46 @@
}
/**
+ * 海康播放url查询-可以传协议
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-海康播放url查询", notes = "海康设备-海康播放url查询")
+ @GetMapping(value = "/queryHkPreviewUrlCommon")
+ public R queryHkPreviewUrlCommon(HkVO hk) {
+ String url = "";
+ // 获取海康播放url
+ String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), hk.getProtocol());
+ if (null!=result) {
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ Map map = (Map) jsonObject.get("data");
+ url = map.get("url").toString();
+ }
+ // 查询海康设备列表并返回
+ return R.data(url);
+ }
+
+ /**
+ * 海康播放url查询(Hls)
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-海康播放url查询(Hls)", notes = "海康设备-海康播放url查询(Hls)")
+ @GetMapping(value = "/queryHkPreviewUrlByHls")
+ public R queryHkPreviewUrlByHls(HkVO hk) {
+ String url = "";
+ // 获取海康播放url
+ String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
+ if (null!=result) {
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ Map map = (Map) jsonObject.get("data");
+ url = map.get("url").toString();
+ }
+ // 查询海康设备列表并返回
+ return R.data(url);
+ }
+
+ /**
* 海康摄像头云台的控制（摄像头左右旋转画面）
* @param hk 查询参数
* @return
@@ -75,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);
}
@@ -96,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
--
Gitblit v1.9.3