Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java

@@ -158,6 +158,7 @@ public class FallAlarm implements IAlarm {
                     alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
                     alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
                     RedisUtil.set(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId, alarmRedisDTO);
                     RedisUtil.set(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId, alarmRedisDTO);
                     PlatAlarmCheckDTO platAlarmCheckDTO_behavior = BeanDtoVoUtils.convert(platAlarmCheckDTO, PlatAlarmCheckDTO.class);
                     PlatAlarmCheckDTO platAlarmCheckDTO_behavior = BeanDtoVoUtils.convert(platAlarmCheckDTO, PlatAlarmCheckDTO.class);
+                    platAlarmCheckDTO_behavior.setAbnormalValue(String.valueOf(count));
                     platAlarmCheckDTO_behavior.setPlatAlarmConfig(config);
                     platAlarmCheckDTO_behavior.setPlatAlarmConfig(config);
                     notice(platAlarmCheckDTO_behavior);
                     notice(platAlarmCheckDTO_behavior);
                 }else {
                 }else {

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -2,8 +2,6 @@ package com.makeit.mqtt;
 
 
 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.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.device.PlatDevice;
@@ -13,11 +11,9 @@ import com.makeit.module.iot.vo.DeviceInfo;
 import com.makeit.module.iot.vo.HeaderInfo;
 import com.makeit.module.iot.vo.HeaderInfo;
 import com.makeit.service.platform.alarm.alarmStrategy.IAlarm;
 import com.makeit.service.platform.alarm.alarmStrategy.IAlarm;
 import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.device.PlatDeviceService;
-import com.makeit.service.saas.PlatTenantService;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.DeviceCacheUtil;
 import com.makeit.utils.DeviceCacheUtil;
 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;
@@ -28,7 +24,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.transaction.annotation.Transactional;
 import org.springframework.util.StopWatch;
 import org.springframework.util.StopWatch;
 
 
 import java.util.List;
 import java.util.List;
@@ -119,7 +114,7 @@ public class PushCallback implements MqttCallback {
         String messageType = device.getMessageType();
         String messageType = device.getMessageType();
         //更新设备状态
         //更新设备状态
         boolean statusFlag = platDeviceService.updateDeviceStatus(messageType, deviceId, "");
         boolean statusFlag = platDeviceService.updateDeviceStatus(messageType, deviceId, "");
-        if (statusFlag) {
+        if (org.apache.commons.lang3.StringUtils.equalsAnyIgnoreCase(messageType, DeviceState.online.getValue())) {
             return;
             return;
         }
         }
         for (HeaderInfo.Bind binding : bindings) {
         for (HeaderInfo.Bind binding : bindings) {