aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/reports')
-rw-r--r--src/org/traccar/reports/Events.java52
-rw-r--r--src/org/traccar/reports/Route.java6
-rw-r--r--src/org/traccar/reports/Summary.java6
-rw-r--r--src/org/traccar/reports/Trips.java6
4 files changed, 36 insertions, 34 deletions
diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index 9f58e1bf4..37bf7b227 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -23,12 +23,10 @@ import java.io.OutputStream;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
import javax.json.Json;
import javax.json.JsonArrayBuilder;
@@ -58,9 +56,14 @@ public final class Events {
JsonArrayBuilder json = Json.createArrayBuilder();
for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
Context.getPermissionsManager().checkDevice(userId, deviceId);
- for (String type : types) {
- for (Event event : Context.getDataManager().getEvents(deviceId, type, from, to)) {
- json.add(JsonConverter.objectToJson(event));
+ Collection<Event> events = Context.getDataManager().getEvents(deviceId, from, to);
+ boolean all = types.isEmpty() || types.contains(Event.ALL_EVENTS);
+ for (Event event : events) {
+ if (all || types.contains(event.getType())) {
+ long geofenceId = event.getGeofenceId();
+ if (geofenceId == 0 || Context.getGeofenceManager().checkGeofence(userId, geofenceId)) {
+ json.add(JsonConverter.objectToJson(event));
+ }
}
}
}
@@ -75,28 +78,27 @@ public final class Events {
HashMap<Long, String> geofenceNames = new HashMap<>();
for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
Context.getPermissionsManager().checkDevice(userId, deviceId);
- SortedSet<Event> eventReports = new TreeSet<Event>(new Comparator<Event>() {
- @Override
- public int compare(Event e1, Event e2) {
- return e1.getServerTime().compareTo(e2.getServerTime());
- }
- });
- for (String type : types) {
- Collection<Event> events = Context.getDataManager().getEvents(deviceId, type, from, to);
- for (Event event : events) {
+ Collection<Event> events = Context.getDataManager().getEvents(deviceId, from, to);
+ boolean all = types.isEmpty() || types.contains(Event.ALL_EVENTS);
+ for (Iterator<Event> iterator = events.iterator(); iterator.hasNext();) {
+ Event event = iterator.next();
+ if (all || types.contains(event.getType())) {
long geofenceId = event.getGeofenceId();
if (geofenceId != 0) {
- Geofence geofence = Context.getGeofenceManager().getGeofence(geofenceId);
- if (geofence != null) {
- geofenceNames.put(geofenceId, geofence.getName());
+ if (Context.getGeofenceManager().checkGeofence(userId, geofenceId)) {
+ Geofence geofence = Context.getGeofenceManager().getGeofence(geofenceId);
+ if (geofence != null) {
+ geofenceNames.put(geofenceId, geofence.getName());
+ }
} else {
- geofenceNames.put(geofenceId, Long.toString(geofenceId));
+ iterator.remove();
}
}
- eventReports.add(event);
+ } else {
+ iterator.remove();
}
}
- if (!eventReports.isEmpty()) {
+ if (!events.isEmpty()) {
DeviceReport deviceEvents = new DeviceReport();
Device device = Context.getIdentityManager().getDeviceById(deviceId);
deviceEvents.setDeviceName(device.getName());
@@ -107,13 +109,13 @@ public final class Events {
deviceEvents.setGroupName(group.getName());
}
}
- deviceEvents.setObjects(eventReports);
+ deviceEvents.setObjects(events);
devicesEvents.add(deviceEvents);
}
}
- String templatePath = Context.getConfig().getString("report.events.template.excel",
- "templates/export/events.xlsx");
- try (InputStream inputStream = new FileInputStream(templatePath)) {
+ String templatePath = Context.getConfig().getString("report.templatesPath",
+ "templates/export/");
+ try (InputStream inputStream = new FileInputStream(templatePath + "/events.xlsx")) {
org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext();
jxlsContext.putVar("devices", devicesEvents);
jxlsContext.putVar("sheetNames", sheetNames);
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java
index 1bb7b564a..7cefe04a3 100644
--- a/src/org/traccar/reports/Route.java
+++ b/src/org/traccar/reports/Route.java
@@ -83,9 +83,9 @@ public final class Route {
devicesRoutes.add(deviceRoutes);
}
}
- String templatePath = Context.getConfig().getString("report.route.template.excel",
- "templates/export/route.xlsx");
- try (InputStream inputStream = new FileInputStream(templatePath)) {
+ String templatePath = Context.getConfig().getString("report.templatesPath",
+ "templates/export/");
+ try (InputStream inputStream = new FileInputStream(templatePath + "/route.xlsx")) {
org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext();
jxlsContext.putVar("devices", devicesRoutes);
jxlsContext.putVar("sheetNames", sheetNames);
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index e7f41bcd6..14f8b7839 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -92,9 +92,9 @@ public final class Summary {
Context.getPermissionsManager().checkDevice(userId, deviceId);
summaries.add(calculateSummaryResult(deviceId, from, to));
}
- String templatePath = Context.getConfig().getString("report.summary.template.excel",
- "templates/export/summary.xlsx");
- try (InputStream inputStream = new FileInputStream(templatePath)) {
+ String templatePath = Context.getConfig().getString("report.templatesPath",
+ "templates/export/");
+ try (InputStream inputStream = new FileInputStream(templatePath + "/summary.xlsx")) {
org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext();
jxlsContext.putVar("summaries", summaries);
jxlsContext.putVar("from", from);
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index c912dc651..27863d877 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -202,9 +202,9 @@ public final class Trips {
devicesTrips.add(deviceTrips);
}
}
- String templatePath = Context.getConfig().getString("report.trips.template.excel",
- "templates/export/trips.xlsx");
- try (InputStream inputStream = new FileInputStream(templatePath)) {
+ String templatePath = Context.getConfig().getString("report.templatesPath",
+ "templates/export/");
+ try (InputStream inputStream = new FileInputStream(templatePath + "/trips.xlsx")) {
org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext();
jxlsContext.putVar("devices", devicesTrips);
jxlsContext.putVar("sheetNames", sheetNames);