From d560f0cfdbbe9639e681bfeedd25d4de845d6161 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 27 Apr 2015 12:01:43 +1200 Subject: Refactor model classes --- src/org/traccar/database/DataManager.java | 2 +- src/org/traccar/database/ObjectConverter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/database') diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 4b8f4d5e8..d53ec7838 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -180,7 +180,7 @@ public class DataManager { private NamedParameterStatement.Params assignVariables(NamedParameterStatement.Params params, Position position) throws SQLException { params.setLong("device_id", position.getDeviceId()); - params.setTimestamp("time", position.getTime()); + params.setTimestamp("time", position.getFixTime()); params.setBoolean("valid", position.getValid()); params.setDouble("altitude", position.getAltitude()); params.setDouble("latitude", position.getLatitude()); diff --git a/src/org/traccar/database/ObjectConverter.java b/src/org/traccar/database/ObjectConverter.java index 072ab7a7d..bd5b03064 100644 --- a/src/org/traccar/database/ObjectConverter.java +++ b/src/org/traccar/database/ObjectConverter.java @@ -36,7 +36,7 @@ public class ObjectConverter { JsonObjectBuilder object = Json.createObjectBuilder(); //object.add("id", position.getId()); - object.add("time", dateFormat.format(position.getTime())); + object.add("time", dateFormat.format(position.getFixTime())); object.add("valid", position.getValid()); object.add("latitude", position.getLatitude()); object.add("longitude", position.getLongitude()); -- cgit v1.2.3