Merge pull request #2466 from Abyss777/device_management_info

Extend device model with management info

3 files changed, 65 insertions, 2 deletions

diff --git a/debug.xml b/debug.xml
index ad9e346c1..d32d9eaf8 100644
--- a/debug.xml
+++ b/debug.xml
@@ -168,11 +168,21 @@
     </entry>
 
     <entry key='database.insertDevice'>
-        INSERT INTO devices (name, uniqueId, groupId, attributes) VALUES (:name, :uniqueId, :groupId, :attributes)
+        INSERT INTO devices (name, uniqueId, groupId, attributes, phone, model, contact, category)
+        VALUES (:name, :uniqueId, :groupId, :attributes, :phone, :model, :contact, :category)
     </entry>
 
     <entry key='database.updateDevice'>
-        UPDATE devices SET name = :name, uniqueId = :uniqueId, groupId = :groupId, attributes = :attributes WHERE id = :id
+        UPDATE devices SET
+        name = :name,
+        uniqueId = :uniqueId,
+        groupId = :groupId,
+        attributes = :attributes,
+        phone = :phone,
+        model = :model,
+        contact = :contact,
+        category = :category
+        WHERE id = :id
     </entry>
 
     <entry key='database.updateDeviceStatus'>
diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml
index 7a2b1e4e0..780a2d029 100644
--- a/schema/changelog-3.8.xml
+++ b/schema/changelog-3.8.xml
@@ -94,5 +94,18 @@
     <modifyDataType tableName="groups" columnName="attributes" newDataType="VARCHAR(4000)" />
     <modifyDataType tableName="server" columnName="attributes" newDataType="VARCHAR(4000)" />
 
+    <addColumn tableName="devices">
+      <column name="phone" type="VARCHAR(128)" />
+    </addColumn>
+    <addColumn tableName="devices">
+      <column name="model" type="VARCHAR(128)" />
+    </addColumn>
+    <addColumn tableName="devices">
+      <column name="contact" type="VARCHAR(512)" />
+    </addColumn>
+    <addColumn tableName="devices">
+      <column name="category" type="VARCHAR(128)" />
+    </addColumn>
+
   </changeSet>
 </databaseChangeLog>
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index e90742836..821984c47 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -101,4 +101,44 @@ public class Device extends Extensible {
     public void setGeofenceIds(List<Long> geofenceIds) {
         this.geofenceIds = geofenceIds;
     }
+
+    private String phone;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    private String model;
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    private String contact;
+
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+    private String category;
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
 }