From 2d5fdd624858e438a7153a8d3a55add8d2fdfda2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 16:00:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java |   11 ++++++++---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java  |    7 +------
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java  |    1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java
index 1cbb4fe..392546b 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanTask.java
@@ -15,16 +15,21 @@
 import java.util.concurrent.PriorityBlockingQueue;
 
 /**
- * @ClassName: MinioDeleteTask
- * @Description:
+ * @ClassName: CleanTask
+ * @Description: 娓呯悊浠诲姟
  * @Author: Administrator
  * @Date: 2023骞�01鏈�14鏃� 8:15
  * @Version: 1.0
  **/
-@Component("MinioTask")
+@Component("CleanTask")
 @Slf4j
 public class CleanTask {
 
+    /**
+     * minio瀛樺偍鍘嗗彶浠诲姟娓呯悊
+     * 鍒樿嫃涔�
+     * 2023/10/8 15:24:02
+     */
     public void delHistoryTask(Integer saveDays) {
         log.debug("鎵ц鍘嗗彶鏁版嵁鍒犻櫎");
         //閬嶅巻瀛樺偍
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java
index 4aa4deb..b9d9170 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java
@@ -1,7 +1,5 @@
 package com.ruoyi.quartz.task;
 
-import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
-import com.ruoyi.alarm.global.domain.GuideTask;
 import com.ruoyi.alarm.global.service.IGlobalAlarmService;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -16,15 +14,12 @@
 import com.ruoyi.utils.websocket.util.WebSocketUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-
 import java.util.*;
-import java.util.concurrent.PriorityBlockingQueue;
-
 import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
 
 /**
  * @ClassName: AlarmTask
- * @Description:
+ * @Description: 鎺ㄩ�佷换鍔�
  * @Author: Administrator
  * @Date: 2023骞�03鏈�06鏃� 11:13
  * @Version: 1.0
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
index f2b6b01..5ecb0ea 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
@@ -9,7 +9,6 @@
 import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-
 import javax.annotation.Resource;
 import java.util.List;
 

--
Gitblit v1.9.3