From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 8d4b5d0..cafa836 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
@@ -72,6 +72,7 @@
HkConstant.previewURLs,
hk.getCameraIndexCode(),
ProtocolConstant.WS,
+ null==hk.getTransmode()?1:hk.getTransmode(),
expand,
null==hk.getStreamType()?1:hk.getStreamType());
if (null!=result) {
@@ -101,6 +102,7 @@
HkConstant.previewURLs,
hk.getCameraIndexCode(),
hk.getProtocol(),
+ null==hk.getTransmode()?1:hk.getTransmode(),
expand,
null==hk.getStreamType()?1:hk.getStreamType());
if (null!=result) {
@@ -130,6 +132,7 @@
HkConstant.previewURLs,
hk.getCameraIndexCode(),
ProtocolConstant.HLS,
+ null==hk.getTransmode()?1:hk.getTransmode(),
expand,
null==hk.getStreamType()?1:hk.getStreamType());
if (null!=result) {
@@ -240,6 +243,7 @@
jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
jsonBody.put("protocol", hk.getProtocol());
jsonBody.put("recordLocation", "1");
+ jsonBody.put("transmode", null==hk.getTransmode()?1:hk.getTransmode());
jsonBody.put("beginTime", hk.getBeginTime());
jsonBody.put("endTime", hk.getEndTime());
String body = jsonBody.toJSONString();
@@ -266,6 +270,7 @@
jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
jsonBody.put("streamType",null==hk.getStreamType()?1:hk.getStreamType());
jsonBody.put("protocol", hk.getProtocol());
+ jsonBody.put("transmode", null==hk.getTransmode()?1:hk.getTransmode());
String body = jsonBody.toJSONString();
/**
--
Gitblit v1.9.3