From a41b87713f1464890b0153fffa3419f5fe60b361 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 28 May 2025 10:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=88=A0=E9=99=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ycwl/basic/mapper/SourceMapper.java | 2 ++ src/main/java/com/ycwl/basic/mapper/VideoMapper.java | 2 ++ src/main/java/com/ycwl/basic/task/FaceCleaner.java | 5 ++++- src/main/resources/mapper/SourceMapper.xml | 3 +++ src/main/resources/mapper/VideoMapper.xml | 6 ++++++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ycwl/basic/mapper/SourceMapper.java b/src/main/java/com/ycwl/basic/mapper/SourceMapper.java index 265ca85..027b303 100644 --- a/src/main/java/com/ycwl/basic/mapper/SourceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/SourceMapper.java @@ -79,4 +79,6 @@ public interface SourceMapper { List listSourceWatermark(List sourceIds, Long faceId, String watermarkType); void addSourceWatermark(Long sourceId, Long faceId, String type, String url); + + int deleteUselessSource(); } diff --git a/src/main/java/com/ycwl/basic/mapper/VideoMapper.java b/src/main/java/com/ycwl/basic/mapper/VideoMapper.java index ae99e97..886f6cf 100644 --- a/src/main/java/com/ycwl/basic/mapper/VideoMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/VideoMapper.java @@ -54,4 +54,6 @@ public interface VideoMapper { int deleteNotBuyRelations(Long scenicId, Date endDate); int deleteNotBuyFaceRelations(Long userId, Long faceId); + + int deleteUselessVideo(); } diff --git a/src/main/java/com/ycwl/basic/task/FaceCleaner.java b/src/main/java/com/ycwl/basic/task/FaceCleaner.java index d7bc6b7..4e28ced 100644 --- a/src/main/java/com/ycwl/basic/task/FaceCleaner.java +++ b/src/main/java/com/ycwl/basic/task/FaceCleaner.java @@ -163,7 +163,8 @@ public class FaceCleaner { int expireDay = scenicConfig.getVideoStoreDay(); Date endDate = DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -expireDay); int deleteCount = videoMapper.deleteNotBuyRelations(scenic.getId(), endDate); - log.info("当前景区{},删除VLOG{}个", scenic.getName(), deleteCount); + int deleteVideoCount = videoMapper.deleteUselessVideo(); + log.info("当前景区{},删除VLOG关系{}个,删除VLOG记录{}个", scenic.getName(), deleteCount, deleteVideoCount); }); } @@ -203,6 +204,8 @@ public class FaceCleaner { Date endDate2 = DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -imageSourceExpireDay); int deleteImageSourceCount = sourceMapper.deleteNotRelateSource(2, endDate2); log.info("当前景区{},删除原始图片素材{}个", scenic.getName(), deleteImageSourceCount); + int deleteSourceCount = sourceMapper.deleteUselessSource(); + log.info("当前景区{},删除无用素材{}个", scenic.getName(), deleteSourceCount); }); } diff --git a/src/main/resources/mapper/SourceMapper.xml b/src/main/resources/mapper/SourceMapper.xml index 2ea2ff4..45a5ab3 100644 --- a/src/main/resources/mapper/SourceMapper.xml +++ b/src/main/resources/mapper/SourceMapper.xml @@ -59,6 +59,9 @@ delete from member_source where member_id = #{userId} and face_id = #{faceId} and is_buy = 0 + + delete from source where id not in (select source_id from member_source where source_id is not null) + select v.id, v.scenic_id, template_id, task_id, worker_id, video_url, v.create_time, v.update_time, s.name scenicName, s.latitude, s.longitude, t.name templateName, t.price templatePrice,t.cover_url templateCoverUrl