src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.stereotype.Component; @@ -120,4 +121,19 @@ public Runnable get(String key) { return runnableMap.get(key); } /** * 每五分钟检查失效的任务,并移除 */ @Scheduled(cron="0 0/5 * * * ?") public void execute(){ if (futureMap.size() > 0) { for (String key : futureMap.keySet()) { if (futureMap.get(key).isDone()) { futureMap.remove(key); runnableMap.remove(key); } } } } } src/main/java/com/genersoft/iot/vmp/gb28181/bean/PresetQuerySipReq.java
File was renamed from src/main/java/com/genersoft/iot/vmp/domain/req/PresetQuerySipReq.java @@ -1,4 +1,4 @@ package com.genersoft.iot.vmp.domain.req; package com.genersoft.iot.vmp.gb28181.bean; /** src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
@@ -1,6 +1,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; import com.genersoft.iot.vmp.domain.req.PresetQuerySipReq; import com.genersoft.iot.vmp.gb28181.bean.PresetQuerySipReq; import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
@@ -36,13 +36,7 @@ private IRedisCatchStorage redisCatchStorage; @Autowired private IStreamPushService streamPushService; @Autowired private IMediaService mediaService; @Autowired private IMediaServerService mediaServerService; /** src/main/resources/8042900_www.wvp-pro.cn.jksBinary files differ