aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--schema/changelog-5.6.xml17
-rw-r--r--schema/changelog-master.xml1
-rw-r--r--src/main/java/org/traccar/handler/events/MotionEventHandler.java2
-rw-r--r--src/main/java/org/traccar/model/Device.java13
-rw-r--r--src/main/java/org/traccar/reports/common/ReportUtils.java4
-rw-r--r--src/main/java/org/traccar/session/state/MotionProcessor.java10
-rw-r--r--src/main/java/org/traccar/session/state/MotionState.java13
-rw-r--r--src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java7
-rwxr-xr-xtools/recover.py2
9 files changed, 60 insertions, 9 deletions
diff --git a/schema/changelog-5.6.xml b/schema/changelog-5.6.xml
new file mode 100644
index 000000000..335f7b3a8
--- /dev/null
+++ b/schema/changelog-5.6.xml
@@ -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>
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml
index cc39c5c41..0835918c9 100644
--- a/schema/changelog-master.xml
+++ b/schema/changelog-master.xml
@@ -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>
diff --git a/src/main/java/org/traccar/handler/events/MotionEventHandler.java b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
index 1b9763c41..c406bd935 100644
--- a/src/main/java/org/traccar/handler/events/MotionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
@@ -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);
diff --git a/src/main/java/org/traccar/model/Device.java b/src/main/java/org/traccar/model/Device.java
index 7728172cb..b8c87921d 100644
--- a/src/main/java/org/traccar/model/Device.java
+++ b/src/main/java/org/traccar/model/Device.java
@@ -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
diff --git a/src/main/java/org/traccar/reports/common/ReportUtils.java b/src/main/java/org/traccar/reports/common/ReportUtils.java
index 120dadcf5..a7c420095 100644
--- a/src/main/java/org/traccar/reports/common/ReportUtils.java
+++ b/src/main/java/org/traccar/reports/common/ReportUtils.java
@@ -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;
diff --git a/src/main/java/org/traccar/session/state/MotionProcessor.java b/src/main/java/org/traccar/session/state/MotionProcessor.java
index b9d706492..a1737a739 100644
--- a/src/main/java/org/traccar/session/state/MotionProcessor.java
+++ b/src/main/java/org/traccar/session/state/MotionProcessor.java
@@ -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));
+ }
}
}
diff --git a/src/main/java/org/traccar/session/state/MotionState.java b/src/main/java/org/traccar/session/state/MotionState.java
index e3ce58ab2..6c917ad16 100644
--- a/src/main/java/org/traccar/session/state/MotionState.java
+++ b/src/main/java/org/traccar/session/state/MotionState.java
@@ -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() {
diff --git a/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java b/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
index 25c766b51..b77676dc8 100644
--- a/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
+++ b/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
@@ -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);
diff --git a/tools/recover.py b/tools/recover.py
index dfa94c978..32e3f8721 100755
--- a/tools/recover.py
+++ b/tools/recover.py
@@ -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()
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 00:19:36 +0000