|
@@ -62,7 +62,12 @@ public class DeviceController extends BaseController { |
|
@@ -62,7 +62,12 @@ public class DeviceController extends BaseController { |
|
62
|
try {
|
62
|
try {
|
|
63
|
device.setTenantId(getCurrentUser().getTenantId());
|
63
|
device.setTenantId(getCurrentUser().getTenantId());
|
|
64
|
Device savedDevice = checkNotNull(deviceService.saveDevice(device));
|
64
|
Device savedDevice = checkNotNull(deviceService.saveDevice(device));
|
|
65
|
- actorService.onDeviceNameOrTypeUpdate(device.getTenantId(), device.getId(), device.getName(), device.getType());
|
65
|
+ actorService
|
|
|
|
66
|
+ .onDeviceNameOrTypeUpdate(
|
|
|
|
67
|
+ savedDevice.getTenantId(),
|
|
|
|
68
|
+ savedDevice.getId(),
|
|
|
|
69
|
+ savedDevice.getName(),
|
|
|
|
70
|
+ savedDevice.getType());
|
|
66
|
return savedDevice;
|
71
|
return savedDevice;
|
|
67
|
} catch (Exception e) {
|
72
|
} catch (Exception e) {
|
|
68
|
throw handleException(e);
|
73
|
throw handleException(e);
|
|
@@ -176,7 +181,7 @@ public class DeviceController extends BaseController { |
|
@@ -176,7 +181,7 @@ public class DeviceController extends BaseController { |
|
176
|
try {
|
181
|
try {
|
|
177
|
TenantId tenantId = getCurrentUser().getTenantId();
|
182
|
TenantId tenantId = getCurrentUser().getTenantId();
|
|
178
|
TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
|
183
|
TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
|
|
179
|
- if (type != null && type.trim().length()>0) {
|
184
|
+ if (type != null && type.trim().length() > 0) {
|
|
180
|
return checkNotNull(deviceService.findDevicesByTenantIdAndType(tenantId, type, pageLink));
|
185
|
return checkNotNull(deviceService.findDevicesByTenantIdAndType(tenantId, type, pageLink));
|
|
181
|
} else {
|
186
|
} else {
|
|
182
|
return checkNotNull(deviceService.findDevicesByTenantId(tenantId, pageLink));
|
187
|
return checkNotNull(deviceService.findDevicesByTenantId(tenantId, pageLink));
|
|
@@ -215,7 +220,7 @@ public class DeviceController extends BaseController { |
|
@@ -215,7 +220,7 @@ public class DeviceController extends BaseController { |
|
215
|
CustomerId customerId = new CustomerId(toUUID(strCustomerId));
|
220
|
CustomerId customerId = new CustomerId(toUUID(strCustomerId));
|
|
216
|
checkCustomerId(customerId);
|
221
|
checkCustomerId(customerId);
|
|
217
|
TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
|
222
|
TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
|
|
218
|
- if (type != null && type.trim().length()>0) {
|
223
|
+ if (type != null && type.trim().length() > 0) {
|
|
219
|
return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerIdAndType(tenantId, customerId, type, pageLink));
|
224
|
return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerIdAndType(tenantId, customerId, type, pageLink));
|
|
220
|
} else {
|
225
|
} else {
|
|
221
|
return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink));
|
226
|
return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink));
|
