mirror/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2026-05-19 06:02:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve latest position query

Browse Source
This commit is contained in:
Anton Tananaev
2026-04-18 07:22:20 -07:00
parent ca1766b387
commit f574faabe0
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/traccar/storage/DatabaseStorage.java
View File

@@ -241,10 +241,12 @@ public class DatabaseStorage extends Storage {
} else if (genericCondition instanceof Condition.LatestPositions condition) {
if (condition.getDeviceId() > 0) {
results.add(condition.getDeviceId());
}
long period = config.getLong(Keys.DATABASE_POSITION_PERIOD);
if (period > 0) {
results.add(new Date(System.currentTimeMillis() - period * 1000));
results.add(condition.getDeviceId());
} else {
long period = config.getLong(Keys.DATABASE_POSITION_PERIOD);
if (period > 0) {
results.add(new Date(System.currentTimeMillis() - period * 1000));
}
}
}
return results;
@@ -306,6 +308,14 @@ public class DatabaseStorage extends Storage {
} else if (genericCondition instanceof Condition.LatestPositions condition) {
if (condition.getDeviceId() > 0) {
result.append("deviceId = ? AND ");
} else {
long period = config.getLong(Keys.DATABASE_POSITION_PERIOD);
if (period > 0) {
result.append("fixTime > ? AND ");
}
}
result.append("id IN (");
result.append("SELECT positionId FROM ");
result.append(getStorageName(Device.class));
@@ -313,10 +323,6 @@ public class DatabaseStorage extends Storage {
result.append(" WHERE id = ?");
}
result.append(")");
long period = config.getLong(Keys.DATABASE_POSITION_PERIOD);
if (period > 0) {
result.append(" AND fixTime > ?");
}
}
}