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/util/GetCameraUtils.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

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);

--
Gitblit v1.9.3