From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java | 131 ++++++++++++++++++++++++++++++++++---------
1 files changed, 104 insertions(+), 27 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..5a451e3 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,72 @@
package com.genersoft.iot.vmp.conf;
-import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.stereotype.Component;
-import java.util.Date;
+import javax.annotation.PostConstruct;
+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 {
- @Autowired
+ private final Logger logger = LoggerFactory.getLogger(DynamicTask.class);
+
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();
+ @PostConstruct
+ public void DynamicTask() {
+ threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+ threadPoolTaskScheduler.setPoolSize(300);
+ threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true);
+ threadPoolTaskScheduler.setAwaitTerminationSeconds(10);
+ threadPoolTaskScheduler.initialize();
}
/**
* 寰幆鎵ц鐨勪换鍔�
* @param key 浠诲姟ID
* @param task 浠诲姟
- * @param cycleForCatalog 闂撮殧
+ * @param cycleForCatalog 闂撮殧 姣
* @return
*/
public void startCron(String key, Runnable task, int cycleForCatalog) {
- stop(key);
+ if(ObjectUtils.isEmpty(key)) {
+ return;
+ }
+ 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);
+ }
}
/**
@@ -52,25 +77,51 @@
* @return
*/
public void startDelay(String key, Runnable task, int delay) {
+ if(ObjectUtils.isEmpty(key)) {
+ return;
+ }
stop(key);
- Date starTime = new Date(System.currentTimeMillis() + delay);
- // scheduleWithFixedDelay 蹇呴』绛夊緟涓婁竴涓换鍔＄粨鏉熸墠寮�濮嬭鏃秔eriod锛� cycleForCatalog琛ㄧず鎵ц鐨勯棿闅�
- ScheduledFuture future = threadPoolTaskScheduler.schedule(task, starTime);
- futureMap.put(key, future);
- }
- public void stop(String key) {
- if (futureMap.get(key) != null && !futureMap.get(key).isCancelled()) {
- futureMap.get(key).cancel(true);
- Runnable runnable = runnableMap.get(key);
- if (runnable instanceof ISubscribeTask) {
- ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
- subscribeTask.stop();
+ // 鑾峰彇鎵ц鐨勬椂鍒�
+ 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琛ㄧず鎵ц鐨勯棿闅�
+ future = threadPoolTaskScheduler.schedule(task, startInstant);
+ if (future != null){
+ futureMap.put(key, future);
+ runnableMap.put(key, task);
+ logger.debug("浠诲姟銆恵}銆戝惎鍔ㄦ垚鍔燂紒锛侊紒", key);
+ }else {
+ logger.debug("浠诲姟銆恵}銆戝惎鍔ㄥけ璐ワ紒锛侊紒", key);
}
}
+ public boolean stop(String key) {
+ if(ObjectUtils.isEmpty(key)) {
+ return false;
+ }
+ boolean result = false;
+ if (!ObjectUtils.isEmpty(futureMap.get(key)) && !futureMap.get(key).isCancelled() && !futureMap.get(key).isDone()) {
+ result = futureMap.get(key).cancel(false);
+ futureMap.remove(key);
+ runnableMap.remove(key);
+ }
+ return result;
+ }
+
public boolean contains(String key) {
+ if(ObjectUtils.isEmpty(key)) {
+ return false;
+ }
return futureMap.get(key) != null;
}
@@ -78,4 +129,30 @@
return futureMap.keySet();
}
+ public Runnable get(String key) {
+ if(ObjectUtils.isEmpty(key)) {
+ return null;
+ }
+ return runnableMap.get(key);
+ }
+
+ /**
+ * 姣忎簲鍒嗛挓妫�鏌ュけ鏁堢殑浠诲姟锛屽苟绉婚櫎
+ */
+ @Scheduled(cron="0 0/5 * * * ?")
+ public void execute(){
+ if (futureMap.size() > 0) {
+ for (String key : futureMap.keySet()) {
+ ScheduledFuture<?> future = futureMap.get(key);
+ if (future.isDone() || future.isCancelled()) {
+ futureMap.remove(key);
+ runnableMap.remove(key);
+ }
+ }
+ }
+ }
+
+ public boolean isAlive(String key) {
+ return futureMap.get(key) != null && !futureMap.get(key).isDone() && !futureMap.get(key).isCancelled();
+ }
}
--
Gitblit v1.8.0