bug调整

张志伟
1 parent 2d727f47
Showing 3 changed files with 18 additions and 20 deletions
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/erp/TodoRpcService.java
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/erp/dto/BackLogItemDTO.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java
@@ -17,10 +17,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
  
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
  
 /**
@@ -163,28 +160,27 @@ public class TodoRpcService {
             }
             return Optional.of(dto);
         } catch (Exception e) {
-            log.error("缓存设置信息失败 key[{}]", key, e);
+            log.error("缓存信息获取失败 key[{}]", key, e);
             return Optional.empty();
         }
     }
  
-    public List<BackLogItemDTO> getAllFromCache(final String key) {
+    public Collection<BackLogItemDTO> getAllFromCache(final String key) {
         try {
             Boolean hasKey = redisTemplate.hasKey(key);
             if (!Boolean.TRUE.equals(hasKey)) {
-                return new ArrayList<>();
+                return new HashSet<>();
             }
             BoundListOperations<String, String> ops = redisTemplate.boundListOps(key);
             List<String> stringList = ops.range(0, -1);
+            redisTemplate.delete(key);
             if (CollectionUtils.isEmpty(stringList)) {
-                return new ArrayList<>();
+                return new HashSet<>();
             }
-            List<BackLogItemDTO> dtos = stringList.stream().map(str -> JSONObject.parseObject(str, BackLogItemDTO.class)).collect(Collectors.toList());
-            redisTemplate.delete(key);
-            return dtos;
+            return stringList.stream().map(str -> JSONObject.parseObject(str, BackLogItemDTO.class)).collect(Collectors.toSet());
         } catch (Exception e) {
-            log.error("缓存设置信息失败 key[{}]", key, e);
-            return new ArrayList<>();
+            log.error("缓存信息获取失败 key[{}]", key, e);
+            return new HashSet<>();
         }
     }
  
 package cn.fw.valhalla.rpc.erp.dto;
  
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.ToString;
  
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Objects;
  */
 @Data
 @ToString
+@EqualsAndHashCode
 public class BackLogItemDTO {
     /**
      * 发送次数
@@ -22,9 +22,9 @@ import org.springframework.util.CollectionUtils;
  
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
  
 /**
  * @author : kurisu
@@ -125,21 +125,21 @@ public class FollowRecordTask {
     /**
      * 完成待办的重试
      */
-    @Scheduled(initialDelay = 1500, fixedRate = 1000)
+    @Scheduled(initialDelay = 1500, fixedRate = 15 * 1000)
     public void retryCompleteTodoItem() {
         String key = todoRpcService.generateKey(TodoRpcService.TodoOperationEnum.COMPLETE);
-        Optional<BackLogItemDTO> fromCache = todoRpcService.getOneFromCache(key);
-        fromCache.ifPresent(todoRpcService::complete);
+        Collection<BackLogItemDTO> all = todoRpcService.getAllFromCache(key);
+        all.forEach(todoRpcService::complete);
     }
  
     /**
      * 取消待办的重试
      */
-    @Scheduled(initialDelay = 1000, fixedRate = 1000)
+    @Scheduled(initialDelay = 1000, fixedRate = 10 * 1000)
     public void retryCancelTodoItem() {
         String key = todoRpcService.generateKey(TodoRpcService.TodoOperationEnum.CANCEL);
-        Optional<BackLogItemDTO> fromCache = todoRpcService.getOneFromCache(key);
-        fromCache.ifPresent(todoRpcService::cancel);
+        Collection<BackLogItemDTO> all = todoRpcService.getAllFromCache(key);
+        all.forEach(todoRpcService::cancel);
     }