From cb5afce55eec2badda5090c27564e43f201ac9af Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 12 三月 2024 23:55:00 +0800
Subject: [PATCH] 优化语音对讲定时任务的删除
---
src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 041d738..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,5 +1,6 @@
package com.genersoft.iot.vmp.conf;
+import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
@@ -45,6 +46,9 @@
* @return
*/
public void startCron(String key, Runnable task, int cycleForCatalog) {
+ if(ObjectUtils.isEmpty(key)) {
+ return;
+ }
ScheduledFuture<?> future = futureMap.get(key);
if (future != null) {
if (future.isCancelled()) {
@@ -73,6 +77,9 @@
* @return
*/
public void startDelay(String key, Runnable task, int delay) {
+ if(ObjectUtils.isEmpty(key)) {
+ return;
+ }
stop(key);
// 鑾峰彇鎵ц鐨勬椂鍒�
@@ -99,8 +106,11 @@
}
public boolean stop(String key) {
+ if(ObjectUtils.isEmpty(key)) {
+ return false;
+ }
boolean result = false;
- if (futureMap.get(key) != null && !futureMap.get(key).isCancelled() && !futureMap.get(key).isDone()) {
+ 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);
@@ -109,6 +119,9 @@
}
public boolean contains(String key) {
+ if(ObjectUtils.isEmpty(key)) {
+ return false;
+ }
return futureMap.get(key) != null;
}
@@ -117,6 +130,9 @@
}
public Runnable get(String key) {
+ if(ObjectUtils.isEmpty(key)) {
+ return null;
+ }
return runnableMap.get(key);
}
@@ -127,7 +143,8 @@
public void execute(){
if (futureMap.size() > 0) {
for (String key : futureMap.keySet()) {
- if (futureMap.get(key).isDone() || futureMap.get(key).isCancelled()) {
+ ScheduledFuture<?> future = futureMap.get(key);
+ if (future.isDone() || future.isCancelled()) {
futureMap.remove(key);
runnableMap.remove(key);
}
--
Gitblit v1.8.0