From 82fd369ce554467f794c9aa66e453adecefc73a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 16:56:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
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