Commit 8492c3d3 by 赵剑炜

先恢复至可用

parent 6ffc99ae
...@@ -17,7 +17,10 @@ ...@@ -17,7 +17,10 @@
<artifactId>spring-boot-starter-data-elasticsearch</artifactId> <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
......
package com.junmp.jyzb.cache; package com.junmp.jyzb.cache;
import com.junmp.jyzb.api.constant.JYZBConstant; import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.cache.AbstractRedisCache; import com.junmp.v2.cache.AbstractRedisCache;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
......
...@@ -6,16 +6,13 @@ import com.junmp.v2.cache.AbstractRedisCache; ...@@ -6,16 +6,13 @@ import com.junmp.v2.cache.AbstractRedisCache;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@Component @Component
public class TemperatureRedisCache extends AbstractRedisCache<HumidityAndtemperature> { public class TemperatureRedisCache extends AbstractRedisCache<Object> {
public TemperatureRedisCache(RedisTemplate<String, HumidityAndtemperature> redisTemplate) { public TemperatureRedisCache(RedisTemplate<String, Object> redisTemplate) {
super(redisTemplate); super(redisTemplate);
// super(redisTemplate);
} }
@Override @Override
...@@ -24,21 +21,21 @@ public class TemperatureRedisCache extends AbstractRedisCache<HumidityAndtempera ...@@ -24,21 +21,21 @@ public class TemperatureRedisCache extends AbstractRedisCache<HumidityAndtempera
} }
public void addTemperatureHumidity(String warehouseId,String warehouseName,long timestamp, double humidity, double temperature) { public void addTemperatureHumidity(String warehouseId,String warehouseName,long timestamp, double humidity, double temperature) {
HumidityAndtemperature data = new HumidityAndtemperature(); // HumidityAndtemperature data = new HumidityAndtemperature();
data.setHumidity(humidity); // data.setHumidity(humidity);
data.setTemperature(temperature); // data.setTemperature(temperature);
data.setCreateTime(timestamp); // data.setCreateTime(timestamp);
data.setWarehouseId(warehouseId); // data.setWarehouseId(warehouseId);
data.setWarehouseName(warehouseName); // data.setWarehouseName(warehouseName);
String key = warehouseId; // String key = warehouseId;
getRedisTemplate().opsForZSet().add(key, data, timestamp); // getRedisTemplate().opsForZSet().add(key, data, timestamp);
//
put(key, data); // put(key, data);
}
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);
} }
// 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);
// }
} }
package com.junmp.jyzb.entity.Temp; package com.junmp.jyzb.entity.Temp;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.sql.Time; import java.sql.Time;
import java.util.Date; import java.util.Date;
@Data @Data
public class HumidityAndtemperature { @NoArgsConstructor
public class HumidityAndtemperature implements Serializable {
//湿度 //湿度
private Double humidity; private Double humidity;
//温度 //温度
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论