diff options
| author | Anton Tananaev <anton@traccar.org> | 2022-10-13 10:31:54 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2022-10-13 10:31:54 -0700 |
| commit | 4c8e98ed409df6e12128591eb1d8d0cf0856deb7 (patch) | |
| tree | 83da3517bb14977ab4809aecf3681b777785e83d /src/main/java/org/traccar/api/resource/DeviceResource.java | |
| parent | acedd28b8584a18022d9e2343558f9acbad1666f (diff) | |
| download | trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.tar.gz trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.tar.bz2 trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.zip | |
Refactor database code (fix #4961)
Diffstat (limited to 'src/main/java/org/traccar/api/resource/DeviceResource.java')
| -rw-r--r-- | src/main/java/org/traccar/api/resource/DeviceResource.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/api/resource/DeviceResource.java b/src/main/java/org/traccar/api/resource/DeviceResource.java index 1d9bc20ec..c0b0cea0d 100644 --- a/src/main/java/org/traccar/api/resource/DeviceResource.java +++ b/src/main/java/org/traccar/api/resource/DeviceResource.java @@ -84,14 +84,14 @@ public class DeviceResource extends BaseObjectResource<Device> { result.addAll(storage.getObjects(Device.class, new Request( new Columns.All(), new Condition.And( - new Condition.Equals("uniqueId", "uniqueId", uniqueId), + new Condition.Equals("uniqueId", uniqueId), new Condition.Permission(User.class, getUserId(), Device.class))))); } for (Long deviceId : deviceIds) { result.addAll(storage.getObjects(Device.class, new Request( new Columns.All(), new Condition.And( - new Condition.Equals("id", "id", deviceId), + new Condition.Equals("id", deviceId), new Condition.Permission(User.class, getUserId(), Device.class))))); } return result; @@ -142,7 +142,7 @@ public class DeviceResource extends BaseObjectResource<Device> { device.setPositionId(position.getId()); storage.updateObject(device, new Request( new Columns.Include("positionId"), - new Condition.Equals("id", "id"))); + new Condition.Equals("id", device.getId()))); try { cacheManager.addDevice(position.getDeviceId()); @@ -169,7 +169,7 @@ public class DeviceResource extends BaseObjectResource<Device> { Device device = storage.getObject(Device.class, new Request( new Columns.All(), new Condition.And( - new Condition.Equals("id", "id", deviceId), + new Condition.Equals("id", deviceId), new Condition.Permission(User.class, getUserId(), Device.class)))); if (device != null) { String name = "device"; |