修复WVP作为下级平台接收DeviceStatus指令固定响应的问题

gaofw189

2023-01-10 26cd7dbaf9394ff26f5229b18cfdb72c203a6bc3

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -18,6 +18,7 @@
import com.genersoft.iot.vmp.service.*;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.vmanager.bean.StreamContent;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

@@ -183,7 +184,7 @@


      if (!"rtp".equals(param.getApp())) {

         if (userSetting.getPushAuthority()) {

// 推流鉴权

            // 推流鉴权

            if (param.getParams() == null) {

               logger.info("推流鉴权失败： 缺少不要参数：sign=md5(user表的pushKey)");

               ret.put("code", 401);

@@ -347,7 +348,7 @@
                        }

                        StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,

                              param.getApp(), param.getStream(), tracks, callId);

                        param.setStreamInfo(streamInfoByAppAndStream);

                        param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));

                        redisCatchStorage.addStream(mediaServerItem, type, param.getApp(), param.getStream(), param);

                        if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()

                              || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()

@@ -364,7 +365,7 @@
                        }

                        GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());

                        if (gbStream != null) {

//                        eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

//                           eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                        }

                        zlmMediaListManager.removeMedia(param.getApp(), param.getStream());

                     }

@@ -423,7 +424,7 @@
      logger.info("[ZLM HOOK]流无人观看：{]->{}->{}/{}" + param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      // 录像下载

      // 国标类型的流

      if ("rtp".equals(param.getApp())){

         ret.put("close", userSetting.getStreamOnDemand());

         // 国标流， 点播/录像回放/录像下载

@@ -505,6 +506,7 @@
               // 修改数据

               streamProxyService.stop(param.getApp(), param.getStream());

            }else {

               // 无人观看不做处理

               ret.put("close", false);

            }

            return ret;

@@ -526,7 +528,7 @@
   @ResponseBody

   @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")

   public JSONObject onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param){

      logger.info("[ZLM HOOK] 流未找到：{}->{}->{}/{}" + param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

      logger.info("[ZLM HOOK] 流未找到：{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

      taskExecutor.execute(()->{

         MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

         if (userSetting.isAutoApplyPlay() && mediaInfo != null) {

@@ -568,8 +570,6 @@
   public JSONObject onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){



      jsonObject.put("ip", request.getRemoteAddr());

      System.out.println(jsonObject.toJSONString()

      );

      ZLMServerConfig zlmServerConfig = JSON.to(ZLMServerConfig.class, jsonObject);

      zlmServerConfig.setIp(request.getRemoteAddr());

      logger.info("[ZLM HOOK] zlm 启动 " + zlmServerConfig.getGeneralMediaServerId());

@@ -596,7 +596,7 @@
   @PostMapping(value = "/on_send_rtp_stopped", produces = "application/json;charset=UTF-8")

   public JSONObject onSendRtpStopped(HttpServletRequest request, @RequestBody OnSendRtpStoppedHookParam param){



      logger.info("[ZLM HOOK] 发送rtp被动关闭：{}->{}/{}", param.getMediaServerId(), param.getApp(), param.getStream());

      logger.info("[ZLM HOOK] rtp发送关闭：{}->{}/{}", param.getMediaServerId(), param.getApp(), param.getStream());



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

@@ -632,7 +632,6 @@
   @ResponseBody

   @PostMapping(value = "/on_rtp_server_timeout", produces = "application/json;charset=UTF-8")

   public JSONObject onRtpServerTimeout(HttpServletRequest request, @RequestBody OnRtpServerTimeoutHookParam param){

      System.out.println(param);

      logger.info("[ZLM HOOK] rtpServer收流超时：{}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());



      JSONObject ret = new JSONObject();