查询流地址时mediaServerId改为可选

648540858
1 parent 692348c3
Showing 5 changed files with 21 additions and 3 deletions
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
@@ -61,4 +61,6 @@ public interface IMediaServerService {
     boolean checkMediaRecordServer(String ip, int port);
     void delete(String id);
+
+    MediaServerItem getDefaultMediaServer();
 }
@@ -242,6 +242,11 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR
     }
     @Override
+    public MediaServerItem getDefaultMediaServer() {
+        return mediaServerMapper.queryDefault();
+    }
+
+    @Override
     public void clearMediaServerForOnline() {
         String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
         redisUtil.del(key);
@@ -38,7 +38,13 @@ public class MediaServiceImpl implements IMediaService {
     @Override
     public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId, String addr) {
         StreamInfo streamInfo = null;
-        MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+
+        MediaServerItem mediaInfo;
+        if (mediaServerId == null) {
+            mediaInfo = mediaServerService.getDefaultMediaServer();
+        }else {
+            mediaInfo = mediaServerService.getOne(mediaServerId);
+        }
         if (mediaInfo == null) {
             return streamInfo;
         }
@@ -55,6 +61,8 @@ public class MediaServiceImpl implements IMediaService {
         return streamInfo;
     }
+
+
     @Override
     public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId) {
         return getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, null);
@@ -105,4 +105,7 @@ public interface MediaServerMapper {
     @Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}")
     MediaServerItem queryOneByHostAndPort(String host, int port);
+
+    @Select("SELECT * FROM media_server WHERE defaultServer=1")
+    MediaServerItem queryDefault();
 }
@@ -44,11 +44,11 @@ public class MediaController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "app", value = "应用名", dataTypeClass = String.class),
             @ApiImplicitParam(name = "stream", value = "流id", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "mediaServerId", value = "媒体服务器id", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "mediaServerId", value = "媒体服务器id", dataTypeClass = String.class, required = false),
     })
     @GetMapping(value = "/stream_info_by_app_and_stream")
     @ResponseBody
-    public WVPResult<StreamInfo> getStreamInfoByAppAndStream(@RequestParam String app, @RequestParam String stream, @RequestParam String mediaServerId){
+    public WVPResult<StreamInfo> getStreamInfoByAppAndStream(@RequestParam String app, @RequestParam String stream, @RequestParam(required = false) String mediaServerId){
         StreamInfo streamInfoByAppAndStreamWithCheck = mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId);
         WVPResult<StreamInfo> result = new WVPResult<>();
         if (streamInfoByAppAndStreamWithCheck != null){