Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 687c91fb by 汪志阳
Options

fix:bug处理

parent 2ad734d0
Inline Side-by-side
Showing with 9 additions and 5 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java
...@@ -99,14 +99,14 @@ public class OffBedAlarm implements IAlarm { ...@@ -99,14 +99,14 @@ public class OffBedAlarm implements IAlarm {
log.info("离床config：{}", JSONUtil.toJsonStr(properties)); log.info("离床config：{}", JSONUtil.toJsonStr(properties));
AlarmRedisDTO alarmRedisDTO = RedisUtil.get(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId); AlarmRedisDTO alarmRedisDTO = RedisUtil.get(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId);
if (!isOffBed && alarmRedisDTO != null) { if (!isOffBed && alarmRedisDTO != null) {
log.warn("离床有人状态下，删除redis！"); log.info("离床有人状态下，删除redis！");
RedisUtil.delete(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId); RedisUtil.delete(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId);
return; return;
} }
// 设备无人，在范围内上报存储redis，超过离床持续时间，则预警 // 设备无人，在范围内上报存储redis，超过离床持续时间，则预警
String messageType = platAlarmCheckDTO.getMessageType(); String messageType = platAlarmCheckDTO.getMessageType();
if (StringUtils.equalsAnyIgnoreCase(messageType, "OFFLINE", "DISCONNECT")) { if (StringUtils.equalsAnyIgnoreCase(messageType, "OFFLINE", "DISCONNECT")) {
log.warn("设备下线，删除redis off_bed 预警"); log.info("设备下线，删除redis off_bed 预警");
RedisUtil.delete(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId); RedisUtil.delete(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId);
} }
if (isOffBed) { if (isOffBed) {
...@@ -119,6 +119,10 @@ public class OffBedAlarm implements IAlarm { ...@@ -119,6 +119,10 @@ public class OffBedAlarm implements IAlarm {
boolean isOverTime = (localDateLong - firstOffBedLong) / 1000 >= duration * 60; boolean isOverTime = (localDateLong - firstOffBedLong) / 1000 >= duration * 60;
LocalDateTime firstOffBedTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(firstOffBedLong), ZoneOffset.of("+8")); LocalDateTime firstOffBedTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(firstOffBedLong), ZoneOffset.of("+8"));
log.info("第一次离床时间为：" + firstOffBedTime); log.info("第一次离床时间为：" + firstOffBedTime);
if ("1".equals(alarmRedisDTO.getAlarm())) {
log.info("离床预警已发送预警过！");
return;
}
// 第一次离床时间在范围前，则已范围开始时间起始算 // 第一次离床时间在范围前，则已范围开始时间起始算
if (firstOffBedTime.isBefore(startTime)) { if (firstOffBedTime.isBefore(startTime)) {
boolean over = (Duration.between(LocalDateTime.now(), startTime).toMillis()) / 1000 >= duration * 60; boolean over = (Duration.between(LocalDateTime.now(), startTime).toMillis()) / 1000 >= duration * 60;
...@@ -142,7 +146,7 @@ public class OffBedAlarm implements IAlarm { ...@@ -142,7 +146,7 @@ public class OffBedAlarm implements IAlarm {
} }
if (firstOffBedTime.isAfter(endTime)) { if (firstOffBedTime.isAfter(endTime)) {
log.warn("离床时间超出时间范围！"); log.info("离床时间超出时间范围！");
} }
} }
...@@ -191,7 +195,7 @@ public class OffBedAlarm implements IAlarm { ...@@ -191,7 +195,7 @@ public class OffBedAlarm implements IAlarm {
alarmRedisDTO.setStart(now); alarmRedisDTO.setStart(now);
alarmRedisDTO.setStartLong(endLong); alarmRedisDTO.setStartLong(endLong);
RedisUtil.set(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId, alarmRedisDTO); RedisUtil.set(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId, alarmRedisDTO);
log.warn("离床设备存储redis，第一次上报时间：{}，开始上报时间：{}，是否上报：{}", log.info("离床设备存储redis，第一次上报时间：{}，开始上报时间：{}，是否上报：{}",
getDateTime(alarmRedisDTO.getStartLong()), alarmRedisDTO.getStart(), alarmRedisDTO.getAlarm()); getDateTime(alarmRedisDTO.getStartLong()), alarmRedisDTO.getStart(), alarmRedisDTO.getAlarm());
} else { } else {
alarmRedisDTO.setStart(now); alarmRedisDTO.setStart(now);
...@@ -206,7 +210,7 @@ public class OffBedAlarm implements IAlarm { ...@@ -206,7 +210,7 @@ public class OffBedAlarm implements IAlarm {
alarmRedisDTO.setStart(new Date()); alarmRedisDTO.setStart(new Date());
alarmRedisDTO.setAlarm(CommonEnum.YES.getValue()); alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
RedisUtil.set(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId, alarmRedisDTO); RedisUtil.set(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId, alarmRedisDTO);
log.warn("推送离床消息，第一次上报时间：{}，开始上报时间：{}，是否上报：{}", log.info("推送离床消息，第一次上报时间：{}，开始上报时间：{}，是否上报：{}",
getDateTime(alarmRedisDTO.getStartLong()), alarmRedisDTO.getStart(), alarmRedisDTO.getAlarm()); getDateTime(alarmRedisDTO.getStartLong()), alarmRedisDTO.getStart(), alarmRedisDTO.getAlarm());
} }
......
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