guzijian / wvp-GB28181-pro · Commits

Commit 19533c8f4d6f63793cbfe042196bf9058ca4a2ee

Authored by 648540858
1 parent 32c73ff5

合并分支功能

Inline Side-by-side
Showing 1 changed file with 6 additions and 0 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @19533c8
@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject; @@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.common.InviteInfo; 5 import com.genersoft.iot.vmp.common.InviteInfo;
6 import com.genersoft.iot.vmp.common.InviteSessionType; 6 import com.genersoft.iot.vmp.common.InviteSessionType;
7 import com.genersoft.iot.vmp.common.StreamInfo; 7 import com.genersoft.iot.vmp.common.StreamInfo;
  8 +import com.genersoft.iot.vmp.common.VideoManagerConstants;
8 import com.genersoft.iot.vmp.conf.UserSetting; 9 import com.genersoft.iot.vmp.conf.UserSetting;
9 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException; 10 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
10 import com.genersoft.iot.vmp.gb28181.bean.*; 11 import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -26,11 +27,13 @@ import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; @@ -26,11 +27,13 @@ import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
26 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 27 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
27 import com.genersoft.iot.vmp.storager.IVideoManagerStorage; 28 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
28 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode; 29 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
  30 +import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
29 import com.genersoft.iot.vmp.vmanager.bean.StreamContent; 31 import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
30 import org.slf4j.Logger; 32 import org.slf4j.Logger;
31 import org.slf4j.LoggerFactory; 33 import org.slf4j.LoggerFactory;
32 import org.springframework.beans.factory.annotation.Autowired; 34 import org.springframework.beans.factory.annotation.Autowired;
33 import org.springframework.beans.factory.annotation.Qualifier; 35 import org.springframework.beans.factory.annotation.Qualifier;
  36 +import org.springframework.data.redis.core.RedisTemplate;
34 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; 37 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
35 import org.springframework.util.ObjectUtils; 38 import org.springframework.util.ObjectUtils;
36 import org.springframework.web.bind.annotation.*; 39 import org.springframework.web.bind.annotation.*;
@@ -117,6 +120,9 @@ public class ZLMHttpHookListener { @@ -117,6 +120,9 @@ public class ZLMHttpHookListener {
117 @Autowired 120 @Autowired
118 private ThreadPoolTaskExecutor taskExecutor; 121 private ThreadPoolTaskExecutor taskExecutor;
119 122
  123 + @Autowired
  124 + private RedisTemplate<Object, Object> redisTemplate;
  125 +
120 /** 126 /**
121 * 服务器定时上报时间，上报间隔可配置，默认10s上报一次 127 * 服务器定时上报时间，上报间隔可配置，默认10s上报一次
122 */ 128 */