From 6d8569f340c42f511d633b5d8699e4845e071bb6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 12 Jul 2022 10:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BA=BA=E7=89=A9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E8=87=AA=E6=A3=80=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=E3=80=82=E9=98=B2=E6=AD=A2=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/conf/DynamicTask.java |  16 ++++++++++++++++
 .../req => gb28181/bean}/PresetQuerySipReq.java |   2 +-
 .../cmd/PresetQueryResponseMessageHandler.java  |   2 +-
 .../vmanager/gb28181/media/MediaController.java |   6 ------
 src/main/resources/8042900_www.wvp-pro.cn.jks   | Bin 0 -> 5676 bytes
 5 files changed, 18 insertions(+), 8 deletions(-)
 rename src/main/java/com/genersoft/iot/vmp/{domain/req => gb28181/bean}/PresetQuerySipReq.java (91%)
 create mode 100644 src/main/resources/8042900_www.wvp-pro.cn.jks

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
index 1f18338b..1885632a 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
@@ -5,6 +5,7 @@ import org.slf4j.Logger;
 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 class DynamicTask {
     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);
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/domain/req/PresetQuerySipReq.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PresetQuerySipReq.java
similarity index 91%
rename from src/main/java/com/genersoft/iot/vmp/domain/req/PresetQuerySipReq.java
rename to src/main/java/com/genersoft/iot/vmp/gb28181/bean/PresetQuerySipReq.java
index e2f3ec62..d1971a2e 100644
--- a/src/main/java/com/genersoft/iot/vmp/domain/req/PresetQuerySipReq.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PresetQuerySipReq.java
@@ -1,4 +1,4 @@
-package com.genersoft.iot.vmp.domain.req;
+package com.genersoft.iot.vmp.gb28181.bean;
 
 
 /**
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
index 36626004..45265c5b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
+++ b/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;
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
index 54bd3f6a..94fe8df2 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
@@ -35,15 +35,9 @@ public class MediaController {
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
 
-    @Autowired
-    private IStreamPushService streamPushService;
-
     @Autowired
     private IMediaService mediaService;
 
-    @Autowired
-    private IMediaServerService mediaServerService;
-
 
     /**
      * 根据应用名和流id获取播放地址
diff --git a/src/main/resources/8042900_www.wvp-pro.cn.jks b/src/main/resources/8042900_www.wvp-pro.cn.jks
new file mode 100644
index 0000000000000000000000000000000000000000..3e5120652595d9e6480232fc0d0329a02552548d
GIT binary patch
literal 5676
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
Y|7V8>j}_l$bePC*5k)|x^o#g^0a%60=>Px#

literal 0
HcmV?d00001