From 40c83cabb8d9e5d66f536615636cb9266f5580d2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 12 Apr 2023 22:05:24 +0800
Subject: [PATCH] 新增海康播放地址查询接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 27 +++++++++++++++++++++++++++
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraPreviewURL.java | 7 ++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java | 19 +++++++++++++++++++
4 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
index 7e74d23..7c39a34 100644
--- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
+++ b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
@@ -40,7 +40,7 @@
/**
* nacos dev 地址
*/
- String NACOS_DEV_ADDR = "127.0.0.1:8848";
+ String NACOS_DEV_ADDR = "127.0.0.1:8849";
/**
* nacos prod 地址
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 552fbb9..53bb7a8 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
@@ -1,6 +1,8 @@
package cn.gistack.sm.hk.controller;
import cn.gistack.sm.hk.constant.HkConstant;
+import cn.gistack.sm.hk.constant.ProtocolConstant;
+import cn.gistack.sm.hk.vo.HkVO;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -9,6 +11,11 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static cn.gistack.sm.hk.util.GetCameraPreviewURL.GetCameraPreviewURL;
import static cn.gistack.sm.hk.util.GetCameraPreviewURL.GetCameraResourcePage;
/**
@@ -37,4 +44,24 @@
return R.data(jsonObject1);
}
+ /**
+ * 海康播放url查询(ws)
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-海康播放url查询(ws)", notes = "海康设备-海康播放url查询(ws)")
+ @GetMapping(value = "/queryHkPreviewUrl")
+ public R queryHkPreviewUrl(HkVO hk) {
+ String url = "";
+ // 获取海康播放url
+ String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
+ if (null!=result) {
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ Map map = (Map) jsonObject.get("data");
+ url = map.get("url").toString();
+ }
+ // 查询海康设备列表并返回
+ return R.data(url);
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraPreviewURL.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraPreviewURL.java
index be975c1..3052034 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraPreviewURL.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraPreviewURL.java
@@ -270,9 +270,13 @@
//// JSONArray arr2 = JSON.parseArray(res2.getString("list"));
//// JSONObject data2 = (JSONObject) arr2.get(0);
//// String code2 = data2.get("indexCode").toString();
+// //ff1f050afd1c47829dec1ec14575c9e3
+// //e2cb261e14144f53a300769839d54753
// //根据子节点编号获取设备播放地址
// String result3 = GetCameraPreviewURL(HkConstant.previewURLs,
-// "59f945a2d0354eb3b2794979c62228f2", ProtocolConstant.HLS);
+// "ff1f050afd1c47829dec1ec14575c9e3", ProtocolConstant.WS);
+// JSONObject jsonObject = JSONObject.parseObject(result3);
+// Map map = (Map) jsonObject.get("data");
// //根据子节点编号获取音频对讲地址
//// String result4 = GetTalkURLs(HkConstant.talkURLs, code1);
//
@@ -280,6 +284,7 @@
//// System.out.println("result1 = " + result1);
//// System.out.println("result2 = " + result2);
// System.out.println("result3 = " + result3);
+// System.out.println("url = " + map.get("url"));
//// System.out.println("result4 = " + result4);
// }
}
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
new file mode 100644
index 0000000..9f86873
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
@@ -0,0 +1,19 @@
+package cn.gistack.sm.hk.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 海康vo
+ * @author zhongrj
+ * @date 2023-04-12
+ */
+@Data
+public class HkVO implements Serializable {
+
+ /**
+ * 监控设备code
+ */
+ private String cameraIndexCode;
+}
--
Gitblit v1.9.3