Merge remote-tracking branch 'refs/remotes/tananaev/master'

3 files changed, 53 insertions, 27 deletions

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 04d0d44ea..78f1b4109 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -305,28 +305,11 @@ public class DataManager {
     }
 
     public void clearPositionsHistory() throws SQLException {
-        int histDays = config.getInteger("database.positionsHistoryDays");
-        if (histDays == 0) {
-            return;
-        }
-
-        String sql = getQuery("database.clearPositionsHistory");
-        if (sql == null) {
-            return;
-        }
-
-        for (Device device : getAllDevices()) {
-            Date lastUpdate = device.getLastUpdate();
-            if (lastUpdate != null) {
-
-                Date dateBefore = new Date(lastUpdate.getTime() - histDays * 24 * 3600 * 1000);
-
-                QueryBuilder.create(dataSource, sql)
-                        .setLong("positionId", device.getPositionId())
-                        .setLong("deviceId", device.getId())
-                        .setDate("serverTime", dateBefore)
-                        .executeUpdate();
-            }
+        int historyDays = config.getInteger("database.positionsHistoryDays");
+        if (historyDays != 0) {
+            QueryBuilder.create(dataSource, getQuery("database.deletePositions"))
+                    .setDate("serverTime", new Date(System.currentTimeMillis() - historyDays * 24 * 3600 * 1000))
+                    .executeUpdate();
         }
     }
 
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index 4dd7b41cb..3476139f2 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -32,6 +32,7 @@ import org.traccar.helper.Log;
 import org.traccar.model.Device;
 import org.traccar.model.Group;
 import org.traccar.model.Position;
+import org.traccar.model.Server;
 
 public class DeviceManager implements IdentityManager {
 
@@ -40,6 +41,7 @@ public class DeviceManager implements IdentityManager {
     private final Config config;
     private final DataManager dataManager;
     private final long dataRefreshDelay;
+    private boolean lookupGroupsAttribute;
 
     private Map<Long, Device> devicesById;
     private Map<String, Device> devicesByUniqueId;
@@ -54,6 +56,7 @@ public class DeviceManager implements IdentityManager {
         this.dataManager = dataManager;
         this.config = Context.getConfig();
         dataRefreshDelay = config.getLong("database.refreshDelay", DEFAULT_REFRESH_DELAY) * 1000;
+        lookupGroupsAttribute = config.getBoolean("deviceManager.lookupGroupsAttribute");
         if (dataManager != null) {
             try {
                 updateGroupCache(true);
@@ -105,7 +108,6 @@ public class DeviceManager implements IdentityManager {
                         }
                     }
                     device.setStatus(Device.STATUS_OFFLINE);
-                    device.setMotion(Device.STATUS_STOPPED);
                 }
             }
             for (Long cachedDeviceId : devicesById.keySet()) {
@@ -176,7 +178,6 @@ public class DeviceManager implements IdentityManager {
         if (devicesById.containsKey(device.getId())) {
             Device cachedDevice = devicesById.get(device.getId());
             cachedDevice.setStatus(device.getStatus());
-            cachedDevice.setMotion(device.getMotion());
         }
     }
 
@@ -191,10 +192,14 @@ public class DeviceManager implements IdentityManager {
         positions.remove(deviceId);
     }
 
+    public boolean isLatestPosition(Position position) {
+        Position lastPosition = getLastPosition(position.getDeviceId());
+        return lastPosition == null || position.getFixTime().compareTo(lastPosition.getFixTime()) > 0;
+    }
+
     public void updateLatestPosition(Position position) throws SQLException {
 
-        Position lastPosition = getLastPosition(position.getDeviceId());
-        if (lastPosition == null || position.getFixTime().compareTo(lastPosition.getFixTime()) > 0) {
+        if (isLatestPosition(position)) {
 
             dataManager.updateLatestPosition(position);
 
@@ -310,4 +315,33 @@ public class DeviceManager implements IdentityManager {
         dataManager.removeGroup(groupId);
         groupsById.remove(groupId);
     }
+
+    public String lookupAttribute(long deviceId, String attributeName) {
+        String result = null;
+        Device device = getDeviceById(deviceId);
+        if (device != null) {
+            if (device.getAttributes().containsKey(attributeName)) {
+                result = (String) device.getAttributes().get(attributeName);
+            }
+            if (result == null && lookupGroupsAttribute) {
+                long groupId = device.getGroupId();
+                while (groupId != 0) {
+                    if (getGroupById(groupId) != null) {
+                        result = (String)  getGroupById(groupId).getAttributes().get(attributeName);
+                        if (result != null) {
+                            break;
+                        }
+                        groupId = getGroupById(groupId).getGroupId();
+                    } else {
+                        groupId = 0;
+                    }
+                }
+            }
+            if (result == null) {
+                Server server = Context.getPermissionsManager().getServer();
+                result = (String) server.getAttributes().get(attributeName);
+            }
+        }
+        return result;
+    }
 }
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index d786dcc4e..92fcc3ebd 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -34,7 +34,7 @@ public class PermissionsManager {
 
     private final DataManager dataManager;
 
-    private Server server;
+    private volatile Server server;
 
     private final Map<Long, User> users = new HashMap<>();
 
@@ -153,4 +153,13 @@ public class PermissionsManager {
         }
     }
 
+    public Server getServer() {
+        return server;
+    }
+
+    public void updateServer(Server server) throws SQLException {
+        dataManager.updateServer(server);
+        this.server = server;
+    }
+
 }