放开自动开始任务的定时器

张志伟
1 parent 326b920b
Showing 2 changed files with 2 additions and 4 deletions
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowTaskDealTask.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java
@@ -4,7 +4,6 @@ import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.domain.db.follow.ClueTask;
 import cn.fw.valhalla.domain.db.follow.FollowClue;
 import cn.fw.valhalla.domain.enums.ClueStatusEnum;
-import cn.fw.valhalla.domain.enums.FollowTypeEnum;
 import cn.fw.valhalla.domain.enums.TaskStateEnum;
 import cn.fw.valhalla.service.bus.follow.FollowBizService;
 import cn.fw.valhalla.service.data.ClueTaskService;
@@ -49,8 +48,7 @@ public class FollowTaskDealTask {
     public void startClue() {
         List<FollowClue> list = followClueService.list(Wrappers.<FollowClue>lambdaQuery()
                 .eq(FollowClue::getClueState, ClueStatusEnum.WAITING)
-                .ne(FollowClue::getClueType, FollowTypeEnum.IR)
-                .ge(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDate.now().minusDays(1L).atTime(23, 59, 59)))
+                .gt(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDate.now().minusDays(1L).atTime(23, 59, 59)))
                 .le(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDateTime.now()))
                 .last("limit 0, 500")
         );
@@ -245,7 +245,7 @@ public class CommonService {
             return null;
         }
         int detailValue = Optional.ofNullable(settingVO.get().getDetailValue()).orElse(0);
-        while (!generateTime.minusDays(detailValue).isAfter(LocalDate.now().minusDays(4L))) {
+        while (!generateTime.minusDays(detailValue).isAfter(LocalDate.now())) {
             generateTime = generateTime.plusYears(1L);
         }
         return generateTime;