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/model/DeviceAccumulators.java | 51 ++++++++++++++++++++++++++ src/org/traccar/model/DeviceTotalDistance.java | 41 --------------------- 2 files changed, 51 insertions(+), 41 deletions(-) create mode 100644 src/org/traccar/model/DeviceAccumulators.java delete mode 100644 src/org/traccar/model/DeviceTotalDistance.java (limited to 'src/org/traccar/model') 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/org/traccar/model') 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