From ef2c3b3e0dbd683dfd75b55eb538914eecd2b6fa Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 22 七月 2023 16:52:19 +0800
Subject: [PATCH] 修复接口文档bug
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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..de78377 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,21 +21,18 @@
@Component("MinioTask")
@Slf4j(topic = "minio")
public class MinioTask {
- @Resource
- MinioUtil minioUtil;
public void delHistoryTask(Integer saveDays) {
- log.info("鎵ц鍘嗗彶鏁版嵁鍒犻櫎");
+ log.debug("鎵ц鍘嗗彶鏁版嵁鍒犻櫎");
//閬嶅巻瀛樺偍
try {
List<String> buckets=new ArrayList<>();
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());
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.of("Asia/Shanghai"));
String objectTime = item.lastModified().format(formatter);
@@ -45,17 +42,16 @@
calendar.setTime(now);
calendar.add(Calendar.DATE, saveDays);
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String nowTime = fmt.format(calendar.getTime());
+ String expireTime = fmt.format(calendar.getTime());
- log.info("objectTime : " + objectTime);
- log.info("nowTime : " + nowTime);
-
- if (objectTime.compareTo(nowTime) < 0) {
- log.info("objectTime 鏃堕棿鍦� nowTime 涔嬪墠");
- boolean b = minioUtil.deleteObject(name, item.objectName());
+ if (objectTime.compareTo(expireTime) < 0) {
+ log.debug("objectTime : " + objectTime);
+ log.debug("expireTime : " + expireTime);
+ log.debug("objectTime 鏃堕棿鍦� expireTime 涔嬪墠,鎵ц鍒犻櫎");
+ boolean b = MinioUtils.removeObject(name, item.objectName());
if(b)
{
- log.info("鍒犻櫎杩囨湡鏁版嵁锛�"+ item.objectName()+"---"+item.lastModified());
+ log.debug("鎴愬姛鍒犻櫎杩囨湡鏁版嵁锛�"+ item.objectName()+"---"+item.lastModified());
}
}
}
--
Gitblit v1.9.3