Commit e1aaf255134486d027985ecc2e91485f58355a83

Authored by 张志伟
1 parent 67a9bd53

:sparkles: BUG修复

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; @@ -38,7 +38,7 @@ import static cn.fw.common.businessvalidator.Validator.BV;
38 */ 38 */
39 @Slf4j 39 @Slf4j
40 @Component 40 @Component
41 -@ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on") 41 +//@ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on")
42 public class CallReportDealTask { 42 public class CallReportDealTask {
43 private final CustomerBaseInfoService baseInfoService; 43 private final CustomerBaseInfoService baseInfoService;
44 private final CustomerService customerService; 44 private final CustomerService customerService;
@@ -69,7 +69,7 @@ public class CallReportDealTask { @@ -69,7 +69,7 @@ public class CallReportDealTask {
69 /** 69 /**
70 * 处理通话记录 70 * 处理通话记录
71 */ 71 */
72 - @Scheduled(initialDelay = 1000 * 5, fixedRate = 1000 * 30) 72 + @Scheduled(initialDelay = 1000 * 5, fixedRate = 1000 * 5)
73 public void dealCallReport() { 73 public void dealCallReport() {
74 List<String> failList = new ArrayList<>(); 74 List<String> failList = new ArrayList<>();
75 String callStr; 75 String callStr;
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 { @@ -795,7 +795,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
795 795
796 protected void feedbackTask(Long taskId, FeedbackTypeEnum feedbackTypeEnum) { 796 protected void feedbackTask(Long taskId, FeedbackTypeEnum feedbackTypeEnum) {
797 FollowTask task = followTaskService.getById(taskId); 797 FollowTask task = followTaskService.getById(taskId);
798 - if (Objects.isNull(task)) { 798 + if (Objects.isNull(task) || Objects.isNull(feedbackTypeEnum)) {
799 return; 799 return;
800 } 800 }
801 String feedback = task.getFeedback(); 801 String feedback = task.getFeedback();