Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 2d5fdd624858e438a7153a8d3a55add8d2fdfda2

Merge remote-tracking branch 'origin/master'

 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("执行历史数据删除");
        //遍历存储

 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

 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;