From a463b676e24e34ef65684ac4411d8ce5d1bfe6c1 Mon Sep 17 00:00:00 2001 From: duzeng <duzengrass@163.com> Date: 星期四, 13 十月 2022 20:42:35 +0800 Subject: [PATCH] feat: 点播开始后的截图任务,判断启用https后使用https_fmp4流地址 --- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java index 1a9f80a..3ba032a 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java @@ -11,6 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -51,13 +52,13 @@ @RequestParam(required = false)String catalogId, @RequestParam(required = false)String query, @RequestParam(required = false)String mediaServerId){ - if (StringUtils.isEmpty(catalogId)) { + if (ObjectUtils.isEmpty(catalogId)) { catalogId = null; } - if (StringUtils.isEmpty(query)) { + if (ObjectUtils.isEmpty(query)) { query = null; } - if (StringUtils.isEmpty(mediaServerId)) { + if (ObjectUtils.isEmpty(mediaServerId)) { mediaServerId = null; } -- Gitblit v1.8.0