From eca1e05aeed3c51cce36bbce80c71bc3cbcea87d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 12 十一月 2021 14:40:39 +0800
Subject: [PATCH] 维护目录订阅消息与接口
---
src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 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 199a9e6..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,8 +14,9 @@
import java.util.List;
/**
- * 鍏煎LiveGBS鐨凙PI锛氳澶囦俊鎭�
+ * API鍏煎锛氳澶囦俊鎭�
*/
+@SuppressWarnings("unchecked")
@CrossOrigin
@RestController
@RequestMapping(value = "/api/v1/device")
@@ -29,14 +27,14 @@
@Autowired
private IVideoManagerStorager storager;
- @Autowired
- private SIPCommander cmder;
+ // @Autowired
+ // private SIPCommander cmder;
- @Autowired
- private DeferredResultHolder resultHolder;
+ // @Autowired
+ // private DeferredResultHolder resultHolder;
- @Autowired
- private DeviceOffLineDetector offLineDetector;
+ // @Autowired
+ // private DeviceOffLineDetector offLineDetector;
/**
* 鍒嗛〉鑾峰彇璁惧鍒楄〃 TODO 鐜板湪鐩存帴杩斿洖锛屽皻鏈疄鐜板垎椤�
@@ -52,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) {
@@ -102,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