diff --git a/src/main/java/com/ycwl/basic/mapper/FaceMapper.java b/src/main/java/com/ycwl/basic/mapper/FaceMapper.java index 51331ff..32ab42e 100644 --- a/src/main/java/com/ycwl/basic/mapper/FaceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/FaceMapper.java @@ -36,5 +36,5 @@ public interface FaceMapper { List listByScenicAndUserId(String scenicId, Long userId); - List listEntityBeforeDate(Long scenicId, Date endDate); + List listUnpaidEntityBeforeDate(Long scenicId, Date endDate); } diff --git a/src/main/java/com/ycwl/basic/task/FaceCleaner.java b/src/main/java/com/ycwl/basic/task/FaceCleaner.java index 98d0543..d7bc6b7 100644 --- a/src/main/java/com/ycwl/basic/task/FaceCleaner.java +++ b/src/main/java/com/ycwl/basic/task/FaceCleaner.java @@ -11,7 +11,6 @@ import com.ycwl.basic.mapper.SourceMapper; import com.ycwl.basic.mapper.VideoMapper; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.face.req.FaceReqQuery; -import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery; import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; @@ -107,7 +106,7 @@ public class FaceCleaner { FaceReqQuery req = new FaceReqQuery(); req.setScenicId(scenic.getId()); Date faceEndDate = DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -faceStoreDay); - List list = faceMapper.listEntityBeforeDate(scenic.getId(), faceEndDate); + List list = faceMapper.listUnpaidEntityBeforeDate(scenic.getId(), faceEndDate); list.forEach(face -> { boolean result = adapter.deleteFace(USER_FACE_DB_NAME+face.getScenicId(), face.getId().toString()); if (result) { diff --git a/src/main/resources/mapper/FaceMapper.xml b/src/main/resources/mapper/FaceMapper.xml index 8b33258..f6c37c5 100644 --- a/src/main/resources/mapper/FaceMapper.xml +++ b/src/main/resources/mapper/FaceMapper.xml @@ -123,7 +123,12 @@ - + SELECT * + FROM `zt`.`face` + WHERE `scenic_id` = #{scenicId} + AND `create_at` < #{endDate} + and `id` not in (select face_id from member_source where is_buy = 1) + and `id` not in (select face_id from member_video where is_buy = 1)