From 450b41507e3e213cde2479204d9aa29a2fccbeb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 18 二月 2025 10:58:23 +0800
Subject: [PATCH] 删除逻辑完善
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java
index a7a9066..1c7da6c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java
@@ -1,10 +1,18 @@
package org.dromara.system.sync;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.oss.core.OssClient;
+import org.dromara.common.oss.factory.OssFactory;
import org.dromara.system.domain.SysOss;
import org.dromara.system.domain.properties.Boundary;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
+import org.dromara.system.service.ISysOssService;
import org.dromara.system.uitil.HttpUtils;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -12,32 +20,50 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
+@Slf4j
@Component
public class deleteSync {
- private final SysOssMapper baseMapper;
+ private final ISysOssService ossService;
+ private final SysOssMapper ossMapper;
private final Boundary boundary;
- public deleteSync(SysOssMapper baseMapper, Boundary boundary) {
- this.baseMapper = baseMapper;
+ public deleteSync(ISysOssService ossService, SysOssMapper ossMapper, Boundary boundary) {
+ this.ossService = ossService;
+ this.ossMapper = ossMapper;
this.boundary = boundary;
}
-
// @Scheduled(cron = "0 */10 * * * ?")
- public void remove() throws IOException {
- System.out.println("鍚屾鍒犻櫎......");
- List<SysOssVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysOss>()
- .le(SysOss::getCreateTime, LocalDateTime.now().minusDays(1)));
+// public void remove() throws IOException {
+// log.error("鍚屾鍒犻櫎......");
+// List<SysOss> list = new LambdaQueryChainWrapper<>(baseMapper)
+// .le(SysOss::getCreateTime, LocalDateTime.now().minusDays(1L))
+// .list();
+// if (list.size() == 0)
+// return;
+//
+// for (SysOss vo : list) {
+// OssClient storage = OssFactory.instance(vo.getService());
+// storage.delete(vo.getUrl());
+// HttpResponse httpResponse = HttpUtils.sendDeleteRequest(this.boundary.getVideo() + "/resource/synchronization/delete",
+// String.valueOf(vo.getOssId()));
+// if (httpResponse.getStatusLine().getStatusCode() == 200) {
+// baseMapper.deleteId(vo.getOssId());
+// }
+// }
+// }
- if (list.size() == 0) {
+ @Scheduled(cron = "0 */10 * * * ?")
+ public void remove() throws IOException {
+ System.out.println("self delete......");
+ List<Long> ids = ossMapper.getWillDeleted(LocalDateTime.now().minusDays(1));
+ if (ids.size() == 0) {
return;
}
- for (SysOssVo vo : list) {
- baseMapper.deleteById(vo.getOssId());
- HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",
- String.valueOf(vo.getOssId()));
- }
+ ossService.deleteByIds(ids);
}
+
}
--
Gitblit v1.8.0