diff options
| author | drecchia <danilo@deltatecnologia.com> | 2016-06-01 21:08:05 -0300 |
|---|---|---|
| committer | drecchia <danilo@deltatecnologia.com> | 2016-06-01 21:08:05 -0300 |
| commit | e4ba1ebf54838041fae352d95e399b1fb3483458 (patch) | |
| tree | 334626820ff4efa4583bb5257d19a18cd0ebf631 /setup/windows/traccar.xml | |
| parent | 5df7c128af15e9d1021b7570f081185f14467f09 (diff) | |
| parent | d2c85b59bde4729d027ef1bb6e874d1fd1a02c68 (diff) | |
| download | traccar-server-e4ba1ebf54838041fae352d95e399b1fb3483458.tar.gz traccar-server-e4ba1ebf54838041fae352d95e399b1fb3483458.tar.bz2 traccar-server-e4ba1ebf54838041fae352d95e399b1fb3483458.zip | |
Merge branch 'master' of https://github.com/tananaev/traccar
Conflicts:
src/org/traccar/database/DataManager.java
Diffstat (limited to 'setup/windows/traccar.xml')
| -rw-r--r-- | setup/windows/traccar.xml | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml index bf1b216af..5748f3993 100644 --- a/setup/windows/traccar.xml +++ b/setup/windows/traccar.xml @@ -17,6 +17,13 @@ <entry key='logger.level'>all</entry>
<entry key='logger.file'>[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>
+
<!-- DATABASE CONFIG -->
<entry key='database.driver'>org.h2.Driver</entry>
@@ -109,7 +116,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'>
@@ -165,6 +172,19 @@ 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, attributes)
+ VALUES (:type, :serverTime, :deviceId, :positionId, :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>
+
<!-- PROTOCOL CONFIG -->
<entry key='gps103.port'>5001</entry>
|