Merge pull request #2012 from Abyss777/master

Implement Geofences on server side

1 files changed, 87 insertions, 1 deletions

diff --git a/debug.xml b/debug.xml
index b16a596bf..f04ceb271 100644
--- a/debug.xml
+++ b/debug.xml
@@ -41,6 +41,16 @@
     <entry key='logger.level'>all</entry>
     <entry key='logger.file'>target/tracker-server.log</entry>
 
+    <entry key='event.suppressRepeated'>60</entry>
+
+    <entry key='event.overspeedHandler'>true</entry>
+    <entry key='event.globalSpeedLimit'>90</entry>
+
+    <entry key='event.motionHandler'>true</entry>
+
+
+    <entry key='event.geofenceHandler'>true</entry>
+
     <!-- DATABASE CONFIG -->
 
     <!--<entry key='database.driverFile'>hsqldb.jar</entry>-->
@@ -137,7 +147,7 @@
     </entry>
 
     <entry key='database.updateDeviceStatus'>
-        UPDATE devices SET status = :status, lastUpdate = :lastUpdate WHERE id = :id;
+        UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion WHERE id = :id;
     </entry>
 
     <entry key='database.deleteDevice'>
@@ -193,6 +203,82 @@
         UPDATE devices SET positionId = :id WHERE id = :deviceId;
     </entry>
 
+    <entry key='database.selectEvent'>
+        SELECT * FROM events WHERE id = :id;
+    </entry>
+
+    <entry key='database.insertEvent'>
+        INSERT INTO events (type, serverTime, deviceId, positionId, geofenceId, attributes)
+        VALUES (:type, :serverTime, :deviceId, :positionId, :geofenceId, :attributes);
+    </entry>
+
+    <entry key='database.selectEvents'>
+        SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND serverTime BETWEEN :from AND :to ORDER BY serverTime DESC;
+    </entry>
+
+    <entry key='database.selectGeofence'>
+        SELECT * FROM geofences
+        WHERE id = :id;
+    </entry>
+
+    <entry key='database.selectGeofencesAll'>
+        SELECT * FROM geofences;
+    </entry>
+
+    <entry key='database.insertGeofence'>
+        INSERT INTO geofences (name, description, area, attributes)
+        VALUES (:name, :description, :area, :attributes);
+    </entry>
+
+    <entry key='database.updateGeofence'>
+        UPDATE geofences SET
+        name = :name,
+        description = :description,
+        area = :area,
+        attributes = :attributes
+        WHERE id = :id;
+    </entry>
+
+    <entry key='database.deleteGeofence'>
+        DELETE FROM geofences WHERE id = :id;
+    </entry>
+
+    <entry key='database.selectGeofencePermissions'>
+        SELECT userId, geofenceId FROM user_geofence;
+    </entry>
+
+    <entry key='database.linkGeofence'>
+        INSERT INTO user_geofence (userId, geofenceId) VALUES (:userId, :geofenceId);
+    </entry>
+
+    <entry key='database.unlinkGeofence'>
+        DELETE FROM user_geofence WHERE userId = :userId AND geofenceId = :geofenceId;
+    </entry>
+
+    <entry key='database.selectGroupGeofences'>
+        SELECT groupId, geofenceId FROM group_geofence;
+    </entry>
+
+    <entry key='database.linkGroupGeofence'>
+        INSERT INTO group_geofence (groupId, geofenceId) VALUES (:groupId, :geofenceId);
+    </entry>
+
+    <entry key='database.unlinkGroupGeofence'>
+        DELETE FROM group_geofence WHERE groupId = :groupId AND geofenceId = :geofenceId;
+    </entry>
+
+    <entry key='database.selectDeviceGeofences'>
+        SELECT deviceId, geofenceId FROM device_geofence;
+    </entry>
+
+    <entry key='database.linkDeviceGeofence'>
+        INSERT INTO device_geofence (deviceId, geofenceId) VALUES (:deviceId, :geofenceId);
+    </entry>
+
+    <entry key='database.unlinkDeviceGeofence'>
+        DELETE FROM device_geofence WHERE deviceId = :deviceId AND geofenceId = :geofenceId;
+    </entry>
+
     <!-- PROTOCOL CONFIG -->
 
     <entry key='gps103.port'>5001</entry>