Completely rewritten project

3 files changed, 236 insertions, 0 deletions

diff --git a/src/org/traccar/web/shared/model/Device.java b/src/org/traccar/web/shared/model/Device.java
new file mode 100644
index 00000000..8ae67c34
--- /dev/null
+++ b/src/org/traccar/web/shared/model/Device.java
@@ -0,0 +1,56 @@
+package org.traccar.web.shared.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "devices")
+public class Device implements Serializable {
+
+    private static final long serialVersionUID = 1;
+
+    public Device() {
+    }
+
+    public Device(Device device) {
+        id = device.id;
+        uniqueId = device.uniqueId;
+        name = device.name;
+    }
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    public long getId() {
+        return id;
+    }
+
+    @Column(unique = true)
+    private String uniqueId;
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    @Column(unique = true)
+    private String name;
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/src/org/traccar/web/shared/model/Position.java b/src/org/traccar/web/shared/model/Position.java
new file mode 100644
index 00000000..13827301
--- /dev/null
+++ b/src/org/traccar/web/shared/model/Position.java
@@ -0,0 +1,115 @@
+package org.traccar.web.shared.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Index;
+
+@Entity
+@Table(name = "positions")
+public class Position implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1;
+
+    public Position() {
+    }
+
+    public Position(Position position) {
+        id = position.id;
+        device = position.device;
+        time = position.time;
+        valid = position.valid;
+        latitude = position.latitude;
+        longitude = position.longitude;
+        altitude = position.altitude;
+        speed = position.speed;
+        course = position.course;
+        power = position.power;
+        address = position.address;
+        other = position.other;
+    }
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    public long getId() {
+        return id;
+    }
+
+    @ManyToOne
+    @Index(name = "positionsIndex")
+    private Device device;
+
+    public Device getDevice() {
+        return device;
+    }
+
+    @Index(name = "positionsIndex")
+    private Date time;
+
+    public Date getTime() {
+        return time;
+    }
+
+    private boolean valid;
+
+    public boolean getValid() {
+        return valid;
+    }
+
+    private double latitude;
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    private double longitude;
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    private double altitude;
+
+    public double getAltitude() {
+        return altitude;
+    }
+
+    private double speed;
+
+    public double getSpeed() {
+        return speed;
+    }
+
+    private double course;
+
+    public double getCourse() {
+        return course;
+    }
+
+    private double power;
+
+    public double getPower() {
+        return power;
+    }
+
+    private String address;
+
+    public String getAddress() {
+        return address;
+    }
+
+    private String other;
+
+    public String getOther() {
+        return other;
+    }
+
+}
diff --git a/src/org/traccar/web/shared/model/User.java b/src/org/traccar/web/shared/model/User.java
new file mode 100644
index 00000000..9064f190
--- /dev/null
+++ b/src/org/traccar/web/shared/model/User.java
@@ -0,0 +1,65 @@
+package org.traccar.web.shared.model;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="users")
+public class User implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1;
+
+    public User() {
+    }
+
+    public User(User user) {
+        id = user.id;
+        login = user.login;
+        password = user.password;
+    }
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    public long getId() {
+        return id;
+    }
+
+    @Column(unique = true)
+    private String login;
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    private String password;
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    @OneToMany
+    private List<Device> devices = new LinkedList<Device>();
+
+    public List<Device> getDevices() {
+        return devices;
+    }
+
+}