fix: 更新设备状态

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java

@@ -449,7 +449,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
 
         List<PlatDevice> deviceListSpace = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         List<PlatDevice> deviceListSpace = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 
 
-        List<PlatDevice> deviceListFall = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
+        ///List<PlatDevice> deviceListFall = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         int count = 20;
         int count = 20;
         for (PlatDevice platDevice : deviceListSpace) {
         for (PlatDevice platDevice : deviceListSpace) {
             for (int i = 0; i < count; i++) {
             for (int i = 0; i < count; i++) {

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

@@ -3,6 +3,7 @@ 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.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
@@ -154,27 +155,20 @@ public class PushCallback implements MqttCallback {
     @Transactional
     @Transactional
     public void updateDeviceStatus(String messageType, String deviceId, String iot_tenantId) {
     public void updateDeviceStatus(String messageType, String deviceId, String iot_tenantId) {
         if(StringUtils.equalsAnyIgnoreCase(messageType, DeviceState.offline.getValue(),DeviceState.online.getValue())){
         if(StringUtils.equalsAnyIgnoreCase(messageType, DeviceState.offline.getValue(),DeviceState.online.getValue())){
-            LambdaQueryWrapper<PlatTenant> platTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            platTenantLambdaQueryWrapper.eq(PlatTenant::getIotOrgId,iot_tenantId);
-            List<PlatTenant> platTenants = platTenantService.list(platTenantLambdaQueryWrapper);
-            if(CollectionUtils.isEmpty(platTenants)){
-                return;
-            }
 
 
-            List<String> tenantIdList = platTenants.stream().map(BaseEntity::getId).collect(Collectors.toList());
+            platDeviceService.update(new UpdateWrapper<PlatDevice>().lambda()
+                            .set(PlatDevice::getStatus,messageType.toLowerCase())
+                    .eq(PlatDevice::getOriDeviceId,deviceId));
 
 
             LambdaQueryWrapper<PlatDevice> deviceLambdaQueryWrapper = new LambdaQueryWrapper<>();
             LambdaQueryWrapper<PlatDevice> deviceLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            deviceLambdaQueryWrapper.eq(PlatDevice::getOriDeviceId,deviceId)
-                    .in(BaseBusEntity::getTenantId,tenantIdList);
+            deviceLambdaQueryWrapper.eq(PlatDevice::getOriDeviceId,deviceId);
             List<PlatDevice> deviceList = platDeviceService.list(deviceLambdaQueryWrapper);
             List<PlatDevice> deviceList = platDeviceService.list(deviceLambdaQueryWrapper);
             if(CollectionUtils.isEmpty(deviceList)){
             if(CollectionUtils.isEmpty(deviceList)){
                 return;
                 return;
             }
             }
-
             for (PlatDevice platDevice : deviceList) {
             for (PlatDevice platDevice : deviceList) {
                 platDevice.setStatus(messageType.toLowerCase());
                 platDevice.setStatus(messageType.toLowerCase());
             }
             }
-            platDeviceService.updateBatchById(deviceList);
             deviceCacheUtil.putAll(deviceList);
             deviceCacheUtil.putAll(deviceList);
         }
         }