From 3c08ca7661566c94012040647428fee759820b39 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 15:23:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java
similarity index 78%
rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java
rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java
index 7a8ef64..1cbb4fe 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java
@@ -1,15 +1,18 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.utils.minio.MinioUtil;
import io.minio.Result;
import io.minio.messages.Item;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
+
import java.text.SimpleDateFormat;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.PriorityBlockingQueue;
/**
* @ClassName: MinioDeleteTask
@@ -19,8 +22,8 @@
* @Version: 1.0
**/
@Component("MinioTask")
-@Slf4j(topic = "minio")
-public class MinioTask {
+@Slf4j
+public class CleanTask {
public void delHistoryTask(Integer saveDays) {
log.debug("鎵ц鍘嗗彶鏁版嵁鍒犻櫎");
@@ -59,4 +62,20 @@
log.error("minio鍘嗗彶鏁版嵁鍒犻櫎寮傚父锛�" + ex.getMessage());
}
}
+
+ /**
+ * 瀹氭椂娓呯┖寮曞闃熷垪
+ * 鍒樿嫃涔�
+ * 2023/7/1 10:41
+ */
+ public void clearGuideQueue() {
+ try {
+ log.info("瀹氭椂娓呯悊寮曞闃熷垪");
+ for (PriorityBlockingQueue<GuideTask> guideQueue : GuidePriorityQueue.cameraQueueMap.values()) {
+ guideQueue.clear();
+ }
+ } catch (Exception ex) {
+ log.error("瀹氭椂娓呯┖寮曞闃熷垪:" + ex.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3