From da14c7f24c61cf9027a02d8e566ab89116136f19 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 九月 2020 17:22:22 +0800
Subject: [PATCH] 拆分redis中device与channel的存储方式 支持分页 接口直接返回播放地址
---
src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
index 6368f82..9b229ac 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
@@ -2,6 +2,8 @@
import java.util.List;
+import com.genersoft.iot.vmp.common.PageResult;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,14 +55,30 @@
}
@GetMapping("/devices")
- public ResponseEntity<List<Device>> devices(){
+ public PageResult<Device> devices(int page, int count){
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
}
- List<Device> deviceList = storager.queryVideoDeviceList(null);
- return new ResponseEntity<>(deviceList,HttpStatus.OK);
+ return storager.queryVideoDeviceList(null, page, count);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ閫氶亾鏁�
+ * @param deviceId 璁惧id
+ * @param page 褰撳墠椤�
+ * @param count 姣忛〉鏉℃暟
+ * @return 閫氶亾鍒楄〃
+ */
+ @GetMapping("devices/{deviceId}/channels")
+ public ResponseEntity<PageResult> channels(@PathVariable String deviceId, int page, int count){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
+ }
+ PageResult pageResult = storager.queryChannelsByDeviceId(deviceId, page, count);
+ return new ResponseEntity<>(pageResult,HttpStatus.OK);
}
@PostMapping("/devices/{deviceId}/sync")
--
Gitblit v1.8.0