aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/events')
-rw-r--r--src/org/traccar/events/CommandResultEventHandler.java24
-rw-r--r--src/org/traccar/events/GeofenceEventHandler.java92
-rw-r--r--src/org/traccar/events/MotionEventHandler.java55
-rw-r--r--src/org/traccar/events/OverspeedEventHandler.java36
4 files changed, 184 insertions, 23 deletions
diff --git a/src/org/traccar/events/CommandResultEventHandler.java b/src/org/traccar/events/CommandResultEventHandler.java
index 23c62566a..3f4ff521b 100644
--- a/src/org/traccar/events/CommandResultEventHandler.java
+++ b/src/org/traccar/events/CommandResultEventHandler.java
@@ -1,5 +1,23 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.traccar.events;
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.traccar.BaseEventHandler;
import org.traccar.model.Event;
import org.traccar.model.Position;
@@ -7,10 +25,12 @@ import org.traccar.model.Position;
public class CommandResultEventHandler extends BaseEventHandler {
@Override
- protected Event analizePosition(Position position) {
+ protected Collection<Event> analyzePosition(Position position) {
Object commandResult = position.getAttributes().get(Position.KEY_RESULT);
if (commandResult != null) {
- return new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId());
+ Collection<Event> events = new ArrayList<>();
+ events.add(new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId()));
+ return events;
}
return null;
}
diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java
new file mode 100644
index 000000000..e9a4a640f
--- /dev/null
+++ b/src/org/traccar/events/GeofenceEventHandler.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.events;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.traccar.BaseEventHandler;
+import org.traccar.Context;
+import org.traccar.database.DataManager;
+import org.traccar.database.GeofenceManager;
+import org.traccar.helper.Log;
+import org.traccar.model.Device;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class GeofenceEventHandler extends BaseEventHandler {
+
+ private int suppressRepeated;
+ private GeofenceManager geofenceManager;
+ private DataManager dataManager;
+
+ public GeofenceEventHandler() {
+ suppressRepeated = Context.getConfig().getInteger("event.suppressRepeated", 60);
+ geofenceManager = Context.getGeofenceManager();
+ dataManager = Context.getDataManager();
+ }
+
+ @Override
+ protected Collection<Event> analyzePosition(Position position) {
+ Device device = dataManager.getDeviceById(position.getDeviceId());
+ if (device == null) {
+ return null;
+ }
+ if (position.getId() != device.getPositionId() || !position.getValid()) {
+ return null;
+ }
+
+ List<Long> currentGeofences = geofenceManager.getCurrentDeviceGeofences(position);
+ List<Long> oldGeofences = new ArrayList<Long>();
+ if (device.getGeofenceIds() != null) {
+ oldGeofences.addAll(device.getGeofenceIds());
+ }
+ List<Long> newGeofences = new ArrayList<Long>(currentGeofences);
+ newGeofences.removeAll(oldGeofences);
+ oldGeofences.removeAll(currentGeofences);
+
+ device.setGeofenceIds(currentGeofences);
+
+ Collection<Event> events = new ArrayList<>();
+ try {
+ if (dataManager.getLastEvents(position.getDeviceId(),
+ Event.TYPE_GEOFENCE_ENTER, suppressRepeated).isEmpty()) {
+ for (Long geofenceId : newGeofences) {
+ Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId());
+ event.setGeofenceId(geofenceId);
+ events.add(event);
+ }
+ }
+ } catch (SQLException error) {
+ Log.warning(error);
+ }
+ try {
+ if (dataManager.getLastEvents(position.getDeviceId(),
+ Event.TYPE_GEOFENCE_EXIT, suppressRepeated).isEmpty()) {
+ for (Long geofenceId : oldGeofences) {
+ Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId());
+ event.setGeofenceId(geofenceId);
+ events.add(event);
+ }
+ }
+ } catch (SQLException error) {
+ Log.warning(error);
+ }
+ return events;
+ }
+}
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index a3b81ddc4..d10513d26 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -1,6 +1,23 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.traccar.events;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
import org.traccar.BaseEventHandler;
import org.traccar.Context;
@@ -19,37 +36,45 @@ public class MotionEventHandler extends BaseEventHandler {
}
@Override
- protected Event analizePosition(Position position) {
- Event event = null;
+ protected Collection<Event> analyzePosition(Position position) {
- if (!isLastPosition()) {
- return event;
+ Device device = Context.getDataManager().getDeviceById(position.getDeviceId());
+ if (device == null) {
+ return null;
+ }
+ if (position.getId() != device.getPositionId() || !position.getValid()) {
+ return null;
}
+ Collection<Event> result = null;
double speed = position.getSpeed();
boolean valid = position.getValid();
- Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
- if (device == null) {
- return event;
- }
String motion = device.getMotion();
+ if (motion == null) {
+ motion = Device.STATUS_STOPPED;
+ }
if (valid && speed > SPEED_THRESHOLD && !motion.equals(Device.STATUS_MOVING)) {
Context.getConnectionManager().updateDevice(position.getDeviceId(), Device.STATUS_MOVING, null);
- event = new Event(Event.TYPE_DEVICE_MOVING, position.getDeviceId(), position.getId());
+ result = new ArrayList<>();
+ result.add(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.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId());
+ result = new ArrayList<>();
+ result.add(new Event(Event.TYPE_DEVICE_STOPPED, position.getDeviceId(), position.getId()));
}
try {
- if (event != null && !Context.getDataManager().getLastEvents(
- position.getDeviceId(), event.getType(), suppressRepeated).isEmpty()) {
- event = null;
+ if (result != null && !result.isEmpty()) {
+ for (Event event : result) {
+ if (!Context.getDataManager().getLastEvents(position.getDeviceId(),
+ event.getType(), suppressRepeated).isEmpty()) {
+ event = null;
+ }
+ }
}
-
} catch (SQLException error) {
Log.warning(error);
}
- return event;
+ return result;
}
}
diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
index 30410ff32..e14d4bcea 100644
--- a/src/org/traccar/events/OverspeedEventHandler.java
+++ b/src/org/traccar/events/OverspeedEventHandler.java
@@ -1,9 +1,27 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.traccar.events;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
import org.traccar.BaseEventHandler;
import org.traccar.Context;
+import org.traccar.model.Device;
import org.traccar.model.Event;
import org.traccar.model.Position;
import org.traccar.helper.Log;
@@ -20,11 +38,17 @@ public class OverspeedEventHandler extends BaseEventHandler {
}
@Override
- protected Event analizePosition(Position position) {
- Event event = null;
- if (!isLastPosition()) {
- return event;
+ protected Collection<Event> analyzePosition(Position position) {
+
+ Device device = Context.getDataManager().getDeviceById(position.getDeviceId());
+ if (device == null) {
+ return null;
+ }
+ if (position.getId() != device.getPositionId() || !position.getValid()) {
+ return null;
}
+
+ Collection<Event> events = new ArrayList<>();
double speed = position.getSpeed();
boolean valid = position.getValid();
@@ -32,14 +56,14 @@ public class OverspeedEventHandler extends BaseEventHandler {
try {
if (Context.getDataManager().getLastEvents(
position.getDeviceId(), Event.TYPE_DEVICE_OVERSPEED, suppressRepeated).isEmpty()) {
- event = new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId());
+ events.add(new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId()));
}
} catch (SQLException error) {
Log.warning(error);
}
}
- return event;
+ return events;
}
}