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

去除lombok框架

Browse Source 
添加流传输模式udp/tcp被动支持
This commit is contained in:
648540858
2020-10-16 16:49:41 +08:00
parent cc61ed4a07
commit 4d9a62339d
13 changed files with 739 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
View File

@@ -151,11 +151,11 @@ public class DeviceController {
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);
}

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

@@ -76,23 +76,8 @@ public class PlayController {
}else {
lockFlag = false;
streamInfo = storager.queryPlay(streamInfo);
// 获取媒体信息
JSONObject mediaList = zlmresTfulUtils.getMediaList("rtp", "rtmp");
if (mediaList.getInteger("code") == 0) {
JSONArray data = mediaList.getJSONArray("data");
if (data!= null) {
for (Object datum : data) {
JSONObject media = (JSONObject)datum;
if (streamId.equals(media.getString("stream"))) {
streamInfo.setTracks(media.getJSONArray("tracks"));
storager.startPlay(streamInfo);
}
}
}
}
};
}
streamInfo = storager.queryPlayByDevice(deviceId, channelId);
} catch (InterruptedException e) {
e.printStackTrace();
}