From 12bb168b88fc3dbcdf59c2fec1a919e20ab57838 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 23 Aug 2018 08:48:20 +0500 Subject: Implement Device Engine Hours reset --- src/org/traccar/api/resource/DeviceResource.java | 10 ++--- src/org/traccar/database/DeviceManager.java | 9 +++-- src/org/traccar/helper/LogAction.java | 8 ++-- src/org/traccar/model/DeviceAccumulators.java | 51 ++++++++++++++++++++++++ src/org/traccar/model/DeviceTotalDistance.java | 41 ------------------- 5 files changed, 65 insertions(+), 54 deletions(-) create mode 100644 src/org/traccar/model/DeviceAccumulators.java delete mode 100644 src/org/traccar/model/DeviceTotalDistance.java (limited to 'src') diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java index 87927e45b..4f0d7ab3b 100644 --- a/src/org/traccar/api/resource/DeviceResource.java +++ b/src/org/traccar/api/resource/DeviceResource.java @@ -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 { 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..c32aca6f9 100644 --- a/src/org/traccar/database/DeviceManager.java +++ b/src/org/traccar/database/DeviceManager.java @@ -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,11 @@ public class DeviceManager extends BaseObjectManager 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()); + last.getAttributes().put(Position.KEY_TOTAL_DISTANCE, deviceAccumulators.getTotalDistance()); + 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/DeviceAccumulators.java b/src/org/traccar/model/DeviceAccumulators.java new file mode 100644 index 000000000..fe0535ef8 --- /dev/null +++ b/src/org/traccar/model/DeviceAccumulators.java @@ -0,0 +1,51 @@ +/* + * Copyright 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2016 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. + * 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.model; + +public class DeviceAccumulators { + + private long deviceId; + + public long getDeviceId() { + return deviceId; + } + + public void setDeviceId(long deviceId) { + this.deviceId = deviceId; + } + + private double totalDistance; + + public double getTotalDistance() { + return 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; + } + +} diff --git a/src/org/traccar/model/DeviceTotalDistance.java b/src/org/traccar/model/DeviceTotalDistance.java deleted file mode 100644 index 4c89b7689..000000000 --- a/src/org/traccar/model/DeviceTotalDistance.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2016 Anton Tananaev (anton@traccar.org) - * Copyright 2016 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. - * 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.model; - -public class DeviceTotalDistance { - - private long deviceId; - - public long getDeviceId() { - return deviceId; - } - - public void setDeviceId(long deviceId) { - this.deviceId = deviceId; - } - - private double totalDistance; - - public double getTotalDistance() { - return totalDistance; - } - - public void setTotalDistance(double totalDistance) { - this.totalDistance = totalDistance; - } - -} -- cgit v1.2.3 From e7d5dae5af7214f7f8dac39e8d081ad6c4533d20 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 23 Aug 2018 10:10:44 +0500 Subject: Make accumulators nullable --- src/org/traccar/api/resource/DeviceResource.java | 2 +- src/org/traccar/database/DeviceManager.java | 10 +++++++--- src/org/traccar/model/DeviceAccumulators.java | 16 ++++++++-------- 3 files changed, 16 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java index 4f0d7ab3b..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. diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java index c32aca6f9..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. @@ -354,8 +354,12 @@ public class DeviceManager extends BaseObjectManager implements Identity public void resetDeviceAccumulators(DeviceAccumulators deviceAccumulators) throws SQLException { Position last = positions.get(deviceAccumulators.getDeviceId()); if (last != null) { - last.getAttributes().put(Position.KEY_TOTAL_DISTANCE, deviceAccumulators.getTotalDistance()); - last.getAttributes().put(Position.KEY_HOURS, deviceAccumulators.getHours()); + 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/model/DeviceAccumulators.java b/src/org/traccar/model/DeviceAccumulators.java index fe0535ef8..8a90826c4 100644 --- a/src/org/traccar/model/DeviceAccumulators.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. @@ -28,23 +28,23 @@ public class DeviceAccumulators { 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; + private Long hours; - public long getHours() { + public Long getHours() { return hours; } - public void setHours(long hours) { + public void setHours(Long hours) { this.hours = hours; } -- cgit v1.2.3