From 3e881345e5e8753c0886407a98bff8da9ae54f76 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 17 二月 2025 09:55:13 +0800 Subject: [PATCH] 还原 --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 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 f93cf6f..7068fbf 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,6 +1,13 @@ 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; @@ -12,7 +19,9 @@ import java.io.IOException; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; +@Slf4j @Component public class deleteSync { @@ -27,16 +36,22 @@ @Scheduled(cron = "0 */10 * * * ?") public void remove() throws IOException { - System.out.println("鍚屾鍒犻櫎......"); - List<Long> ids = baseMapper.getWillDeleted(LocalDateTime.now().minusDays(1)); - - if (ids.size() == 0) { + log.error("鍚屾鍒犻櫎......"); + List<SysOss> list = new LambdaQueryChainWrapper<>(baseMapper) + .le(SysOss::getCreateTime, LocalDateTime.now().minusDays(1L)) + .list(); + if (list.size() == 0) return; - } - for (Long ossId : ids) { - baseMapper.deleteById(ossId); - HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete", - String.valueOf(ossId)); + + 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()); + } } } + } -- Gitblit v1.8.0