From 27de82a12caf94f1bb1c1f70181450d5e6d2529e Mon Sep 17 00:00:00 2001 From: Kurisu Date: Wed, 8 Feb 2023 18:56:25 +0800 Subject: [PATCH] 放开自动开始任务的定时器 --- fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowTaskDealTask.java | 4 +--- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowTaskDealTask.java b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowTaskDealTask.java index aa91a58..a65a8cc 100644 --- a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowTaskDealTask.java +++ b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowTaskDealTask.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 list = followClueService.list(Wrappers.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") ); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java index 287a54c..765504f 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java @@ -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; -- libgit2 0.22.2