Merge branch 'master' into suntech-fixes

1 files changed, 10 insertions, 0 deletions

diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index de6da8f23..ebd0dcade 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -41,6 +41,7 @@ import org.traccar.model.Group;
 import org.traccar.model.Maintenance;
 import org.traccar.model.ManagedUser;
 import org.traccar.model.Notification;
+import org.traccar.model.Order;
 import org.traccar.model.Permission;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
@@ -332,6 +333,13 @@ public class DataManager {
                 .executeQuery(Position.class);
     }
 
+    public Position getPrecedingPosition(long deviceId, Date date) throws SQLException {
+        return QueryBuilder.create(dataSource, getQuery("database.selectPrecedingPosition"))
+                .setLong("deviceId", deviceId)
+                .setDate("time", date)
+                .executeQuerySingle(Position.class);
+    }
+
     public void updateLatestPosition(Position position) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.updateLatestPosition"))
                 .setDate("now", new Date())
@@ -388,6 +396,8 @@ public class DataManager {
                 return Maintenance.class;
             case "notification":
                 return Notification.class;
+            case "order":
+                return Order.class;
             default:
                 throw new ClassNotFoundException();
         }