Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 0517f9e3 by 汪志阳
Options

fix:bug 修改

parent 19d93d08
Inline Side-by-side
Showing with 21 additions and 15 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java
package com.makeit.service.platform.alarm.alarmStrategy; package com.makeit.service.platform.alarm.alarmStrategy;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO; import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
...@@ -62,15 +61,17 @@ public class OffBedAlarm implements IAlarm { ...@@ -62,15 +61,17 @@ public class OffBedAlarm implements IAlarm {
log.error("离床告警心率设备未关联长者，设备plat_id:" + platAlarmCheckDTO.getPlatDevice().getId()); log.error("离床告警心率设备未关联长者，设备plat_id:" + platAlarmCheckDTO.getPlatDevice().getId());
return; return;
} }
// PlatAlarmConfig config = alarmConfigCacheUtil.get(platDevice.getOrgId(), PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED.getValue()); PlatAlarmConfig config = alarmConfigCacheUtil.get(platDevice.getOrgId(), PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED.getValue());
log.info("当前config:{},dto config:{}", config.getRuleConfig(), platAlarmCheckDTO.getPlatAlarmConfig().getRuleConfig());
offBedCheckAlarm(config, platAlarmCheckDTO, platDevice);
// PlatAlarmConfig platAlarmConfig = platAlarmCheckDTO.getPlatAlarmConfig(); // PlatAlarmConfig platAlarmConfig = platAlarmCheckDTO.getPlatAlarmConfig();
List<PlatAlarmConfig> configList = platAlarmConfigService.listOfBed(platDevice.getId()); // List<PlatAlarmConfig> configList = platAlarmConfigService.listOfBed(platDevice.getId());
if (CollUtil.isNotEmpty(configList)) { // if (CollUtil.isNotEmpty(configList)) {
configList.forEach(c -> { // configList.forEach(c -> {
log.info("离床告警dto,org_config:{},设备id：{}", c.getRuleConfig(), platDevice.getId()); // log.info("离床告警dto,org_config:{},设备id：{}", c.getRuleConfig(), platDevice.getId());
offBedCheckAlarm(c, platAlarmCheckDTO, platDevice); // offBedCheckAlarm(c, platAlarmCheckDTO, platDevice);
}); // });
} // }
} }
...@@ -242,7 +243,7 @@ public class OffBedAlarm implements IAlarm { ...@@ -242,7 +243,7 @@ public class OffBedAlarm implements IAlarm {
} }
LocalDateTime now = currentTime(); LocalDateTime now = currentTime();
LocalTime localTime = LocalTime.now().plusHours(9); LocalTime localTime = LocalTime.now().plusHours(8);
if (!isInTime && localTime.isAfter(startTime) && localTime.isBefore(endTime)) { if (!isInTime && localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000; long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000;
boolean noInOverTime = mills >= duration * 60; boolean noInOverTime = mills >= duration * 60;
...@@ -322,12 +323,12 @@ public class OffBedAlarm implements IAlarm { ...@@ -322,12 +323,12 @@ public class OffBedAlarm implements IAlarm {
} }
} }
private long currentLong() { private static long currentLong() {
return currentTime().toInstant(ZoneOffset.of("+8")).toEpochMilli(); return currentTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
} }
private LocalDateTime currentTime() { private static LocalDateTime currentTime() {
return LocalDateTime.now().plusHours(9); return LocalDateTime.now().plusHours(8);
// return LocalDateTime.now(); // return LocalDateTime.now();
} }
......
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
package com.makeit.mqtt; package com.makeit.mqtt;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -20,7 +22,6 @@ import com.makeit.utils.AlarmConfigCacheUtil; ...@@ -20,7 +22,6 @@ import com.makeit.utils.AlarmConfigCacheUtil;
import com.makeit.utils.DeviceCacheUtil; import com.makeit.utils.DeviceCacheUtil;
import com.makeit.utils.redis.RedisUtil; import com.makeit.utils.redis.RedisUtil;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttCallback;
import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttClient;
...@@ -31,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -31,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StopWatch;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -39,6 +39,7 @@ import java.util.List; ...@@ -39,6 +39,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Component @Component
...@@ -205,6 +206,10 @@ public class PushCallback implements MqttCallback { ...@@ -205,6 +206,10 @@ public class PushCallback implements MqttCallback {
logger.error("该设备没有告警配置,设备iot-id,iot_tenantId:" + deviceId+","+iot_tenantId); logger.error("该设备没有告警配置,设备iot-id,iot_tenantId:" + deviceId+","+iot_tenantId);
return; return;
} }
List<PlatAlarmConfig> configList = deviceAlarmConfigList.stream().filter(f -> "5".equals(f.getAlarmType())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(configList)) {
logger.info("离床预警config集合：{}", JSONUtil.toJsonStr(configList));
}
for (PlatAlarmConfig config : deviceAlarmConfigList) { for (PlatAlarmConfig config : deviceAlarmConfigList) {
String alarmType = config.getAlarmType(); String alarmType = config.getAlarmType();
......
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