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

Handle motion fluctuation (fix #5000)

Browse Source
This commit is contained in:
Anton Tananaev 2022-12-14 16:08:25 -08:00
parent 836dc4138f
commit 3b36ac38a0
9 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
schema/changelog-5.6.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
logicalFilePath="changelog-5.6">
<changeSet author="author" id="changelog-5.6">
<addColumn tableName="tc_devices">
<column name="motionstreak" type="BOOLEAN" defaultValueBoolean="false" />
</addColumn>
</changeSet>
</databaseChangeLog>

1
schema/changelog-master.xml
View File

@ -36,5 +36,6 @@
<include file="changelog-5.3.xml" relativeToChangelogFile="true" />
<include file="changelog-5.4.xml" relativeToChangelogFile="true" />
<include file="changelog-5.5.xml" relativeToChangelogFile="true" />
<include file="changelog-5.6.xml" relativeToChangelogFile="true" />
</databaseChangeLog>

2
src/main/java/org/traccar/handler/events/MotionEventHandler.java
View File

@ -75,7 +75,7 @@ public class MotionEventHandler extends BaseEventHandler {
state.toDevice(device);
try {
storage.updateObject(device, new Request(
new Columns.Include("motionState", "motionTime", "motionDistance"),
new Columns.Include("motionStreak", "motionState", "motionTime", "motionDistance"),
new Condition.Equals("id", device.getId())));
} catch (StorageException e) {
LOGGER.warn("Update device motion error", e);

13
src/main/java/org/traccar/model/Device.java
View File

@ -162,6 +162,19 @@ public class Device extends GroupedModel implements Disableable {
this.expirationTime = expirationTime;
}
private boolean motionStreak;
@QueryIgnore
@JsonIgnore
public boolean getMotionStreak() {
return motionStreak;
}
@JsonIgnore
public void setMotionStreak(boolean motionStreak) {
this.motionStreak = motionStreak;
}
private boolean motionState;
@QueryIgnore

4
src/main/java/org/traccar/reports/common/ReportUtils.java
View File

@ -354,7 +354,9 @@ public class ReportUtils {
boolean trips = reportClass.equals(TripReportItem.class);
MotionState motionState = new MotionState();
motionState.setMotionState(isMoving(positions, 0, tripsConfig));
boolean initialValue = isMoving(positions, 0, tripsConfig);
motionState.setMotionStreak(initialValue);
motionState.setMotionState(initialValue);
boolean detected = trips == motionState.getMotionState();
int startEventIndex = detected ? 0 : -1;

10
src/main/java/org/traccar/session/state/MotionProcessor.java
View File

@ -59,6 +59,7 @@ public final class MotionProcessor {
String eventType = newState ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
Event event = new Event(eventType, position);
state.setMotionStreak(newState);
state.setMotionTime(null);
state.setMotionDistance(0);
state.setEvent(event);
@ -67,8 +68,13 @@ public final class MotionProcessor {
}
} else {
state.setMotionState(newState);
state.setMotionTime(position.getFixTime());
state.setMotionDistance(position.getDouble(Position.KEY_TOTAL_DISTANCE));
if (state.getMotionStreak() == newState) {
state.setMotionTime(null);
state.setMotionDistance(0);
} else {
state.setMotionTime(position.getFixTime());
state.setMotionDistance(position.getDouble(Position.KEY_TOTAL_DISTANCE));
}
}
}

13
src/main/java/org/traccar/session/state/MotionState.java
View File

@ -24,6 +24,7 @@ public class MotionState {
public static MotionState fromDevice(Device device) {
MotionState state = new MotionState();
state.motionStreak = device.getMotionStreak();
state.motionState = device.getMotionState();
state.motionTime = device.getMotionTime();
state.motionDistance = device.getMotionDistance();
@ -31,6 +32,7 @@ public class MotionState {
}
public void toDevice(Device device) {
device.setMotionStreak(motionStreak);
device.setMotionState(motionState);
device.setMotionTime(motionTime);
device.setMotionDistance(motionDistance);
@ -42,6 +44,17 @@ public class MotionState {
return changed;
}
private boolean motionStreak;
public boolean getMotionStreak() {
return motionStreak;
}
public void setMotionStreak(boolean motionStreak) {
this.motionStreak = motionStreak;
changed = true;
}
private boolean motionState;
public boolean getMotionState() {

7
src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
View File

@ -1,6 +1,5 @@
package org.traccar.handler.events;
import org.junit.Ignore;
import org.junit.Test;
import org.traccar.BaseTest;
import org.traccar.model.Event;
@ -62,7 +61,6 @@ public class MotionEventHandlerTest extends BaseTest {
verifyState(state, false, 0);
}
@Ignore
@Test
public void testMotionFluctuation() throws ParseException {
TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, false, false, 0.01);
@ -87,11 +85,11 @@ public class MotionEventHandlerTest extends BaseTest {
MotionProcessor.updateState(state, position("2017-01-01 00:04:00", true, 1000, null), true, tripsConfig);
assertNull(state.getEvent());
verifyState(state, true, 1000);
verifyState(state, true, 0);
MotionProcessor.updateState(state, position("2017-01-01 00:06:00", true, 2000, null), true, tripsConfig);
assertNull(state.getEvent());
verifyState(state, true, 2000);
verifyState(state, true, 0);
}
@Test
@ -99,6 +97,7 @@ public class MotionEventHandlerTest extends BaseTest {
TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, true, false, 0.01);
MotionState state = new MotionState();
state.setMotionStreak(true);
state.setMotionState(true);
MotionProcessor.updateState(state, position("2017-01-01 00:00:00", false, 100, true), false, tripsConfig);

2
tools/recover.py
View File

@ -48,5 +48,5 @@ for session in protocols:
s.connect(("localhost", int(port)))
for message in messages[session]:
s.send(binascii.unhexlify(message))
time.sleep(0.5)
time.sleep(0.1)
s.close()