Commit 371634899ed0440d8db3ea435982ccd1e6101bd7

Authored by 张志伟
1 parent 3aa05e44

Squashed commit of the following:

commit 73bccb78
Author: Kurisu <makise_kurisuu@outlook.jp>
Date:   Thu Jan 28 16:51:55 2021 +0800

    :sparkles: BUG修复

commit e1aaf255
Author: Kurisu <makise_kurisuu@outlook.jp>
Date:   Thu Jan 28 16:50:45 2021 +0800

    :sparkles: BUG修复
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallReportDealTask.java
... ... @@ -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 73 public void dealCallReport() {
74 74 List<String> failList = new ArrayList<>();
75 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 795  
796 796 protected void feedbackTask(Long taskId, FeedbackTypeEnum feedbackTypeEnum) {
797 797 FollowTask task = followTaskService.getById(taskId);
798   - if (Objects.isNull(task)) {
  798 + if (Objects.isNull(task) || Objects.isNull(feedbackTypeEnum)) {
799 799 return;
800 800 }
801 801 String feedback = task.getFeedback();
... ...