From 30a778548cf99f8f8a17ce63dc09c577d7a5ed16 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 25 Jun 2023 09:59:07 +0800
Subject: [PATCH] 海康预览url查询修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 55 ++++++++++++++++++++++++++-
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/vo/HkVO.java | 10 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 11 ++++-
4 files changed, 75 insertions(+), 6 deletions(-)
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 9a431d4..375f02f 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
@@ -110,6 +110,11 @@
*/
public static final String playbackURLs = "/api/video/v2/cameras/playbackURLs";
+ /**
+ * 设置预置点信息
+ */
+ public static final String presetsAdditionURLs = "/api/video/v1/presets/addition";
+
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 7285293..a8abac1 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
@@ -53,9 +53,17 @@
@ApiOperation(value = "海康设备-海康播放url查询(ws)", notes = "海康设备-海康播放url查询(ws)")
@GetMapping(value = "/queryHkPreviewUrl")
public R queryHkPreviewUrl(HkVO hk) {
+ String expand = "";
+ if (null!=hk.getExpand() && !hk.getExpand().equals("")){
+ expand = hk.getExpand();
+ }
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(null==hk.getType()?1:hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
+ String result = GetCameraPreviewURL(null==hk.getType()?1:hk.getType(),
+ HkConstant.previewURLs,
+ hk.getCameraIndexCode(),
+ ProtocolConstant.WS,
+ expand);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -74,8 +82,16 @@
@GetMapping(value = "/queryHkPreviewUrlCommon")
public R queryHkPreviewUrlCommon(HkVO hk) {
String url = "";
+ String expand = "";
+ if (null!=hk.getExpand() && !hk.getExpand().equals("")){
+ expand = hk.getExpand();
+ }
// 获取海康播放url
- String result = GetCameraPreviewURL(null==hk.getType()?1:hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), hk.getProtocol());
+ String result = GetCameraPreviewURL(null==hk.getType()?1:hk.getType(),
+ HkConstant.previewURLs,
+ hk.getCameraIndexCode(),
+ hk.getProtocol(),
+ expand);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -94,8 +110,16 @@
@GetMapping(value = "/queryHkPreviewUrlByHls")
public R queryHkPreviewUrlByHls(HkVO hk) {
String url = "";
+ String expand = "";
+ if (null!=hk.getExpand() && !hk.getExpand().equals("")){
+ expand = hk.getExpand();
+ }
// 获取海康播放url
- String result = GetCameraPreviewURL(null==hk.getType()?1:hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
+ String result = GetCameraPreviewURL(null==hk.getType()?1:hk.getType(),
+ HkConstant.previewURLs,
+ hk.getCameraIndexCode(),
+ ProtocolConstant.HLS,
+ expand);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -238,4 +262,29 @@
return R.data(common(null==hk.getType()?1:hk.getType(),HkConstant.talkURLs, body));
}
+
+ /**
+ * 设置监控点的预置点信息
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-获取海康摄像头语音对讲url", notes = "海康设备-获取海康摄像头语音对讲url")
+ @GetMapping(value = "/presetsAddition")
+ public R presetsAddition(HkVO hk) {
+ /**
+ * 组装请求参数
+ */
+ JSONObject jsonBody = new JSONObject();
+ jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
+ jsonBody.put("presetName", hk.getPresetName());
+ jsonBody.put("presetIndex", hk.getPresetIndex());
+ String body = jsonBody.toJSONString();
+
+ /**
+ * 调用接口并返回数据
+ * post请求application/json类型参数;
+ */
+ return R.data(common(null==hk.getType()?1:hk.getType(),HkConstant.presetsAdditionURLs, body));
+ }
+
}
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 e1ef040..317afb8 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
@@ -75,11 +75,14 @@
/**
* 获取视频预览数据
*
- * @param url 视频预览url
+ * @param type 类型，新/老
+ * @param url 视频预览url
* @param cameraIndexCode 监控点唯一标识
+ * @param protocol
+ * @param expand
* @return
*/
- public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol) {
+ public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol,String expand) {
/**
* 组装请求参数
*/
@@ -88,7 +91,9 @@
jsonBody.put("streamType", 0);
jsonBody.put("protocol", protocol);
jsonBody.put("transmode", 1);
-// jsonBody.put("expand", "streamform=ps");
+ if (null!= expand && !expand.equals("")) {
+ jsonBody.put("expand", expand);
+ }
String body = jsonBody.toJSONString();
// 调用公共方法
return common(type,url,body);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
index 4200075..286c874 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
@@ -129,4 +129,14 @@
* 类型 1：老平台 2：新平台
*/
private Integer type;
+
+ /**
+ * 预置点名称
+ */
+ private String presetName;
+
+ /**
+ * 扩展
+ */
+ private String expand;
}
--
Gitblit v1.9.3