dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix

Browse Source
This commit is contained in:
Andrii Shvaika 2021-08-06 18:58:53 +03:00
parent ec2e097229
commit 0e6476926c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View File

@ -126,11 +126,11 @@ public class DeviceController extends BaseController {
checkEntity(device.getId(), device, Resource.DEVICE); checkEntity(device.getId(), device, Resource.DEVICE);
Device oldDevice; Device oldDevice = null;
if (!created) { if (!created) {
oldDevice = deviceService.findDeviceById(getTenantId(), device.getId()); oldDevice = checkDeviceId(device.getId(), Operation.WRITE);
} else { } else {
oldDevice = null; checkEntity(null, device, Resource.DEVICE);
} }
Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(device, accessToken)); Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(device, accessToken));

2
application/src/main/java/org/thingsboard/server/service/rpc/RemoveRpcActorMsg.java
View File

@ -18,10 +18,10 @@ package org.thingsboard.server.service.rpc;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.ToString; import lombok.ToString;
import org.thingsboard.rule.engine.api.msg.ToDeviceActorNotificationMsg;
import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.msg.MsgType; import org.thingsboard.server.common.msg.MsgType;
import org.thingsboard.server.common.msg.ToDeviceActorNotificationMsg;
import java.util.UUID; import java.util.UUID;