Merge remote-tracking branch 'origin/CommonTenant' into CommonTenant

chenjunyu_1481036421
2 parents a98f376f 0099c6ad
Showing 6 changed files with 26 additions and 14 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/media/ZLMediaKitHookController.java
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/config/media/UserSetting.java
common/transport/gbt28181/src/main/java/org/thingsboard/server/transport/gbt28181/sip/processor/SIPProcessorObserver.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpGatewayDeviceSessionCtx.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/factory/SSRCFactory.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/media/ZLMediaKitHookController.java
View file @3042129
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/media/ZLMediaKitHookController.java
View file @3042129
@@ -10,10 +10,13 @@ import org.json.JSONObject;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.config.media.UserSetting;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.sip.MediaServerDTO;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
 import org.thingsboard.server.common.data.yunteng.dto.sip.hook.param.*;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.media.TkCacheStorageService;
 import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -27,9 +30,11 @@ import org.thingsboard.server.service.yunteng.media.TkVideoControlService;
 @RequiredArgsConstructor
 @Slf4j
 public class ZLMediaKitHookController extends BaseController {
+  private final TkCacheStorageService tkCacheStorageService;
   private final TkMediaServerService tkMediaServerService;
   private final TkVideoChannelService tkVideoChannelService;
   private final TkVideoControlService controlService;
+  private final UserSetting userSetting;
   @PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")
   @ApiOperation(value = "保持流媒体服务器的心跳")
@@ -93,12 +98,11 @@ public class ZLMediaKitHookController extends BaseController {
     DeferredResult<HookResult> defaultResult = new DeferredResult<>();
-    //    MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
-    //    if (!userSetting.isAutoApplyPlay() || mediaInfo == null) {
-    //      defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(),
-    // ErrorCode.ERROR404.getMsg()));
-    //      return defaultResult;
-    //    }
+    MediaServerDTO mediaServerItem = tkCacheStorageService.findInfoByMediaServerId(param.getMediaServerId());
+        if (!userSetting.getAutoApplyPlay() || mediaServerItem == null) {
+          defaultResult.setResult(new HookResult(404,"资源未找到"));
+          return defaultResult;
+        }
     //
     //    if ("rtp".equals(param.getApp())) {
     //      String[] s = param.getStream().split("_");
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @3042129
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @3042129
@@ -997,7 +997,7 @@ public class DefaultTransportApiService implements TransportApiService {
     log.info("启动流媒体【ZLMedia】验证，流媒体编号【{}】", mediaServerItem.getMediaServerId());
     JsonNode responseJson = zlMediaKitRestFulUtils.getMediaServerConfig(mediaServerItem);
     if (responseJson == null) {
-      log.error(
+      log.trace(
           "流媒体【{}】服务地址【{}:{}】无法访问",
           mediaServerItem.getMediaServerId(),
           mediaServerItem.getIp(),
@@ -1011,7 +1011,7 @@ public class DefaultTransportApiService implements TransportApiService {
       return org.thingsboard.server.common.data.yunteng.utils.JacksonUtil.convertValue(
           data.get(0), ZLMediaKitServerConfig.class);
     } else {
-      log.error(
+      log.trace(
           "流媒体【{}:{}】调用失败，失败原因【{}】",
           mediaServerItem.getIp(),
           mediaServerItem.getHttpPort(),
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/config/media/UserSetting.java
View file @3042129
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/config/media/UserSetting.java
View file @3042129
@@ -7,12 +7,19 @@ import org.springframework.stereotype.Component;
 @Data
 public class UserSetting {
   private String serverId = "000000";
+  /**部分设备需要扩展SDP，需要打开此设置*/
   private Boolean seniorSdp = Boolean.FALSE;
   private Boolean pushAuthority = Boolean.TRUE;
+  /**国标是否录制*/
   private Boolean recordSip = Boolean.TRUE;
+  /**推流直播是否录制*/
   private Boolean recordPushLive = Boolean.TRUE;
   private String recordPath = null;
+  /**国标点播 按需拉流, true：有人观看拉流，无人观看释放， false：拉起后不自动释放*/
   private Boolean streamOnDemand = Boolean.TRUE;
   private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;
+  /***点播等待超时时间,单位：毫秒*/
   private Integer playTimeout = 30000;
+  /**自动点播， 使用固定流地址进行播放时，如果未点播则自动进行点播, 需要rtp.enable=true*/
+  private Boolean autoApplyPlay = Boolean.FALSE;
 }
--- a/common/transport/gbt28181/src/main/java/org/thingsboard/server/transport/gbt28181/sip/processor/SIPProcessorObserver.java
View file @3042129
+++ b/common/transport/gbt28181/src/main/java/org/thingsboard/server/transport/gbt28181/sip/processor/SIPProcessorObserver.java
View file @3042129
@@ -145,7 +145,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
       CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
       String methodName = cseqHeader.getMethod();
       SIPResponse request = (SIPResponse) responseEvent.getResponse();
-      log.info(
+      log.trace(
           "收到ResponseEvent，方法类型【{}】，状态码【{}】，事件内容【{}】",
           methodName,
           status,
@@ -181,7 +181,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
     } else if ((status >= Response.TRYING) && (status < Response.OK)) {
       // 增加其它无需回复的响应，如101、180等
     } else {
-      log.error(
+      log.trace(
           "收到ResponseEvent，设备【{}】,状态码【{}】，失败原因【{}】，ResponseEvent内容【{}】",
           response.getHeader(FromHeader.NAME),
           status,
@@ -214,7 +214,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
   public void processRequest(RequestEvent requestEvent) {
     String methodName = requestEvent.getRequest().getMethod();
     SIPRequest request = (SIPRequest) requestEvent.getRequest();
-    log.info(
+    log.trace(
         "收到RequestEvent，方法类型【{}】，事件内容【{}】",
         methodName,
         request.getRawContent() == null ? null : new String(request.getRawContent()));
@@ -477,7 +477,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
               } catch (ParseException | InvalidArgumentException | SipException ex) {
                 throw new RuntimeException(ex);
               }
-              log.error("摄像头【{}】使用凭证【{}】在平台进行鉴权失败。", camaraAddress, deviceId, e);
+              log.trace("摄像头【{}】使用凭证【{}】在平台进行鉴权失败。", camaraAddress, deviceId, e);
             }
           });
@@ -779,7 +779,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
       UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
     try {
-      log.error("【{}】下发RPC命令【{}】", sessionId, rpcRequest.getParams());
+      log.trace("【{}】下发RPC命令【{}】", sessionId, rpcRequest.getParams());
       JsonNode rpcBody = JacksonUtil.toJsonNode(rpcRequest.getParams());
       String cameraCode = rpcParamVal(rpcBody, FastIotConstants.ZLMediaBody.CAMERA_CODE);
       GbtDeviceSessionCtx devSession = deviceSessions.get(cameraCode);
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpGatewayDeviceSessionCtx.java
View file @3042129
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpGatewayDeviceSessionCtx.java
View file @3042129
@@ -90,7 +90,7 @@ public class TcpGatewayDeviceSessionCtx extends TcpDeviceWareSessionContext impl
     @Override
     public void onToDeviceRpcRequest(UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg request) {
-        log.error("【{}】下发RPC命令【{}】给网关子设备", sessionId, request.getParams());
+        log.trace("【{}】下发RPC命令【{}】给网关子设备", sessionId, request.getParams());
         try {
             parent.getPayloadAdaptor().convertToPublish(this, request).ifPresent(
                     payload -> {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/factory/SSRCFactory.java
View file @3042129
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/factory/SSRCFactory.java
View file @3042129
@@ -45,6 +45,7 @@ public class SSRCFactory {
             cacheUtils.invalidate(cacheName, redisKey);
           }
           // 把这10000个ssrc放入缓存
+          log.error("初始化SSRC资源，可用资源数【{}】", ssrcList.size());
           cacheUtils.put(cacheName, redisKey, ssrcList);
         });
   }