瀏覽代碼

add 媒体设备刷新通道

18339543638 3 年之前
父節點
當前提交
ea51ff6720

+ 12 - 10
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/bean/SipServerConfig.java

@@ -19,28 +19,30 @@ public class SipServerConfig {
 
     private String id;
 
+    private String name;
+
+    private String domain;
+
     @Comment("sip服务地址")
     private String host;
 
     @Comment("sip服务端口")
     private Integer port;
 
-    @Comment("通信协议,tcp、udp")
-    private String transport;
-
-    private String domain;
+    @Comment("sip服务端口")
+    private String password="12345678";
 
+    @Comment("sip服务端口")
     private String charset;
 
-    private String password="12345678";
-
-    /**
-     * 心跳时间
-     */
-    private Long timeout;
+    @Comment("通信协议,tcp、udp")
+    private String transport;
 
     @Comment("产品id")
     private String productId;
+
+
+
     public void validateCreate(){
         if(!"tcp".equals(transport.toLowerCase())&&!"udp".equals(transport.toLowerCase())){
             throw new BusinessException("不支持该协议[{"+transport+"}],请从tcp、udp中选择");

+ 2 - 2
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/service/LocalMediaServerItemService.java

@@ -131,7 +131,7 @@ public class LocalMediaServerItemService extends GenericReactiveCrudService<Medi
 
     public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback) {
         if (mediaServerItem == null || mediaServerItem.getId() == null) {
-            return null;
+            throw new BusinessException("媒体设备不在线");
         }
         // 获取mediaServer可用的ssrc
         String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverId + "_" + mediaServerItem.getId();
@@ -139,7 +139,7 @@ public class LocalMediaServerItemService extends GenericReactiveCrudService<Medi
         SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
         if (ssrcConfig == null) {
             log.info("media server [ {} ] ssrcConfig is null", mediaServerItem.getId());
-            return null;
+            throw new BusinessException("媒体设备Ssrc配置为空");
         }else {
             String ssrc = null;
             if (isPlayback) {