Commit 27de82a12caf94f1bb1c1f70181450d5e6d2529e

Authored by 张志伟
1 parent 326b920b

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

fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowTaskDealTask.java
... ... @@ -4,7 +4,6 @@ import cn.fw.valhalla.common.utils.DateUtil;
4 4 import cn.fw.valhalla.domain.db.follow.ClueTask;
5 5 import cn.fw.valhalla.domain.db.follow.FollowClue;
6 6 import cn.fw.valhalla.domain.enums.ClueStatusEnum;
7   -import cn.fw.valhalla.domain.enums.FollowTypeEnum;
8 7 import cn.fw.valhalla.domain.enums.TaskStateEnum;
9 8 import cn.fw.valhalla.service.bus.follow.FollowBizService;
10 9 import cn.fw.valhalla.service.data.ClueTaskService;
... ... @@ -49,8 +48,7 @@ public class FollowTaskDealTask {
49 48 public void startClue() {
50 49 List<FollowClue> list = followClueService.list(Wrappers.<FollowClue>lambdaQuery()
51 50 .eq(FollowClue::getClueState, ClueStatusEnum.WAITING)
52   - .ne(FollowClue::getClueType, FollowTypeEnum.IR)
53   - .ge(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDate.now().minusDays(1L).atTime(23, 59, 59)))
  51 + .gt(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDate.now().minusDays(1L).atTime(23, 59, 59)))
54 52 .le(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDateTime.now()))
55 53 .last("limit 0, 500")
56 54 );
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java
... ... @@ -245,7 +245,7 @@ public class CommonService {
245 245 return null;
246 246 }
247 247 int detailValue = Optional.ofNullable(settingVO.get().getDetailValue()).orElse(0);
248   - while (!generateTime.minusDays(detailValue).isAfter(LocalDate.now().minusDays(4L))) {
  248 + while (!generateTime.minusDays(detailValue).isAfter(LocalDate.now())) {
249 249 generateTime = generateTime.plusYears(1L);
250 250 }
251 251 return generateTime;
... ...