修复 Redis 清理任务

wj-datacenter-service/src/main/java/net/wanji/datacenter/task/RedisTask.java

@@ -2,6 +2,7 @@ package net.wanji.datacenter.task;
 
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.datacenter.util.RedisUtils;
+import org.springframework.data.redis.connection.DataType;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -28,8 +29,10 @@ public class RedisTask {
         try {
             Set<String> keys = redisUtils.keys();
             for (String key : keys) {
+                if (redisUtils.keyType(key) == DataType.ZSET) {
                     redisUtils.removeExpiredElements(key);
                 }
+            }
         } catch (Exception e) {
             log.error("清理路口事件缓存失败", e);
             throw new Exception(e);

wj-datacenter-service/src/main/java/net/wanji/datacenter/util/RedisUtils.java

 package net.wanji.datacenter.util;
 
 import net.wanji.datacenter.constant.Constant;
+import org.springframework.data.redis.connection.DataType;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.data.redis.support.atomic.RedisAtomicLong;
@@ -300,6 +301,14 @@ public class RedisUtils {
         return redisTemplate.keys("*");
     }
 
+    /**
+     * 获取key的类型
+     * @return
+     */
+    public DataType keyType(String key) {
+        return redisTemplate.type(key);
+    }
+
     /**
      * 获取全局ID范围
      *