aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2018-04-11 14:55:11 +0500
committerAbyss777 <abyss@fox5.ru>2018-04-11 14:55:31 +0500
commitf7a4d1977e71797b231ebb9a55308fee7c2b64d7 (patch)
tree3b879aed22d40ebe405a792f7bdd3446d7b38aaa /src/org/traccar/events
parentbb071de84dd000ec3067991bb523fe5ef24b76e9 (diff)
downloadtraccar-server-f7a4d1977e71797b231ebb9a55308fee7c2b64d7.tar.gz
traccar-server-f7a4d1977e71797b231ebb9a55308fee7c2b64d7.tar.bz2
traccar-server-f7a4d1977e71797b231ebb9a55308fee7c2b64d7.zip
Add support of multiple Maintenances
Diffstat (limited to 'src/org/traccar/events')
-rw-r--r--src/org/traccar/events/MaintenanceEventHandler.java43
1 files changed, 18 insertions, 25 deletions
diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java
index 86abf7c17..001b414c0 100644
--- a/src/org/traccar/events/MaintenanceEventHandler.java
+++ b/src/org/traccar/events/MaintenanceEventHandler.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2018 Andrey Kunitsyn (andrey@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,35 +16,24 @@
*/
package org.traccar.events;
-import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import org.traccar.BaseEventHandler;
import org.traccar.Context;
-import org.traccar.model.Device;
import org.traccar.model.Event;
+import org.traccar.model.Maintenance;
import org.traccar.model.Position;
public class MaintenanceEventHandler extends BaseEventHandler {
- public static final String ATTRIBUTE_MAINTENANCE_START = "maintenance.start";
- public static final String ATTRIBUTE_MAINTENANCE_INTERVAL = "maintenance.interval";
-
@Override
protected Map<Event, Position> analyzePosition(Position position) {
- Device device = Context.getIdentityManager().getById(position.getDeviceId());
- if (device == null || !Context.getIdentityManager().isLatestPosition(position)) {
+ if (Context.getIdentityManager().getById(position.getDeviceId()) == null
+ || !Context.getIdentityManager().isLatestPosition(position)) {
return null;
}
- double maintenanceInterval = Context.getDeviceManager()
- .lookupAttributeDouble(device.getId(), ATTRIBUTE_MAINTENANCE_INTERVAL, 0, false);
- if (maintenanceInterval == 0) {
- return null;
- }
- double maintenanceStart = Context.getDeviceManager()
- .lookupAttributeDouble(device.getId(), ATTRIBUTE_MAINTENANCE_START, 0, false);
-
double oldTotalDistance = 0.0;
double newTotalDistance = 0.0;
@@ -54,16 +43,20 @@ public class MaintenanceEventHandler extends BaseEventHandler {
}
newTotalDistance = position.getDouble(Position.KEY_TOTAL_DISTANCE);
- oldTotalDistance -= maintenanceStart;
- newTotalDistance -= maintenanceStart;
-
- if ((long) (oldTotalDistance / maintenanceInterval) < (long) (newTotalDistance / maintenanceInterval)) {
- Event event = new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId());
- event.set(Position.KEY_TOTAL_DISTANCE, newTotalDistance);
- return Collections.singletonMap(event, position);
+ Map<Event, Position> events = new HashMap<>();
+ for (long maintenanceId : Context.getMaintenancesManager().getAllDeviceItems(position.getDeviceId())) {
+ Maintenance maintenance = Context.getMaintenancesManager().getById(maintenanceId);
+ if (maintenance.getLapse() != 0
+ && (long) ((oldTotalDistance - maintenance.getStart()) / maintenance.getLapse())
+ < (long) ((newTotalDistance - maintenance.getStart()) / maintenance.getLapse())) {
+ Event event = new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId());
+ event.setMaintenanceId(maintenanceId);
+ event.set(Position.KEY_TOTAL_DISTANCE, newTotalDistance);
+ events.put(event, position);
+ }
}
- return null;
+ return events;
}
}