xiangpei
2025-02-17 15e8b9f998c99dc19a07fffac91a7982e724aeff
独立删除逻辑
3个文件已修改
51 ■■■■ 已修改文件
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
@@ -43,6 +43,8 @@
    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid, String password) throws Exception;
    void deleteByIds(Collection<Long> ids);
    R viewPasswordById(Long ossId);
}
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -45,6 +45,7 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.*;
@@ -315,7 +316,16 @@
        return true;
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteByIds(Collection<Long> ids) {
        List<SysOss> list = baseMapper.selectBatchIds(ids);
        for (SysOss sysOss : list) {
            OssClient storage = OssFactory.instance(sysOss.getService());
            storage.delete(sysOss.getUrl());
            baseMapper.deleteById(sysOss.getOssId());
        }
    }
    @Override
    public R viewPasswordById(Long ossId) {
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/deleteSync.java
@@ -5,6 +5,7 @@
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;
@@ -16,42 +17,24 @@
@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 * * * ?")
    @Scheduled(cron = "0 */10 * * * ?")
    public void remove() throws IOException {
        System.out.println("同步删除......");
        List<Long> ids = baseMapper.getWillDeleted(LocalDateTime.now().minusDays(1));
        System.out.println("self delete......");
        List<Long> ids = ossMapper.getWillDeleted(LocalDateTime.now().minusDays(1));
        if (ids.size() == 0) {
            return;
        }
        for (Long ossId : ids) {
            HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",
                String.valueOf(ossId));
        }
        ossService.deleteByIds(ids);
    }
    /**
     * 每小时删除30天之前的文件信息,确保上面的定时任务不会因为停电关机等原因导致文件未被删除
     *
     * @throws IOException
     */
//    @Scheduled(cron = "0 0 * * * ?")
    public void removeOssTable() throws IOException {
        System.out.println("每小时定时删除超过30天的数据库文件信息......");
        List<Long> ids = baseMapper.getWillDeleted(LocalDateTime.now().minusDays(30));
        if (ids.size() == 0) {
            return;
        }
        baseMapper.deleteBatchIds(ids);
    }
}