From 9361943e47a09ea46f76adf06fa0d24a07ac711d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 11:40:46 +0800
Subject: [PATCH] 修复ui录象播放 优化录象查询接口
---
src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 7958a8a..8c0ecfb 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
@@ -66,7 +66,7 @@
* @param count 姣忛〉鏉℃暟
* @return 閫氶亾鍒楄〃
*/
- @GetMapping("devices/{deviceId}/channels")
+ @GetMapping("/devices/{deviceId}/channels")
public ResponseEntity<PageResult> channels(@PathVariable String deviceId,
int page, int count,
@RequestParam(required = false) String query,
@@ -85,9 +85,9 @@
public DeferredResult<ResponseEntity<Device>> devicesSync(@PathVariable String deviceId){
if (logger.isDebugEnabled()) {
- logger.debug("璁惧淇℃伅鍚屾API璋冪敤锛宒eviceId锛�" + deviceId);
}
-
+ logger.debug("璁惧淇℃伅鍚屾API璋冪敤锛宒eviceId锛�" + deviceId);
+
Device device = storager.queryVideoDevice(deviceId);
cmder.catalogQuery(device);
DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>();
@@ -123,7 +123,7 @@
* @param count 姣忛〉鏉℃暟
* @return 瀛愰�氶亾鍒楄〃
*/
- @GetMapping("subChannels/{deviceId}/{channelId}/channels")
+ @GetMapping("/subChannels/{deviceId}/{channelId}/channels")
public ResponseEntity<PageResult> subChannels(@PathVariable String deviceId,
@PathVariable String channelId,
int page,
@@ -144,4 +144,19 @@
PageResult pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
return new ResponseEntity<>(pageResult,HttpStatus.OK);
}
+
+ @PostMapping("/channel/update/{deviceId}")
+ public ResponseEntity<PageResult> updateChannel(@PathVariable String deviceId,DeviceChannel channel){
+ storager.updateChannel(deviceId, channel);
+ return new ResponseEntity<>(null,HttpStatus.OK);
+ }
+
+ @GetMapping("/devices/{deviceId}/transport/{streamMode}")
+ @PostMapping("/devices/{deviceId}/transport/{streamMode}")
+ public ResponseEntity<PageResult> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
+ Device device = storager.queryVideoDevice(deviceId);
+ device.setStreamMode(streamMode);
+ storager.updateDevice(device);
+ return new ResponseEntity<>(null,HttpStatus.OK);
+ }
}
--
Gitblit v1.8.0