From 83f616d1c9c674b30bafac8c0e3282bbd18f9766 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 25 Jan 2024 17:32:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 f98b0f3..f0208dd 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
@@ -9,13 +9,10 @@
import com.alibaba.fastjson.JSONObject;
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
-import org.springblade.core.tool.api.R;
import java.util.*;
import static cn.gistack.sm.hk.constant.HkConstant.ARTEMIS_PATH;
-import static cn.gistack.sm.hk.util.GetCameraUtils.GetCameraPreviewURL;
-
public class GetCameraUtils {
/**
@@ -81,13 +78,13 @@
* @param expand
* @return
*/
- public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol,String expand) {
+ public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol,String expand,Integer streamType) {
/**
* 组装请求参数
*/
JSONObject jsonBody = new JSONObject();
jsonBody.put("cameraIndexCode", cameraIndexCode);
- jsonBody.put("streamType", 0);
+ jsonBody.put("streamType",streamType);
jsonBody.put("protocol", protocol);
jsonBody.put("transmode", 1);
if (null!= expand && !expand.equals("")) {
--
Gitblit v1.9.3