aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-08-23 18:05:35 +1200
committerGitHub <noreply@github.com>2018-08-23 18:05:35 +1200
commitcd774cc87bc88f91b8e1c881b745b9d2439db617 (patch)
treeb9b7780bcbccf9c79f1ac610779f8175b69451f0 /src
parent2a386eab0a4baed5c606113dd9a875a088f9f4e5 (diff)
parente7d5dae5af7214f7f8dac39e8d081ad6c4533d20 (diff)
downloadtraccar-server-cd774cc87bc88f91b8e1c881b745b9d2439db617.tar.gz
traccar-server-cd774cc87bc88f91b8e1c881b745b9d2439db617.tar.bz2
traccar-server-cd774cc87bc88f91b8e1c881b745b9d2439db617.zip
Merge pull request #4019 from Abyss777/device_accumulators
Implement Device Engine Hours reset
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/api/resource/DeviceResource.java12
-rw-r--r--src/org/traccar/database/DeviceManager.java15
-rw-r--r--src/org/traccar/helper/LogAction.java8
-rw-r--r--src/org/traccar/model/DeviceAccumulators.java (renamed from src/org/traccar/model/DeviceTotalDistance.java)22
4 files changed, 36 insertions, 21 deletions
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index 87927e45b..f9c9a139d 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import org.traccar.api.BaseObjectResource;
import org.traccar.database.DeviceManager;
import org.traccar.helper.LogAction;
import org.traccar.model.Device;
-import org.traccar.model.DeviceTotalDistance;
+import org.traccar.model.DeviceAccumulators;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
@@ -85,15 +85,15 @@ public class DeviceResource extends BaseObjectResource<Device> {
return deviceManager.getItems(result);
}
- @Path("{id}/distance")
+ @Path("{id}/accumulators")
@PUT
- public Response updateTotalDistance(DeviceTotalDistance entity) throws SQLException {
+ public Response updateAccumulators(DeviceAccumulators entity) throws SQLException {
if (!Context.getPermissionsManager().getUserAdmin(getUserId())) {
Context.getPermissionsManager().checkManager(getUserId());
Context.getPermissionsManager().checkPermission(Device.class, getUserId(), entity.getDeviceId());
}
- Context.getDeviceManager().resetTotalDistance(entity);
- LogAction.resetTotalDistance(getUserId(), entity.getDeviceId());
+ Context.getDeviceManager().resetDeviceAccumulators(entity);
+ LogAction.resetDeviceAccumulators(getUserId(), entity.getDeviceId());
return Response.noContent().build();
}
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index c59061b7f..bc8894743 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.traccar.Context;
import org.traccar.helper.Log;
import org.traccar.model.Device;
import org.traccar.model.DeviceState;
-import org.traccar.model.DeviceTotalDistance;
+import org.traccar.model.DeviceAccumulators;
import org.traccar.model.Group;
import org.traccar.model.Position;
import org.traccar.model.Server;
@@ -351,10 +351,15 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
return result;
}
- public void resetTotalDistance(DeviceTotalDistance deviceTotalDistance) throws SQLException {
- Position last = positions.get(deviceTotalDistance.getDeviceId());
+ public void resetDeviceAccumulators(DeviceAccumulators deviceAccumulators) throws SQLException {
+ Position last = positions.get(deviceAccumulators.getDeviceId());
if (last != null) {
- last.getAttributes().put(Position.KEY_TOTAL_DISTANCE, deviceTotalDistance.getTotalDistance());
+ if (deviceAccumulators.getTotalDistance() != null) {
+ last.getAttributes().put(Position.KEY_TOTAL_DISTANCE, deviceAccumulators.getTotalDistance());
+ }
+ if (deviceAccumulators.getHours() != null) {
+ last.getAttributes().put(Position.KEY_HOURS, deviceAccumulators.getHours());
+ }
getDataManager().addObject(last);
updateLatestPosition(last);
} else {
diff --git a/src/org/traccar/helper/LogAction.java b/src/org/traccar/helper/LogAction.java
index d2c7ef5c1..2f575537d 100644
--- a/src/org/traccar/helper/LogAction.java
+++ b/src/org/traccar/helper/LogAction.java
@@ -35,12 +35,12 @@ public final class LogAction {
private static final String ACTION_LOGIN = "login";
private static final String ACTION_LOGOUT = "logout";
- private static final String ACTION_TOTAL_DISTANCE = "resetTotalDistance";
+ private static final String ACTION_DEVICE_ACCUMULATORS = "resetDeviceAccumulators";
private static final String PATTERN_OBJECT = "user: %d, action: %s, object: %s, id: %d";
private static final String PATTERN_LINK = "user: %d, action: %s, owner: %s, id: %d, property: %s, id: %d";
private static final String PATTERN_LOGIN = "user: %d, action: %s";
- private static final String PATTERN_TOTAL_DISTANCE = "user: %d, action: %s, deviceId: %d";
+ private static final String PATTERN_DEVICE_ACCUMULATORS = "user: %d, action: %s, deviceId: %d";
public static void create(long userId, BaseModel object) {
logObjectAction(ACTION_CREATE, userId, object.getClass(), object.getId());
@@ -70,8 +70,8 @@ public final class LogAction {
logLoginAction(ACTION_LOGOUT, userId);
}
- public static void resetTotalDistance(long userId, long deviceId) {
- log(String.format(PATTERN_TOTAL_DISTANCE, userId, ACTION_TOTAL_DISTANCE, deviceId));
+ public static void resetDeviceAccumulators(long userId, long deviceId) {
+ log(String.format(PATTERN_DEVICE_ACCUMULATORS, userId, ACTION_DEVICE_ACCUMULATORS, deviceId));
}
private static void logObjectAction(String action, long userId, Class<?> clazz, long objectId) {
diff --git a/src/org/traccar/model/DeviceTotalDistance.java b/src/org/traccar/model/DeviceAccumulators.java
index 4c89b7689..8a90826c4 100644
--- a/src/org/traccar/model/DeviceTotalDistance.java
+++ b/src/org/traccar/model/DeviceAccumulators.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,7 +16,7 @@
*/
package org.traccar.model;
-public class DeviceTotalDistance {
+public class DeviceAccumulators {
private long deviceId;
@@ -28,14 +28,24 @@ public class DeviceTotalDistance {
this.deviceId = deviceId;
}
- private double totalDistance;
+ private Double totalDistance;
- public double getTotalDistance() {
+ public Double getTotalDistance() {
return totalDistance;
}
- public void setTotalDistance(double totalDistance) {
+ public void setTotalDistance(Double totalDistance) {
this.totalDistance = totalDistance;
}
+ private Long hours;
+
+ public Long getHours() {
+ return hours;
+ }
+
+ public void setHours(Long hours) {
+ this.hours = hours;
+ }
+
}