解决循环依赖问题

张志伟
1 parent 57a32b62
Showing 3 changed files with 22 additions and 20 deletions
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/CommonController.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java
@@ -11,6 +11,7 @@ import cn.fw.valhalla.service.bus.CommonService;
 import cn.fw.valhalla.service.bus.CustomerImportBizService;
 import cn.fw.valhalla.service.bus.CustomerRetentionRatioBizService;
 import cn.fw.valhalla.service.bus.LeaveNeedDoBizService;
+import cn.fw.valhalla.service.bus.follow.FollowBizService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -46,6 +47,7 @@ public class CommonController {
     private final LeaveNeedDoBizService leaveNeedDoBizService;
     private final CustomerImportBizService customerImportBizService;
     private final CustomerRetentionRatioBizService customerRetentionRatioBizService;
+    private final FollowBizService followBizService;
     @GetMapping("/staff/list")
@@ -124,7 +126,7 @@ public class CommonController {
     @Authorization(AuthType.NONE)
     @ControllerMethod("手动开始任务")
     public Message<Integer> manualStartClue() {
-        commonService.startClue();
+        followBizService.manualStartClue();
         return success();
     }
 }
@@ -22,7 +22,6 @@ import cn.fw.valhalla.rpc.erp.UserService;
 import cn.fw.valhalla.rpc.erp.dto.PostUserDTO;
 import cn.fw.valhalla.rpc.pstn.PstnService;
 import cn.fw.valhalla.sdk.enums.DataTypeEnum;
-import cn.fw.valhalla.service.bus.follow.FollowBizService;
 import cn.fw.valhalla.service.bus.setting.SettingBizService;
 import cn.fw.valhalla.service.data.*;
 import cn.hutool.core.collection.ListUtil;
@@ -35,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.*;
 import static cn.fw.common.businessvalidator.Validator.BV;
@@ -61,7 +59,6 @@ public class CommonService {
     private final ClueTaskService clueTaskService;
     private final FollowRecordService followRecordService;
     private final FollowNoticeRecordService followNoticeRecordService;
-    private final FollowBizService followBizService;
     private final OriginalDataService originalDataService;
     private final SettingBizService settingBizService;
     Map<Long, List<Integer>> map = MapUtil.builder(new HashMap<Long, List<Integer>>())
@@ -175,22 +172,6 @@ public class CommonService {
         return virtualNumber;
     }
-    /**
-     * 手动开始任务
-     */
-    public void startClue() {
-        List<FollowClue> list = followClueService.list(Wrappers.<FollowClue>lambdaQuery()
-                .eq(FollowClue::getClueState, ClueStatusEnum.WAITING)
-                .le(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDateTime.now()))
-                .last("limit 0, 2000")
-        );
-        if (CollectionUtils.isEmpty(list)) {
-            return;
-        }
-        for (FollowClue cluePool : list) {
-            followBizService.startClue(cluePool);
-        }
-    }
     public void createClue(Long groupId) {
         int count = customerService.count(Wrappers.<Customer>lambdaQuery()
@@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -318,6 +319,24 @@ public class FollowBizService {
     }
+    /**
+     * 手动开始任务
+     */
+    public void manualStartClue() {
+        List<FollowClue> list = followClueService.list(Wrappers.<FollowClue>lambdaQuery()
+                .eq(FollowClue::getClueState, ClueStatusEnum.WAITING)
+                .le(FollowClue::getStartTime, DateUtil.localDateTime2Date(LocalDateTime.now()))
+                .last("limit 0, 2000")
+        );
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+        for (FollowClue cluePool : list) {
+            startClue(cluePool);
+        }
+    }
+
+
     private FollowTypeEnum conv(DataTypeEnum type) {
         switch (type) {
             case AS: