From d202291aa80273cf30e63388606fa1e7f8098c4d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 18 五月 2022 16:46:09 +0800
Subject: [PATCH] 优化单端口下的ssrc修复
---
src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java | 69 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 12 deletions(-)
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 0c57bde..3b021de 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
@@ -1,47 +1,71 @@
package com.genersoft.iot.vmp.conf;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
+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.concurrent.ThreadPoolTaskScheduler;
import org.springframework.stereotype.Component;
-import java.util.Date;
+import java.time.Instant;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
/**
* 鍔ㄦ�佸畾鏃朵换鍔�
+ * @author lin
*/
@Component
public class DynamicTask {
+ private final Logger logger = LoggerFactory.getLogger(DynamicTask.class);
+
@Autowired
private ThreadPoolTaskScheduler threadPoolTaskScheduler;
- private Map<String, ScheduledFuture<?>> futureMap = new ConcurrentHashMap<>();
- private Map<String, Runnable> runnableMap = new ConcurrentHashMap<>();
+ private final Map<String, ScheduledFuture<?>> futureMap = new ConcurrentHashMap<>();
+ private final Map<String, Runnable> runnableMap = new ConcurrentHashMap<>();
@Bean
public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
- return new ThreadPoolTaskScheduler();
+ ThreadPoolTaskScheduler schedulerPool = new ThreadPoolTaskScheduler();
+ schedulerPool.setPoolSize(300);
+ schedulerPool.setWaitForTasksToCompleteOnShutdown(true);
+ schedulerPool.setAwaitTerminationSeconds(10);
+ return schedulerPool;
+
}
/**
* 寰幆鎵ц鐨勪换鍔�
* @param key 浠诲姟ID
* @param task 浠诲姟
- * @param cycleForCatalog 闂撮殧
+ * @param cycleForCatalog 闂撮殧 姣
* @return
*/
public void startCron(String key, Runnable task, int cycleForCatalog) {
- stop(key);
+ ScheduledFuture<?> future = futureMap.get(key);
+ if (future != null) {
+ if (future.isCancelled()) {
+ logger.debug("浠诲姟銆恵}銆戝凡瀛樺湪浣嗘槸鍏抽棴鐘舵�侊紒锛侊紒", key);
+ } else {
+ logger.debug("浠诲姟銆恵}銆戝凡瀛樺湪涓斿凡鍚姩锛侊紒锛�", key);
+ return;
+ }
+ }
// scheduleWithFixedDelay 蹇呴』绛夊緟涓婁竴涓换鍔＄粨鏉熸墠寮�濮嬭鏃秔eriod锛� cycleForCatalog琛ㄧず鎵ц鐨勯棿闅�
- ScheduledFuture future = threadPoolTaskScheduler.scheduleWithFixedDelay(task, cycleForCatalog * 1000L);
- futureMap.put(key, future);
- runnableMap.put(key, task);
+ future = threadPoolTaskScheduler.scheduleAtFixedRate(task, cycleForCatalog);
+ if (future != null){
+ futureMap.put(key, future);
+ runnableMap.put(key, task);
+ logger.debug("浠诲姟銆恵}銆戝惎鍔ㄦ垚鍔燂紒锛侊紒", key);
+ }else {
+ logger.debug("浠诲姟銆恵}銆戝惎鍔ㄥけ璐ワ紒锛侊紒", key);
+ }
}
/**
@@ -53,10 +77,28 @@
*/
public void startDelay(String key, Runnable task, int delay) {
stop(key);
- Date starTime = new Date(System.currentTimeMillis() + delay);
+
+ // 鑾峰彇鎵ц鐨勬椂鍒�
+ Instant startInstant = Instant.now().plusMillis(TimeUnit.MILLISECONDS.toMillis(delay));
+
+ ScheduledFuture future = futureMap.get(key);
+ if (future != null) {
+ if (future.isCancelled()) {
+ logger.debug("浠诲姟銆恵}銆戝凡瀛樺湪浣嗘槸鍏抽棴鐘舵�侊紒锛侊紒", key);
+ } else {
+ logger.debug("浠诲姟銆恵}銆戝凡瀛樺湪涓斿凡鍚姩锛侊紒锛�", key);
+ return;
+ }
+ }
// scheduleWithFixedDelay 蹇呴』绛夊緟涓婁竴涓换鍔＄粨鏉熸墠寮�濮嬭鏃秔eriod锛� cycleForCatalog琛ㄧず鎵ц鐨勯棿闅�
- ScheduledFuture future = threadPoolTaskScheduler.schedule(task, starTime);
- futureMap.put(key, future);
+ future = threadPoolTaskScheduler.schedule(task, startInstant);
+ if (future != null){
+ futureMap.put(key, future);
+ runnableMap.put(key, task);
+ logger.debug("浠诲姟銆恵}銆戝惎鍔ㄦ垚鍔燂紒锛侊紒", key);
+ }else {
+ logger.debug("浠诲姟銆恵}銆戝惎鍔ㄥけ璐ワ紒锛侊紒", key);
+ }
}
public void stop(String key) {
@@ -78,4 +120,7 @@
return futureMap.keySet();
}
+ public Runnable get(String key) {
+ return runnableMap.get(key);
+ }
}
--
Gitblit v1.8.0