From c6cc8a87eb593dbf765814d1aaa09d5d231fa7fe Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 26 May 2016 16:14:52 +0500 Subject: Events subsystem --- src/org/traccar/database/DataManager.java | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (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 ac3be45ac..4e14f6c97 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -27,6 +27,7 @@ import org.traccar.Config; import org.traccar.Context; import org.traccar.helper.Log; import org.traccar.model.Device; +import org.traccar.model.Event; import org.traccar.model.DevicePermission; import org.traccar.model.Group; import org.traccar.model.GroupPermission; @@ -482,4 +483,34 @@ public class DataManager implements IdentityManager { .setObject(server) .executeUpdate(); } + + public Event getEvent(long eventId) throws SQLException { + return QueryBuilder.create(dataSource, getQuery("database.selectEvent")) + .setLong("id", eventId) + .executeQuerySingle(Event.class); + } + + public void addEvent(Event event) throws SQLException { + event.setId(QueryBuilder.create(dataSource, getQuery("database.insertEvent"), true) + .setObject(event) + .executeUpdate()); + } + + public Collection getEvents(long deviceId, String type, Date from, Date to) throws SQLException { + return QueryBuilder.create(dataSource, getQuery("database.selectEvents")) + .setLong("deviceId", deviceId) + .setString("type", type) + .setDate("from", from) + .setDate("to", to) + .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); + } + } -- cgit v1.2.3 From 6e00239038002aa383cce39be7f53b85f3d03a94 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 27 May 2016 17:14:47 +0500 Subject: - Synchronization device cache on updateLatestPosition and updateDeviceStatus - Better latest position identification in BaseEventHandler --- src/org/traccar/BaseEventHandler.java | 10 +++++++--- src/org/traccar/database/DataManager.java | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/database/DataManager.java') diff --git a/src/org/traccar/BaseEventHandler.java b/src/org/traccar/BaseEventHandler.java index 3c2016af0..fde57748c 100644 --- a/src/org/traccar/BaseEventHandler.java +++ b/src/org/traccar/BaseEventHandler.java @@ -1,5 +1,6 @@ package org.traccar; +import org.traccar.model.Device; import org.traccar.model.Event; import org.traccar.model.Position; @@ -14,9 +15,12 @@ public abstract class BaseEventHandler extends BaseDataHandler { @Override protected Position handlePosition(Position position) { - Position lastPosition = Context.getConnectionManager().getLastPosition(position.getDeviceId()); - if (lastPosition == null || position.getFixTime().compareTo(lastPosition.getFixTime()) >= 0) { - isLastPosition = true; + Device device = Context.getDataManager().getDeviceById(position.getDeviceId()); + if (device != null) { + long lastPositionId = device.getPositionId(); + if (position.getId() == lastPositionId) { + isLastPosition = true; + } } Event event = analizePosition(position); diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 4e14f6c97..fcb8899bc 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -358,6 +358,9 @@ public class DataManager implements IdentityManager { QueryBuilder.create(dataSource, getQuery("database.updateDeviceStatus")) .setObject(device) .executeUpdate(); + Device cachedDevice = getDeviceById(device.getId()); + cachedDevice.setStatus(device.getStatus()); + cachedDevice.setMotion(device.getMotion()); } public void removeDevice(long deviceId) throws SQLException { @@ -466,6 +469,8 @@ public class DataManager implements IdentityManager { .setDate("now", new Date()) .setObject(position) .executeUpdate(); + Device device = getDeviceById(position.getDeviceId()); + device.setPositionId(position.getId()); } public Collection getLatestPositions() throws SQLException { -- cgit v1.2.3 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. --- setup/unix/traccar.xml | 12 ++---- setup/windows/traccar.xml | 12 ++---- src/org/traccar/BasePipelineFactory.java | 4 +- src/org/traccar/api/resource/EventResource.java | 2 +- src/org/traccar/database/ConnectionManager.java | 4 +- src/org/traccar/database/DataManager.java | 12 +++--- .../traccar/events/CommandResultEventHandler.java | 6 +-- src/org/traccar/events/MotionEventHandler.java | 8 ++-- src/org/traccar/events/OverspeedEventHandler.java | 46 +++------------------- src/org/traccar/model/Event.java | 16 ++++---- 10 files changed, 40 insertions(+), 82 deletions(-) (limited to 'src/org/traccar/database/DataManager.java') diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml index a27c9790b..22b71e204 100644 --- a/setup/unix/traccar.xml +++ b/setup/unix/traccar.xml @@ -17,12 +17,12 @@ all /opt/traccar/logs/tracker-server.log - 60 + 60 - true - 90 + true + 90 - true + true @@ -185,10 +185,6 @@ SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC; - - SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime >= NOW() - INTERVAL :interval SECOND ORDER BY eventTime DESC; - - 5001 diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml index d60640375..649c3bb15 100644 --- a/setup/windows/traccar.xml +++ b/setup/windows/traccar.xml @@ -17,12 +17,12 @@ all [LOG] - 60 + 60 - true - 90 + true + 90 - true + true @@ -185,10 +185,6 @@ SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC; - - SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime >= NOW() - INTERVAL :interval SECOND ORDER BY eventTime DESC; - - 5001 diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index 55820deb7..634c6d6a4 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -132,11 +132,11 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { commandResultEventHandler = new CommandResultEventHandler(); - if (Context.getConfig().getBoolean("event.overspeedhandler")) { + if (Context.getConfig().getBoolean("event.overspeedHandler")) { overspeedEventHandler = new OverspeedEventHandler(); } - if (Context.getConfig().getBoolean("event.motionhandler")) { + if (Context.getConfig().getBoolean("event.motionHandler")) { motionEventHandler = new MotionEventHandler(); } diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java index e0ad34728..4ea3e3b49 100644 --- a/src/org/traccar/api/resource/EventResource.java +++ b/src/org/traccar/api/resource/EventResource.java @@ -32,7 +32,7 @@ public class EventResource extends BaseResource { @GET public Collection get( @QueryParam("deviceId") long deviceId, @QueryParam("type") String type, - @QueryParam("interval") long interval) throws SQLException { + @QueryParam("interval") int interval) throws SQLException { Context.getPermissionsManager().checkDevice(getUserId(), deviceId); return Context.getDataManager().getLastEvents(deviceId, type, interval); } diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java index d6728357c..9e0da8485 100644 --- a/src/org/traccar/database/ConnectionManager.java +++ b/src/org/traccar/database/ConnectionManager.java @@ -90,9 +90,9 @@ public class ConnectionManager { device.setMotion(status); } else { if (!status.equals(device.getStatus())) { - Event event = new Event(Event.DEVICE_OFFLINE, deviceId); + Event event = new Event(Event.TYPE_DEVICE_OFFLINE, deviceId); if (status.equals(Device.STATUS_ONLINE)) { - event.setType(Event.DEVICE_ONLINE); + event.setType(Event.TYPE_DEVICE_ONLINE); } updateEvent(event); } 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); } } diff --git a/src/org/traccar/events/CommandResultEventHandler.java b/src/org/traccar/events/CommandResultEventHandler.java index 8ef015841..23c62566a 100644 --- a/src/org/traccar/events/CommandResultEventHandler.java +++ b/src/org/traccar/events/CommandResultEventHandler.java @@ -8,9 +8,9 @@ public class CommandResultEventHandler extends BaseEventHandler { @Override protected Event analizePosition(Position position) { - Object cmdResult = position.getAttributes().get(Position.KEY_RESULT); - if (cmdResult != null) { - return new Event(Event.COMMAND_RESULT, position.getDeviceId(), position.getId()); + Object commandResult = position.getAttributes().get(Position.KEY_RESULT); + if (commandResult != null) { + return new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId()); } return null; } diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java index d4dd12a39..a3b81ddc4 100644 --- a/src/org/traccar/events/MotionEventHandler.java +++ b/src/org/traccar/events/MotionEventHandler.java @@ -12,10 +12,10 @@ import org.traccar.model.Position; public class MotionEventHandler extends BaseEventHandler { private static final double SPEED_THRESHOLD = 0.01; - private long suppressRepeated; + private int suppressRepeated; public MotionEventHandler() { - suppressRepeated = Context.getConfig().getLong("event.suppressrepeated", 60); + suppressRepeated = Context.getConfig().getInteger("event.suppressRepeated", 60); } @Override @@ -35,10 +35,10 @@ public class MotionEventHandler extends BaseEventHandler { String motion = device.getMotion(); if (valid && speed > SPEED_THRESHOLD && !motion.equals(Device.STATUS_MOVING)) { Context.getConnectionManager().updateDevice(position.getDeviceId(), Device.STATUS_MOVING, null); - event = new Event(Event.DEVICE_MOVING, position.getDeviceId(), position.getId()); + event = new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId()); } else if (valid && speed < SPEED_THRESHOLD && motion.equals(Device.STATUS_MOVING)) { Context.getConnectionManager().updateDevice(position.getDeviceId(), Device.STATUS_STOPPED, null); - event = new Event(Event.DEVICE_STOPPED, position.getDeviceId(), position.getId()); + event = new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId()); } try { if (event != null && !Context.getDataManager().getLastEvents( diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java index 706e9b905..30410ff32 100644 --- a/src/org/traccar/events/OverspeedEventHandler.java +++ b/src/org/traccar/events/OverspeedEventHandler.java @@ -6,35 +6,17 @@ import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Event; import org.traccar.model.Position; -import org.traccar.model.Server; import org.traccar.helper.Log; -//import org.traccar.model.Device; -//import org.traccar.model.Group; import org.traccar.helper.UnitsConverter; public class OverspeedEventHandler extends BaseEventHandler { private double globalSpeedLimit; - private long suppressRepeated; + private int suppressRepeated; public OverspeedEventHandler() { - globalSpeedLimit = Context.getConfig().getInteger("event.globalspeedlimit", 0); - suppressRepeated = Context.getConfig().getLong("event.suppressrepeated", 60); - try { - Server server = Context.getDataManager().getServer(); - String speedUnit = server.getSpeedUnit(); - if (speedUnit != null) { - switch (speedUnit) { - case "kmh" : globalSpeedLimit = UnitsConverter.knotsFromKph(globalSpeedLimit); - break; - case "mph" : globalSpeedLimit = UnitsConverter.knotsFromMph(globalSpeedLimit); - default : break; - } - } - } catch (SQLException error) { - Log.warning(error); - } - + globalSpeedLimit = UnitsConverter.knotsFromKph(Context.getConfig().getInteger("event.globalSpeedLimit", 0)); + suppressRepeated = Context.getConfig().getInteger("event.suppressRepeated", 60); } @Override @@ -45,28 +27,12 @@ public class OverspeedEventHandler extends BaseEventHandler { } double speed = position.getSpeed(); boolean valid = position.getValid(); - double deviceSpeedLimit = 0; - double groupSpeedLimit = 0; -// Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId()); -// if (device != null) { -// deviceSpeedLimit = device.getSpeedLimit(); -// try { -// Group group = Context.getDataManager().getGroupById(device.getGroupId()); -// if (group != null) { -// groupSpeedLimit = group.getSpeedLimit(); -// } -// } catch (SQLException error) { -// Log.warning(error); -// } -// } - if (valid && globalSpeedLimit != 0 && speed > globalSpeedLimit - || valid && groupSpeedLimit != 0 && speed > groupSpeedLimit - || valid && deviceSpeedLimit != 0 && speed > deviceSpeedLimit) { + if (valid && globalSpeedLimit != 0 && speed > globalSpeedLimit) { try { if (Context.getDataManager().getLastEvents( - position.getDeviceId(), Event.DEVICE_OVERSPEED, suppressRepeated).isEmpty()) { - event = new Event(Event.DEVICE_OVERSPEED, position.getDeviceId(), position.getId()); + position.getDeviceId(), Event.TYPE_DEVICE_OVERSPEED, suppressRepeated).isEmpty()) { + event = new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId()); } } catch (SQLException error) { Log.warning(error); diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java index 27c750c49..75049c433 100644 --- a/src/org/traccar/model/Event.java +++ b/src/org/traccar/model/Event.java @@ -30,18 +30,18 @@ public class Event extends Message { this.id = id; } - public static final String COMMAND_RESULT = "command-result"; + public static final String TYPE_COMMAND_RESULT = "commandResult"; - public static final String DEVICE_ONLINE = "device-online"; - public static final String DEVICE_OFFLINE = "device-offline"; + public static final String TYPE_DEVICE_ONLINE = "deviceOnline"; + public static final String TYPE_DEVICE_OFFLINE = "deviceOffline"; - public static final String DEVICE_MOVING = "device-moving"; - public static final String DEVICE_STOPPED = "device-stopped"; + public static final String TYPE_DEVICE_MOVING = "deviceMoving"; + public static final String TYPE_DEVICE_STOPPED = "deviceStopped"; - public static final String DEVICE_OVERSPEED = "device-overspeed"; + public static final String TYPE_DEVICE_OVERSPEED = "deviceOverspeed"; - public static final String GEOFENCE_ENTER = "geofence-enter"; - public static final String GEOFENCE_EXIT = "geofence-exit"; + public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter"; + public static final String TYPE_GEOFENCE_EXIT = "geofenceExit"; private Date eventTime; -- cgit v1.2.3