diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-06-14 18:05:05 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-06-14 18:05:05 +0500 |
| commit | b588b3c723cad4629dcecbce8983933f7ff2a255 (patch) | |
| tree | ee1ed23c7c02ded8ca92c904e6f4f21aacfda8d8 /setup | |
| parent | 185c0830e17b6969977026d4be27e34878bb3db9 (diff) | |
| download | trackermap-server-b588b3c723cad4629dcecbce8983933f7ff2a255.tar.gz trackermap-server-b588b3c723cad4629dcecbce8983933f7ff2a255.tar.bz2 trackermap-server-b588b3c723cad4629dcecbce8983933f7ff2a255.zip | |
- Overlapping geofences
- Simplified user-device link
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/unix/traccar.xml | 14 | ||||
| -rw-r--r-- | setup/windows/traccar.xml | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml index 37ff31bbe..ab739e4d6 100644 --- a/setup/unix/traccar.xml +++ b/setup/unix/traccar.xml @@ -118,7 +118,7 @@ </entry> <entry key='database.updateDeviceStatus'> - UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion, geofenceId = :geofenceId WHERE id = :id; + UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion WHERE id = :id; </entry> <entry key='database.deleteDevice'> @@ -238,16 +238,16 @@ DELETE FROM group_geofence WHERE groupId = :groupId AND geofenceId = :geofenceId; </entry> - <entry key='database.selectUserDeviceGeofences'> - SELECT userId, deviceId, geofenceId FROM user_device_geofence; + <entry key='database.selectDeviceGeofences'> + SELECT deviceId, geofenceId FROM device_geofence; </entry> - <entry key='database.linkUserDeviceGeofence'> - INSERT INTO user_device_geofence (userId, deviceId, geofenceId) VALUES (:userId, :deviceId, :geofenceId); + <entry key='database.linkDeviceGeofence'> + INSERT INTO device_geofence (deviceId, geofenceId) VALUES (:deviceId, :geofenceId); </entry> - <entry key='database.unlinkUserDeviceGeofence'> - DELETE FROM user_device_geofence WHERE userId = :userId AND deviceId = :deviceId AND geofenceId = :geofenceId; + <entry key='database.unlinkDeviceGeofence'> + DELETE FROM device_geofence WHERE deviceId = :deviceId AND geofenceId = :geofenceId; </entry> <!-- PROTOCOL CONFIG --> diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml index 5f86e53b0..17f2ab4f3 100644 --- a/setup/windows/traccar.xml +++ b/setup/windows/traccar.xml @@ -118,7 +118,7 @@ </entry>
<entry key='database.updateDeviceStatus'>
- UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion, geofenceId = :geofenceId WHERE id = :id;
+ UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion WHERE id = :id;
</entry>
<entry key='database.deleteDevice'>
@@ -238,16 +238,16 @@ DELETE FROM group_geofence WHERE groupId = :groupId AND geofenceId = :geofenceId;
</entry>
- <entry key='database.selectUserDeviceGeofences'>
- SELECT userId, deviceId, geofenceId FROM user_device_geofence;
+ <entry key='database.selectDeviceGeofences'>
+ SELECT deviceId, geofenceId FROM device_geofence;
</entry>
- <entry key='database.linkUserDeviceGeofence'>
- INSERT INTO user_device_geofence (userId, deviceId, geofenceId) VALUES (:userId, :deviceId, :geofenceId);
+ <entry key='database.linkDeviceGeofence'>
+ INSERT INTO device_geofence (deviceId, geofenceId) VALUES (:deviceId, :geofenceId);
</entry>
- <entry key='database.unlinkUserDeviceGeofence'>
- DELETE FROM user_device_geofence WHERE userId = :userId AND deviceId = :deviceId AND geofenceId = :geofenceId;
+ <entry key='database.unlinkDeviceGeofence'>
+ DELETE FROM device_geofence WHERE deviceId = :deviceId AND geofenceId = :geofenceId;
</entry>
<!-- PROTOCOL CONFIG -->
|