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 7a2d682..aa91a58 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,6 +4,7 @@ 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; @@ -44,10 +45,11 @@ public class FollowTaskDealTask { /** * 开始任务 */ -// @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 10) + @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 10) 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))) .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 45fe845..287a54c 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 @@ -169,7 +169,11 @@ public class CommonService { .eq(Customer::getYn, Boolean.TRUE) ); for (Customer customer : list) { - createClue(customer); + try { + createClue(customer); + } catch (Exception e) { + log.error("手动生成续保任务失败:", e); + } } }