From ef5018de2d86bd4728a75ddc0eccd11b812375dc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 七月 2023 14:57:30 +0800
Subject: [PATCH] 修复合并错误
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
index d8c2093..7b59f7f 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -18,7 +18,6 @@
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -115,20 +114,11 @@
@RequestParam(required = false)String q,
@RequestParam(required = false)Boolean online ){
-// if (logger.isDebugEnabled()) {
-// logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
-// }
+
JSONObject result = new JSONObject();
- // 鏌ヨ璁惧鏄惁瀛樺湪
-// Device device = storager.queryVideoDevice(serial);
-// if (device == null) {
-// result.put("ChannelCount", 0);
-// result.put("ChannelList", "[]");
-// return result;
-// }
List<DeviceChannelExtend> deviceChannels;
List<String> channelIds = null;
- if (!StringUtils.isEmpty(code)) {
+ if (!ObjectUtils.isEmpty(code)) {
String[] split = code.trim().split(",");
channelIds = Arrays.asList(split);
}
--
Gitblit v1.8.0