diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-26 10:02:37 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-26 10:02:37 -0700 |
commit | d3e34416e9825833fa1db02112c56981999df039 (patch) | |
tree | d21b4414b532bfc53c9a905f3caa09f70b43b59e /src/org/traccar/model | |
parent | ac2405f0d57fac51fe95aa755f90fe82f26f73bc (diff) | |
parent | aa12e5c750e771016545269ffa39409b06b47eee (diff) | |
download | traccar-server-d3e34416e9825833fa1db02112c56981999df039.tar.gz traccar-server-d3e34416e9825833fa1db02112c56981999df039.tar.bz2 traccar-server-d3e34416e9825833fa1db02112c56981999df039.zip |
Merge pull request #1978 from Abyss777/master
Simplification of the models hierarchy
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r-- | src/org/traccar/model/Command.java | 2 | ||||
-rw-r--r-- | src/org/traccar/model/Event.java | 125 | ||||
-rw-r--r-- | src/org/traccar/model/Extensible.java | 61 | ||||
-rw-r--r-- | src/org/traccar/model/Message.java | 41 | ||||
-rw-r--r-- | src/org/traccar/model/Position.java | 105 |
5 files changed, 146 insertions, 188 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index 4525b3cde..69172ecee 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -18,7 +18,7 @@ package org.traccar.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) -public class Command extends Extensible { +public class Command extends Message { public static final String TYPE_CUSTOM = "custom"; public static final String TYPE_POSITION_SINGLE = "positionSingle"; diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java deleted file mode 100644 index 8ae817e30..000000000 --- a/src/org/traccar/model/Event.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com) - * - * 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; - -import java.util.Date; - -public abstract class Event extends Extensible { - - // Words separated by dashes (word-second-third) - public static final String KEY_ORIGINAL = "raw"; - public static final String KEY_INDEX = "index"; - public static final String KEY_HDOP = "hdop"; - public static final String KEY_SATELLITES = "sat"; - public static final String KEY_GSM = "gsm"; - public static final String KEY_GPS = "gps"; - public static final String KEY_EVENT = "event"; - public static final String KEY_ALARM = "alarm"; - public static final String KEY_STATUS = "status"; - public static final String KEY_ODOMETER = "odometer"; - public static final String KEY_HOURS = "hours"; - public static final String KEY_INPUT = "input"; - public static final String KEY_OUTPUT = "output"; - public static final String KEY_POWER = "power"; - public static final String KEY_BATTERY = "battery"; - public static final String KEY_MCC = "mcc"; - public static final String KEY_MNC = "mnc"; - public static final String KEY_LAC = "lac"; - public static final String KEY_CID = "cid"; - public static final String KEY_FUEL = "fuel"; - public static final String KEY_RFID = "rfid"; - public static final String KEY_VERSION = "version"; - public static final String KEY_TYPE = "type"; - public static final String KEY_IGNITION = "ignition"; - public static final String KEY_FLAGS = "flags"; - public static final String KEY_CHARGE = "charge"; - public static final String KEY_IP = "ip"; - public static final String KEY_ARCHIVE = "archive"; - public static final String KEY_DISTANCE = "distance"; - public static final String KEY_RPM = "rpm"; - public static final String KEY_VIN = "vin"; - public static final String KEY_APPROXIMATE = "approximate"; - public static final String KEY_THROTTLE = "throttle"; - public static final String KEY_MOTION = "motion"; - - public static final String KEY_OBD_SPEED = "obd-speed"; - public static final String KEY_OBD_ODOMETER = "obd-odometer"; - - public static final String KEY_RESULT = "result"; - - // Starts with 1 not 0 - public static final String PREFIX_TEMP = "temp"; - public static final String PREFIX_ADC = "adc"; - public static final String PREFIX_IO = "io"; - public static final String PREFIX_COUNT = "count"; - - private long id; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - private String protocol; - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - private Date serverTime; - - public Date getServerTime() { - if (serverTime != null) { - return new Date(serverTime.getTime()); - } else { - return null; - } - } - - public void setServerTime(Date serverTime) { - if (serverTime != null) { - this.serverTime = new Date(serverTime.getTime()); - } else { - this.serverTime = null; - } - } - - private Date deviceTime; - - public Date getDeviceTime() { - if (deviceTime != null) { - return new Date(deviceTime.getTime()); - } else { - return null; - } - } - - public void setDeviceTime(Date deviceTime) { - if (deviceTime != null) { - this.deviceTime = new Date(deviceTime.getTime()); - } else { - this.deviceTime = null; - } - } - -} diff --git a/src/org/traccar/model/Extensible.java b/src/org/traccar/model/Extensible.java deleted file mode 100644 index f59b3d22e..000000000 --- a/src/org/traccar/model/Extensible.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * 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; - -import java.util.LinkedHashMap; -import java.util.Map; - -public abstract class Extensible extends Message { - - private Map<String, Object> attributes = new LinkedHashMap<>(); - - public Map<String, Object> getAttributes() { - return attributes; - } - - public void setAttributes(Map<String, Object> attributes) { - this.attributes = attributes; - } - - public void set(String key, boolean value) { - attributes.put(key, value); - } - - public void set(String key, int value) { - attributes.put(key, value); - } - - public void set(String key, long value) { - attributes.put(key, value); - } - - public void set(String key, double value) { - attributes.put(key, value); - } - - public void set(String key, String value) { - if (value != null && !value.isEmpty()) { - attributes.put(key, value); - } - } - - public void add(Map.Entry<String, Object> entry) { - if (entry != null && entry.getValue() != null) { - attributes.put(entry.getKey(), entry.getValue()); - } - } - -} diff --git a/src/org/traccar/model/Message.java b/src/org/traccar/model/Message.java index bac6661a8..8722acc16 100644 --- a/src/org/traccar/model/Message.java +++ b/src/org/traccar/model/Message.java @@ -15,6 +15,9 @@ */ package org.traccar.model; +import java.util.LinkedHashMap; +import java.util.Map; + public class Message { private long deviceId; @@ -37,4 +40,42 @@ public class Message { this.type = type; } + private Map<String, Object> attributes = new LinkedHashMap<>(); + + public Map<String, Object> getAttributes() { + return attributes; + } + + public void setAttributes(Map<String, Object> attributes) { + this.attributes = attributes; + } + + public void set(String key, boolean value) { + attributes.put(key, value); + } + + public void set(String key, int value) { + attributes.put(key, value); + } + + public void set(String key, long value) { + attributes.put(key, value); + } + + public void set(String key, double value) { + attributes.put(key, value); + } + + public void set(String key, String value) { + if (value != null && !value.isEmpty()) { + attributes.put(key, value); + } + } + + public void add(Map.Entry<String, Object> entry) { + if (entry != null && entry.getValue() != null) { + attributes.put(entry.getKey(), entry.getValue()); + } + } + } diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 1a38681ca..22d1be846 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -17,7 +17,110 @@ package org.traccar.model; import java.util.Date; -public class Position extends Event { +public class Position extends Message { + + // Words separated by dashes (word-second-third) + public static final String KEY_ORIGINAL = "raw"; + public static final String KEY_INDEX = "index"; + public static final String KEY_HDOP = "hdop"; + public static final String KEY_SATELLITES = "sat"; + public static final String KEY_GSM = "gsm"; + public static final String KEY_GPS = "gps"; + public static final String KEY_EVENT = "event"; + public static final String KEY_ALARM = "alarm"; + public static final String KEY_STATUS = "status"; + public static final String KEY_ODOMETER = "odometer"; + public static final String KEY_HOURS = "hours"; + public static final String KEY_INPUT = "input"; + public static final String KEY_OUTPUT = "output"; + public static final String KEY_POWER = "power"; + public static final String KEY_BATTERY = "battery"; + public static final String KEY_MCC = "mcc"; + public static final String KEY_MNC = "mnc"; + public static final String KEY_LAC = "lac"; + public static final String KEY_CID = "cid"; + public static final String KEY_FUEL = "fuel"; + public static final String KEY_RFID = "rfid"; + public static final String KEY_VERSION = "version"; + public static final String KEY_TYPE = "type"; + public static final String KEY_IGNITION = "ignition"; + public static final String KEY_FLAGS = "flags"; + public static final String KEY_CHARGE = "charge"; + public static final String KEY_IP = "ip"; + public static final String KEY_ARCHIVE = "archive"; + public static final String KEY_DISTANCE = "distance"; + public static final String KEY_RPM = "rpm"; + public static final String KEY_VIN = "vin"; + public static final String KEY_APPROXIMATE = "approximate"; + public static final String KEY_THROTTLE = "throttle"; + public static final String KEY_MOTION = "motion"; + + public static final String KEY_OBD_SPEED = "obd-speed"; + public static final String KEY_OBD_ODOMETER = "obd-odometer"; + + public static final String KEY_RESULT = "result"; + + // Starts with 1 not 0 + public static final String PREFIX_TEMP = "temp"; + public static final String PREFIX_ADC = "adc"; + public static final String PREFIX_IO = "io"; + public static final String PREFIX_COUNT = "count"; + + private long id; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + private String protocol; + + public String getProtocol() { + return protocol; + } + + public void setProtocol(String protocol) { + this.protocol = protocol; + } + + private Date serverTime; + + public Date getServerTime() { + if (serverTime != null) { + return new Date(serverTime.getTime()); + } else { + return null; + } + } + + public void setServerTime(Date serverTime) { + if (serverTime != null) { + this.serverTime = new Date(serverTime.getTime()); + } else { + this.serverTime = null; + } + } + + private Date deviceTime; + + public Date getDeviceTime() { + if (deviceTime != null) { + return new Date(deviceTime.getTime()); + } else { + return null; + } + } + + public void setDeviceTime(Date deviceTime) { + if (deviceTime != null) { + this.deviceTime = new Date(deviceTime.getTime()); + } else { + this.deviceTime = null; + } + } private Date fixTime; |