From 2f108a46d05e34981d52b447d73f0cfd8e8c30fd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 16:24:31 +0800
Subject: [PATCH] Merge pull request #232 from chenparty/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
index b58a3c5..ef83976 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
@@ -4,9 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-// import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
-// import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-// import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -17,7 +14,7 @@
import java.util.List;
/**
- * 鍏煎LiveGBS鐨凙PI锛氳澶囦俊鎭�
+ * API鍏煎锛氳澶囦俊鎭�
*/
@SuppressWarnings("unchecked")
@CrossOrigin
@@ -53,11 +50,9 @@
@RequestParam(required = false)String q,
@RequestParam(required = false)Boolean online ){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
- }
-
- logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
+// }
JSONObject result = new JSONObject();
List<Device> devices;
if (start == null || limit ==null) {
@@ -103,9 +98,9 @@
@RequestParam(required = false)String q,
@RequestParam(required = false)Boolean online ){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
+// }
JSONObject result = new JSONObject();
// 鏌ヨ璁惧鏄惁瀛樺湪
Device device = storager.queryVideoDevice(serial);
--
Gitblit v1.8.0