调整redis为有序集合上报

jyzb-biz/src/main/java/com/junmp/jyzb/cache/TemperatureRedisCache.java

@@ -30,25 +30,15 @@ public class TemperatureRedisCache extends AbstractRedisCache<HumidityAndtempera
         data.setCreateTime(timestamp);
         data.setWarehouseId(warehouseId);
         data.setWarehouseName(warehouseName);
-        String key = warehouseId + ":" + timestamp;
+        String key = warehouseId;
+        getRedisTemplate().opsForZSet().add(key, data, timestamp);
+
         put(key, data);
     }
     public List<HumidityAndtemperature> getDataByTimestampRange(String warehouseId, long startTimestamp, long endTimestamp) {
-        String keyPattern = warehouseId + ":*";
-        Set<String> keys = getRedisTemplate().keys(keyPattern);
-
-        List<String> keysInRange = keys.stream()
-                .filter(key -> {
-                    long timestamp = Long.parseLong(key.split(":")[1]);
-                    return timestamp >= startTimestamp && timestamp <= endTimestamp;
-                })
-                .collect(Collectors.toList());
-
-        List<HumidityAndtemperature> result = new ArrayList<>();
-        for (String key : keysInRange) {
-            result.add(get(key));
-        }
-
-        return result;
+        String key = warehouseId;
+
+        Set<HumidityAndtemperature> dataInRange = getRedisTemplate().opsForZSet().rangeByScore(key, startTimestamp, endTimestamp);
+        return new ArrayList<>(dataInRange);
     }
 }