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

修复开始点播功能接口调用返回参数与定义的不符 #635

Browse Source
This commit is contained in:
648540858
2022-10-17 14:33:25 +08:00
parent 2f11618199
commit 1e1364e51a
4 changed files with 41 additions and 6 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

@@ -82,7 +82,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;
}