From e1aaf255134486d027985ecc2e91485f58355a83 Mon Sep 17 00:00:00 2001 From: Kurisu Date: Thu, 28 Jan 2021 16:50:45 +0800 Subject: [PATCH] :sparkles: BUG修复 --- fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallReportDealTask.java | 4 ++-- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallReportDealTask.java b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallReportDealTask.java index 9af698d..dd84588 100644 --- a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallReportDealTask.java +++ b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallReportDealTask.java @@ -38,7 +38,7 @@ import static cn.fw.common.businessvalidator.Validator.BV; */ @Slf4j @Component -@ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on") +//@ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on") public class CallReportDealTask { private final CustomerBaseInfoService baseInfoService; private final CustomerService customerService; @@ -69,7 +69,7 @@ public class CallReportDealTask { /** * 处理通话记录 */ - @Scheduled(initialDelay = 1000 * 5, fixedRate = 1000 * 30) + @Scheduled(initialDelay = 1000 * 5, fixedRate = 1000 * 5) public void dealCallReport() { List failList = new ArrayList<>(); String callStr; diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java index 71437c1..252bced 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java @@ -795,7 +795,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { protected void feedbackTask(Long taskId, FeedbackTypeEnum feedbackTypeEnum) { FollowTask task = followTaskService.getById(taskId); - if (Objects.isNull(task)) { + if (Objects.isNull(task) || Objects.isNull(feedbackTypeEnum)) { return; } String feedback = task.getFeedback(); -- libgit2 0.22.2