diff --git a/fw-dalaran-dao/src/main/java/cn/fw/dalaran/dao/ActivityThemeDao.java b/fw-dalaran-dao/src/main/java/cn/fw/dalaran/dao/ActivityThemeDao.java index 9a83a99..85405a7 100644 --- a/fw-dalaran-dao/src/main/java/cn/fw/dalaran/dao/ActivityThemeDao.java +++ b/fw-dalaran-dao/src/main/java/cn/fw/dalaran/dao/ActivityThemeDao.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author wmy3969 * @version 1.0 @@ -19,4 +21,11 @@ public interface ActivityThemeDao extends BaseMapper { * @param param 修改的参数封装 */ boolean alertTheme(@Param("param") ActivityTheme param); + + /** + * 获取已经逻辑删除的主题列表 + * + * @return 已经逻辑删除的主题列表 + */ + List getHasDelActivityTheme(); } diff --git a/fw-dalaran-dao/src/main/resources/mapper/ActivityThemeDaoMapper.xml b/fw-dalaran-dao/src/main/resources/mapper/ActivityThemeDaoMapper.xml index 9e9f77d..55733a1 100644 --- a/fw-dalaran-dao/src/main/resources/mapper/ActivityThemeDaoMapper.xml +++ b/fw-dalaran-dao/src/main/resources/mapper/ActivityThemeDaoMapper.xml @@ -43,4 +43,9 @@ + + + diff --git a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/OtherTask.java b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/OtherTask.java index c612745..3792c78 100644 --- a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/OtherTask.java +++ b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/OtherTask.java @@ -38,7 +38,8 @@ public class OtherTask { .list() .stream() .filter(item -> activityThemeService.themeHaveStopCatchData(item.getEndTime(), 7)) - .collect(Collectors.toList());// 找到需要审计的主题 + .collect(Collectors.toList());// 找到需要删除的主题 + themeList.addAll(activityThemeService.getHasDelActivityTheme());// 找到已经逻辑删除的主题 if (CollectionUtils.isEmpty(themeList)) return; String tempDir = common.getActivityThemeCoverDir(); diff --git a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/ActivityThemeService.java b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/ActivityThemeService.java index c733c84..d9460a8 100644 --- a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/ActivityThemeService.java +++ b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/ActivityThemeService.java @@ -111,4 +111,11 @@ public interface ActivityThemeService extends IService { * @return 主题是否结束数据抓取 */ boolean themeHaveStopCatchData(Date themeEndTime, int delayDays); + + /** + * 获取已经逻辑删除的主题列表 + * + * @return 已经逻辑删除的主题列表 + */ + List getHasDelActivityTheme(); } diff --git a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java index ac65b91..a19f679 100644 --- a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java +++ b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java @@ -435,4 +435,14 @@ public class ActivityThemeServiceImpl extends ServiceImpl getHasDelActivityTheme() { + return activityThemeDao.getHasDelActivityTheme(); + } + }