From c592740efa9d907eac3ad7d8f6e720608f3e962f Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期日, 01 五月 2022 21:33:56 +0800
Subject: [PATCH] 升级shelljs,解决较高版本node打包时的警告
---
src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 7 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 c9572ae..052f533 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
@@ -1,11 +1,17 @@
package com.genersoft.iot.vmp.conf;
+import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.CatalogResponseMessageHandler;
+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.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
@@ -15,27 +21,91 @@
@Component
public class DynamicTask {
+ private Logger logger = LoggerFactory.getLogger(DynamicTask.class);
+
@Autowired
private ThreadPoolTaskScheduler threadPoolTaskScheduler;
private Map<String, ScheduledFuture<?>> futureMap = new ConcurrentHashMap<>();
+ private 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;
+
}
- public String startCron(String key, Runnable task, int cycleForCatalog) {
- stopCron(key);
+ /**
+ * 寰幆鎵ц鐨勪换鍔�
+ * @param key 浠诲姟ID
+ * @param task 浠诲姟
+ * @param cycleForCatalog 闂撮殧
+ * @return
+ */
+ public void startCron(String key, Runnable task, int cycleForCatalog) {
+ ScheduledFuture future = futureMap.get(key);
+ if (future != null) {
+ if (future.isCancelled()) {
+ logger.info("浠诲姟銆恵}銆戝凡瀛樺湪浣嗘槸鍏抽棴鐘舵�侊紒锛侊紒", key);
+ } else {
+ logger.info("浠诲姟銆恵}銆戝凡瀛樺湪涓斿凡鍚姩锛侊紒锛�", key);
+ return;
+ }
+ }
// scheduleWithFixedDelay 蹇呴』绛夊緟涓婁竴涓换鍔$粨鏉熸墠寮�濮嬭鏃秔eriod锛� cycleForCatalog琛ㄧず鎵ц鐨勯棿闅�
- ScheduledFuture future = threadPoolTaskScheduler.scheduleWithFixedDelay(task, cycleForCatalog * 1000L);
- futureMap.put(key, future);
- return "startCron";
+ future = threadPoolTaskScheduler.scheduleAtFixedRate(task, cycleForCatalog * 1000L);
+ if (future != null){
+ futureMap.put(key, future);
+ runnableMap.put(key, task);
+ logger.info("浠诲姟銆恵}銆戝惎鍔ㄦ垚鍔燂紒锛侊紒", key);
+ }else {
+ logger.info("浠诲姟銆恵}銆戝惎鍔ㄥけ璐ワ紒锛侊紒", key);
+ }
}
- public void stopCron(String key) {
+ /**
+ * 寤舵椂浠诲姟
+ * @param key 浠诲姟ID
+ * @param task 浠诲姟
+ * @param delay 寤舵椂 /姣
+ * @return
+ */
+ public void startDelay(String key, Runnable task, int delay) {
+ stop(key);
+ Date starTime = new Date(System.currentTimeMillis() + delay);
+
+ ScheduledFuture future = futureMap.get(key);
+ if (future != null) {
+ if (future.isCancelled()) {
+ logger.info("浠诲姟銆恵}銆戝凡瀛樺湪浣嗘槸鍏抽棴鐘舵�侊紒锛侊紒", key);
+ } else {
+ logger.info("浠诲姟銆恵}銆戝凡瀛樺湪涓斿凡鍚姩锛侊紒锛�", key);
+ return;
+ }
+ }
+ // scheduleWithFixedDelay 蹇呴』绛夊緟涓婁竴涓换鍔$粨鏉熸墠寮�濮嬭鏃秔eriod锛� cycleForCatalog琛ㄧず鎵ц鐨勯棿闅�
+ future = threadPoolTaskScheduler.schedule(task, starTime);
+ if (future != null){
+ futureMap.put(key, future);
+ runnableMap.put(key, task);
+ logger.info("浠诲姟銆恵}銆戝惎鍔ㄦ垚鍔燂紒锛侊紒", key);
+ }else {
+ logger.info("浠诲姟銆恵}銆戝惎鍔ㄥけ璐ワ紒锛侊紒", key);
+ }
+ }
+
+ 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();
+ }
}
}
@@ -43,4 +113,11 @@
return futureMap.get(key) != null;
}
+ public Set<String> getAllKeys() {
+ return futureMap.keySet();
+ }
+
+ public Runnable get(String key) {
+ return runnableMap.get(key);
+ }
}
--
Gitblit v1.8.0