From 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 09 十一月 2020 19:38:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 bd5564e..34a02ee 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
@@ -138,7 +138,7 @@
DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
if (deviceChannel == null) {
PageResult<DeviceChannel> deviceChannelPageResult = new PageResult<>();
- new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
+ return new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
}
PageResult pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
@@ -151,11 +151,11 @@
return new ResponseEntity<>(null,HttpStatus.OK);
}
- @GetMapping("/devices/{deviceId}/transport/{transport}")
- @PostMapping("/devices/{deviceId}/transport/{transport}")
- public ResponseEntity<PageResult> updateTransport(@PathVariable String deviceId, @PathVariable String transport){
+ @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.setTransport(transport);
+ device.setStreamMode(streamMode);
storager.updateDevice(device);
return new ResponseEntity<>(null,HttpStatus.OK);
}
--
Gitblit v1.8.0