From 80119f59a0d4b89396f5d7d57ba2d80257a8da79 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 30 May 2016 12:07:43 +0500 Subject: - Style fixes (use lower camel case in all cases) - Added TYPE_prefix for event.type strings - Removed commented code - Removed "database.selectLastEvents" because it is not cross-database. Do the same via code. --- src/org/traccar/database/DataManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/org/traccar/database/DataManager.java') diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index fcb8899bc..dffb8937c 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -43,6 +43,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.sql.SQLException; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -510,12 +511,11 @@ public class DataManager implements IdentityManager { .executeQuery(Event.class); } - public Collection getLastEvents(long deviceId, String type, long interval) throws SQLException { - return QueryBuilder.create(dataSource, getQuery("database.selectLastEvents")) - .setLong("deviceId", deviceId) - .setString("type", type) - .setLong("interval", interval) - .executeQuery(Event.class); + public Collection getLastEvents(long deviceId, String type, int interval) throws SQLException { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.SECOND, -interval); + Date to = calendar.getTime(); + return getEvents(deviceId, type, new Date(), to); } } -- cgit v1.2.3