Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-07 03:07:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add computed attributes priority

Browse Source
This commit is contained in:
Anton Tananaev 2024-05-27 16:24:14 -07:00
parent 248a3927dd
commit 4ebc4c6ee6
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
schema/changelog-6.2.xml
View File

@ -11,6 +11,12 @@
<dropColumn tableName="tc_servers" columnName="twelvehourformat" />
<dropColumn tableName="tc_users" columnName="twelvehourformat" />
<addColumn tableName="tc_attributes">
<column name="priority" type="INT" defaultValueNumeric="0">
<constraints nullable="false" />
</column>
</addColumn>
</changeSet>
</databaseChangeLog>

7
src/main/java/org/traccar/handler/ComputedAttributesHandler.java
View File

@ -35,13 +35,14 @@ import org.traccar.session.cache.CacheManager;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Date;
import java.util.stream.Collectors;
public class ComputedAttributesHandler extends BasePositionHandler {
@ -140,7 +141,9 @@ public class ComputedAttributesHandler extends BasePositionHandler {
@Override
public void handlePosition(Position position, Callback callback) {
Collection<Attribute> attributes = cacheManager.getDeviceObjects(position.getDeviceId(), Attribute.class);
var attributes = cacheManager.getDeviceObjects(position.getDeviceId(), Attribute.class).stream()
.sorted(Comparator.comparing(Attribute::getPriority).reversed())
.collect(Collectors.toUnmodifiableList());
for (Attribute attribute : attributes) {
if (attribute.getAttribute() != null) {
Object result = null;

10
src/main/java/org/traccar/model/Attribute.java
View File

@ -61,4 +61,14 @@ public class Attribute extends BaseModel {
this.type = type;
}
private int priority;
public int getPriority() {
return priority;
}
public void setPriority(int priority) {
this.priority = priority;
}
}