From 773c502d0b2f2732f858946a32f41bf13e1bcdff Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 31 五月 2023 08:48:39 +0800
Subject: [PATCH] 提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 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/MinioTask.java
index 015c997..b78e9b7 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java
@@ -1,11 +1,11 @@
 package com.ruoyi.quartz.task;
 
-import com.ruoyi.device.hiksdk.util.minioUtil.MinioUtil;
+import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
 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;
@@ -21,8 +21,6 @@
 @Component("MinioTask")
 @Slf4j(topic = "minio")
 public class MinioTask {
-    @Resource
-    MinioUtil minioUtil;
 
     public void delHistoryTask(Integer saveDays) {
         log.info("鎵ц鍘嗗彶鏁版嵁鍒犻櫎");
@@ -32,7 +30,7 @@
             buckets.add("pic");
             buckets.add("record");
             for (String name:buckets) {
-                Iterable<Result<Item>> listObjectsPic = minioUtil.getObjectsByBucket(name);
+                Iterable<Result<Item>> listObjectsPic = MinioUtils.getObjectsByBucket(name);
                 for (Result<Item> result : listObjectsPic) {
                     Item item = result.get();
                     log.info(item.objectName() + "鍒涘缓鏃堕棿锛�" + item.lastModified());
@@ -52,7 +50,7 @@
 
                     if (objectTime.compareTo(nowTime) < 0) {
                         log.info("objectTime 鏃堕棿鍦� nowTime 涔嬪墠");
-                        boolean b = minioUtil.deleteObject(name, item.objectName());
+                        boolean b = MinioUtils.removeObject(name, item.objectName());
                         if(b)
                         {
                             log.info("鍒犻櫎杩囨湡鏁版嵁锛�"+ item.objectName()+"---"+item.lastModified());

--
Gitblit v1.9.3