Merge branch 'dev'

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -1326,9 +1326,9 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
                 if (!isSuccess) {
                 if (!isSuccess) {
                     return;
                     return;
                 }
                 }
-                RedisUtil.set(key, faultState);
                 this.update(new UpdateWrapper<PlatDevice>().lambda()
                 this.update(new UpdateWrapper<PlatDevice>().lambda()
                         .set(PlatDevice::getStatus, "abnormal").eq(PlatDevice::getOriDeviceId, deviceId));
                         .set(PlatDevice::getStatus, "abnormal").eq(PlatDevice::getOriDeviceId, deviceId));
+                RedisUtil.set(key, faultState);
                 log.info("设备:{} 故障处理, 设置故障", deviceId);
                 log.info("设备:{} 故障处理, 设置故障", deviceId);
             }
             }
         } else {
         } else {
@@ -1337,9 +1337,9 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
                 if (!isSuccess) {
                 if (!isSuccess) {
                     return;
                     return;
                 }
                 }
-                RedisUtil.delete(key);
                 this.update(new UpdateWrapper<PlatDevice>().lambda()
                 this.update(new UpdateWrapper<PlatDevice>().lambda()
                         .set(PlatDevice::getStatus, "online").eq(PlatDevice::getOriDeviceId, deviceId));
                         .set(PlatDevice::getStatus, "online").eq(PlatDevice::getOriDeviceId, deviceId));
+                RedisUtil.delete(key);
                 log.info("设备:{} 故障处理, 恢复正常", deviceId);
                 log.info("设备:{} 故障处理, 恢复正常", deviceId);
             }
             }
         }
         }

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

@@ -277,12 +277,11 @@ public class PushCallback implements MqttCallbackExtended {
      * 处理设备状态
      * 处理设备状态
      */
      */
     public void handleStatus(DeviceInfo device) {
     public void handleStatus(DeviceInfo device) {
-        if (!REPORT_PROPERTY.equals(device.getMessageType())) {
-            return;
-        }
         CompletableFuture.runAsync(() -> {
         CompletableFuture.runAsync(() -> {
+            if (REPORT_PROPERTY.equals(device.getMessageType())) {
                 // 处理设备故障
                 // 处理设备故障
                 platDeviceService.handleFault(device);
                 platDeviceService.handleFault(device);
+            }
             // 更新设备状态
             // 更新设备状态
             platDeviceService.updateDeviceStatus(device.getMessageType(), device.getDeviceId(), "");
             platDeviceService.updateDeviceStatus(device.getMessageType(), device.getDeviceId(), "");
         }, taskExecutor);
         }, taskExecutor);