Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit d83017dd by huangjy
Options

fix: 状态兼容睡眠

parent d4e282e4
Inline Side-by-side
Showing with 3 additions and 2 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java
...@@ -208,7 +208,8 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -208,7 +208,8 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
count++; count++;
} }
} }
if (values.size() - count <= 3) { log.info("计算后睡眠集合大小:{},count:{}",values.size(),count);
if (values.size() - count <= 5) {
log.info("当前属于在床睡眠：" + platElderIdDTO.getElderId()); log.info("当前属于在床睡眠：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SLEEP.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SLEEP.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
......
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
...@@ -126,7 +126,7 @@ public class PushCallback implements MqttCallback { ...@@ -126,7 +126,7 @@ public class PushCallback implements MqttCallback {
long size = redisTemplate.opsForHash().size(DEVICE_BR_ANALYSIS + device.getDeviceId()); long size = redisTemplate.opsForHash().size(DEVICE_BR_ANALYSIS + device.getDeviceId());
if (size == duration) { if (size == duration) {
redisTemplate.opsForHash().delete(DEVICE_BR_ANALYSIS + device.getDeviceId(),currentSecond - duration); redisTemplate.opsForHash().delete(DEVICE_BR_ANALYSIS + device.getDeviceId(),currentSecond - duration);
}else if (size - duration >= 3) { }else if (size - duration >= 5) {
redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_BR_ANALYSIS + device.getDeviceId()))); redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_BR_ANALYSIS + device.getDeviceId())));
} }
redisTemplate.opsForHash().put(DEVICE_BR_ANALYSIS + device.getDeviceId(), currentSecond,JSON.toJSONString(device.getProperties())); redisTemplate.opsForHash().put(DEVICE_BR_ANALYSIS + device.getDeviceId(), currentSecond,JSON.toJSONString(device.getProperties()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment