|
|
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.nb.aliyun.sdk.AliyunIotSdk;
|
|
|
import com.nb.bus.bean.AliIotConfig;
|
|
|
+import com.nb.bus.registry.constant.DeviceKeyConstant;
|
|
|
import com.nb.bus.registry.device.DeviceRegistry;
|
|
|
import com.nb.bus.entity.BusDeviceEntity;
|
|
|
import com.nb.bus.mapper.BusDeviceMapper;
|
|
|
@@ -85,9 +86,7 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
|
|
|
if(entity.getEnable()!=null){
|
|
|
deviceOperator.setEnable(entity.getEnable());
|
|
|
}
|
|
|
- if(CharSequenceUtil.isNotEmpty(entity.getTenantId())){
|
|
|
- deviceOperator.setTenantId(entity.getTenantId());
|
|
|
- }
|
|
|
+ deviceOperator.getCache().remove(DeviceKeyConstant.TENANT_ID);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -332,6 +331,6 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
|
|
|
operators
|
|
|
.stream()
|
|
|
.filter(Objects::nonNull)
|
|
|
- .forEach(deviceOperator -> deviceOperator.setTenantId(afterTenantId));
|
|
|
+ .forEach(deviceOperator -> deviceOperator.getCache().remove(DeviceKeyConstant.TENANT_ID));
|
|
|
}
|
|
|
}
|