XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wvp-28181-2.0'

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
This commit is contained in:
648540858
2022-10-17 16:56:13 +08:00
parent 6a2ff99515 7918f03734
commit 82fd369ce5
31 changed files with 502 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@@ -87,7 +87,7 @@ public class PlayController {
@Parameter(name = "deviceId", description = "设备国标编号", required = true)
@Parameter(name = "channelId", description = "通道国标编号", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
public DeferredResult<WVPResult<String>> play(@PathVariable String deviceId,
public DeferredResult<WVPResult<StreamInfo>> play(@PathVariable String deviceId,
@PathVariable String channelId) {
// 获取可用的zlm

7
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java
View File

@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.vmanager.gb28181.play.bean;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.springframework.http.ResponseEntity;
@@ -7,16 +8,16 @@ import org.springframework.web.context.request.async.DeferredResult;
public class PlayResult {
private DeferredResult<WVPResult<String>> result;
private DeferredResult<WVPResult<StreamInfo>> result;
private String uuid;
private Device device;
public DeferredResult<WVPResult<String>> getResult() {
public DeferredResult<WVPResult<StreamInfo>> getResult() {
return result;
}
public void setResult(DeferredResult<WVPResult<String>> result) {
public void setResult(DeferredResult<WVPResult<StreamInfo>> result) {
this.result = result;
}

4
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
View File

@@ -125,8 +125,8 @@ public class UserController {
}
}
@DeleteMapping("/删除用户")
@Operation(summary = "停止视频回放")
@DeleteMapping("/delete")
@Operation(summary = "删除用户")
@Parameter(name = "id", description = "用户Id", required = true)
public void delete(@RequestParam Integer id){
// 获取当前登录用户id