diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java index e042f02..50589b0 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java @@ -419,7 +419,22 @@ public class DeviceServiceImpl implements IDeviceService { queryWrapper.ge(DeviceRunningStatusHistory::getCreateTime, dto.getStartTime()); queryWrapper.le(DeviceRunningStatusHistory::getCreateTime, dto.getEndTime()); } - return deviceStatusHistoryMapper.selectList(queryWrapper); + List list = deviceStatusHistoryMapper.selectList(queryWrapper); + + String key = "running_status:" + dto.getDeviceId(); + DeviceStatusRecordDTO recordDTO = redisCache.getCacheObject(key); + List cacheList; + if (recordDTO != null) { + cacheList = recordDTO.getHistories(); + if (!CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(cacheList)) { + list.addAll(cacheList); + } + } else { + return cacheList; + } + } + return list; } }