From 67d965cb476bde49109a3773532c33dd9de60518 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 13:30:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 b78e9b7..3ca0f65 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,6 +1,6 @@
package com.ruoyi.quartz.task;
-import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
+import com.ruoyi.storage.minio.utils.MinioUtils;
import io.minio.Result;
import io.minio.messages.Item;
import lombok.extern.slf4j.Slf4j;
@@ -23,37 +23,34 @@
public class MinioTask {
public void delHistoryTask(Integer saveDays) {
- log.info("鎵ц鍘嗗彶鏁版嵁鍒犻櫎");
+ log.debug("鎵ц鍘嗗彶鏁版嵁鍒犻櫎");
//閬嶅巻瀛樺偍
try {
- List<String> buckets=new ArrayList<>();
+ List<String> buckets = new ArrayList<>();
buckets.add("pic");
buckets.add("record");
- for (String name:buckets) {
+ for (String name : buckets) {
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);
- Date now= new Date();
+ Date now = new Date();
// 鎶婃棩鏈熷線鍓嶅鍔犱竴澶�,鏁存暟寰�鍚庢帹,璐熸暟寰�鍓嶇Щ鍔�
Calendar calendar = new GregorianCalendar();
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 涔嬪墠");
+ 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());
+ if (b) {
+ log.debug("鎴愬姛鍒犻櫎杩囨湡鏁版嵁锛�" + item.objectName() + "---" + item.lastModified());
}
}
}
@@ -62,5 +59,4 @@
log.error("minio鍘嗗彶鏁版嵁鍒犻櫎寮傚父锛�" + ex.getMessage());
}
}
-
}
--
Gitblit v1.9.3