feature(*): 修复bug

- 修复bug

feature(*): 修复bug
- 修复bug
张志伟
1 parent 0979a9a0
Showing 6 changed files with 5 additions and 16 deletions
fw-valhalla-common/src/main/java/cn/fw/valhalla/common/constant/RedisKey.java
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/shirasawa/ShirasawaRpcService.java
fw-valhalla-server/src/main/resources/application.yml
fw-valhalla-service/src/main/java/cn/fw/valhalla/component/consumer/FollowResultConsumer.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java
@@ -15,10 +15,6 @@ public interface RedisKey {
      */
     String MKT_QUA = "rpc:mkt:qualification";
     /**
-     * 进行中的待办
-     */
-    String TODO_COUNT = "rpc:user:has-follow-todo";
-    /**
      * 手机号归属地
      */
     String MOBILE_ATT = "mobile:attribution";
@@ -7,14 +7,12 @@ import cn.fw.shirasawa.sdk.param.FollowChangeUserDTO;
 import cn.fw.shirasawa.sdk.param.FollowGenerateDTO;
 import cn.fw.shirasawa.sdk.param.TaskCompleteDTO;
 import cn.fw.shirasawa.sdk.param.TerminationDTO;
-import cn.fw.valhalla.common.constant.RedisKey;
 import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.rpc.shirasawa.dto.ClueStopDTO;
 import cn.fw.valhalla.rpc.shirasawa.dto.FollowInitDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
  
 import java.time.LocalDate;
@@ -126,7 +124,6 @@ public class ShirasawaRpcService {
      * @param userId
      * @return
      */
-    @Cacheable(cacheNames = RedisKey.TODO_COUNT, key = "#userId", condition = "#result!=null && #result==true")
     public Boolean hasOngoingFollow(Long userId) {
         try {
             if (Objects.isNull(userId)) {
@@ -21,8 +21,6 @@ spring:
           ttl: 10m
         - name: rpc:mkt:qualification
           ttl: 30m
-        - name: rpc:user:has-follow-todo
-          ttl: 30m
  
   cloud:
     nacos:
@@ -2,7 +2,6 @@ package cn.fw.valhalla.component.consumer;
  
 import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
 import cn.fw.shirasawa.sdk.mq.FollowResultDTO;
-import cn.fw.valhalla.common.constant.RedisKey;
 import cn.fw.valhalla.domain.db.follow.FollowClue;
 import cn.fw.valhalla.domain.enums.FollowTypeEnum;
 import cn.fw.valhalla.service.bus.follow.FollowBizService;
@@ -14,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Component;
  
 import java.util.HashSet;
@@ -48,7 +46,6 @@ public class FollowResultConsumer implements RocketMQListener&lt;FollowResultDTO&gt; {
     }
  
     @Override
-    @CacheEvict(cacheNames = RedisKey.TODO_COUNT, key = "#dto.userId", beforeInvocation = true)
     public void onMessage(FollowResultDTO dto) {
         log.info("处理跟进结果MQ消息：{}", JSONObject.toJSONString(dto));
         try {
@@ -4,7 +4,6 @@ import cn.fw.common.exception.BusinessException;
 import cn.fw.common.page.AppPage;
 import cn.fw.common.web.annotation.DisLock;
 import cn.fw.common.web.auth.LoginAuthBean;
-import cn.fw.valhalla.common.constant.RedisKey;
 import cn.fw.valhalla.common.constant.RoleCode;
 import cn.fw.valhalla.common.utils.BeanUtils;
 import cn.fw.valhalla.common.utils.DateUtil;
@@ -54,7 +53,6 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -503,7 +501,6 @@ public class CustomerBizService extends AbstractCustomerService {
      *
      * @param task
      */
-    @CacheEvict(cacheNames = RedisKey.TODO_COUNT, key = "#task.followUser", beforeInvocation = true)
     @Transactional(rollbackFor = Exception.class)
     public void abandon(final ClueTask task) {
         List<FollowTypeEnum> typeList = Arrays.asList(FollowTypeEnum.AC, FollowTypeEnum.IR);
@@ -323,7 +323,11 @@ public class PubStandBizService {
                     .ifPresent(r -> standVO.setIncreaseCount(r.getDetailValue()));
         });
  
-        CompletableFuture.allOf(future1, future2, future3);
+        try {
+            CompletableFuture.allOf(future1, future2, future3).get();
+        } catch (Exception e) {
+            log.error("查询配置失败：", e);
+        }
     }
  
     private void fillPubStandVO(final PubStandVO vo, final PubStandStaffInfo staffInfo) {