修改redis方法

jyzb-api/src/main/java/com/junmp/jyzb/api/constant/JYZBConstant.java

@@ -28,12 +28,12 @@ public interface JYZBConstant {
     /**
      * 缓存前缀
      */
-    String JYZB_CACHE_PREFIX = "jyzb:";
+    String JYZB_CACHE_PREFIX = "msg:";
 
     /**
      * 温度前缀
      */
-    String JYZB_TEMP_PREFIX = "temp";
+    String JYZB_TEMP_PREFIX = "temp:";
 
     String JYZB_JWT_KEY = "JWT";
 }

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

@@ -6,13 +6,15 @@ import com.junmp.v2.cache.AbstractRedisCache;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 
-@Component
+//@Component
 public class TemperatureRedisCache extends AbstractRedisCache<Object> {
     public TemperatureRedisCache(RedisTemplate<String, Object> redisTemplate) {
         super(redisTemplate);
-//        super(redisTemplate);
     }
 
     @Override
@@ -21,21 +23,21 @@ public class TemperatureRedisCache extends AbstractRedisCache<Object> {
     }
 
     public void addTemperatureHumidity(String warehouseId,String warehouseName,long timestamp, double humidity, double temperature) {
-//        HumidityAndtemperature data = new HumidityAndtemperature();
-//        data.setHumidity(humidity);
-//        data.setTemperature(temperature);
-//        data.setCreateTime(timestamp);
-//        data.setWarehouseId(warehouseId);
-//        data.setWarehouseName(warehouseName);
-//        String key = warehouseId;
-//        getRedisTemplate().opsForZSet().add(key, data, timestamp);
-//
-//        put(key, data);
+        HumidityAndtemperature data = new HumidityAndtemperature();
+        data.setHumidity(humidity);
+        data.setTemperature(temperature);
+        data.setCreateTime(timestamp);
+        data.setWarehouseId(warehouseId);
+        data.setWarehouseName(warehouseName);
+        String key = warehouseId;
+        getRedisTemplate().opsForZSet().add(key, data, timestamp);
+
+        put(key, data);
+    }
+    public List<Object> getDataByTimestampRange(String warehouseId, long startTimestamp, long endTimestamp) {
+        String key = warehouseId;
+
+        Set<Object> dataInRange = getRedisTemplate().opsForZSet().rangeByScore(key, startTimestamp, endTimestamp);
+        return new ArrayList<>(dataInRange);
     }
-//    public List<HumidityAndtemperature> getDataByTimestampRange(String warehouseId, long startTimestamp, long endTimestamp) {
-//        String key = warehouseId;
-//
-//        Set<HumidityAndtemperature> dataInRange = getRedisTemplate().opsForZSet().rangeByScore(key, startTimestamp, endTimestamp);
-//        return new ArrayList<>(dataInRange);
-//    }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Temp/HumidityAndtemperature.java

@@ -2,12 +2,14 @@ package com.junmp.jyzb.entity.Temp;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.context.annotation.Configuration;
 
 import java.io.Serializable;
 import java.sql.Time;
 import java.util.Date;
 
 @Data
+@Configuration
 @NoArgsConstructor
 public class HumidityAndtemperature   implements Serializable {
     //湿度