diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java index d198882e4..65bab0def 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java @@ -45,6 +45,8 @@ import gov.nist.javax.sip.message.SIPResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -993,7 +995,7 @@ public class PlayServiceImpl implements IPlayService { logger.warn("开启语音广播的时候未找到通道: {}", channelId); return null; } - MediaServerItem mediaServerItem = mediaServerService.getMediaServerForMinimumLoad(); + MediaServerItem mediaServerItem = mediaServerService.getMediaServerForMinimumLoad(null); String app = "broadcast"; // TODO 从sip user agent中判断是什么品牌设备,大华默认使用talk模式,其他使用broadcast模式 // String app = "talk"; diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java index 99fa4c131..0805586cd 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java @@ -271,7 +271,7 @@ public class PlayController { @GetMapping("/1111") public void broadcastApi1() { - MediaServerItem defaultMediaServer = mediaServerService.getMediaServerForMinimumLoad(); + MediaServerItem defaultMediaServer = mediaServerService.getMediaServerForMinimumLoad(null); Device device = storager.queryVideoDevice("34020000001320090001"); playService.talk(defaultMediaServer, device, "34020000001370000001", null, null, null); diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index b49a1880a..59e0ee3e0 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -1,251 +1,321 @@