From 77b9680d22af11684bc8e8d08c65407bd3ebc87e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 15 Nov 2011 08:48:41 +0000 Subject: --- src/org/traccar/Position.java | 13 ++ src/org/traccar/Server.java | 1 + .../traccar/helper/NamedParameterStatement.java | 42 +++-- .../protocol/xexun2/Xexun2ProtocolDecoder.java | 175 +++++++++++++++++++++ 4 files changed, 220 insertions(+), 11 deletions(-) create mode 100644 src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java (limited to 'src') diff --git a/src/org/traccar/Position.java b/src/org/traccar/Position.java index 29451482d..a4e15cede 100644 --- a/src/org/traccar/Position.java +++ b/src/org/traccar/Position.java @@ -139,4 +139,17 @@ public class Position { course = newCourse; } + /** + * Power + */ + private Double power; + + public Double getPower() { + return power; + } + + public void setPower(Double newPower) { + power = newPower; + } + } diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java index 7dd2a5990..b6ad73db1 100644 --- a/src/org/traccar/Server.java +++ b/src/org/traccar/Server.java @@ -186,6 +186,7 @@ public class Server implements DataManager { insertPosition.setDouble("longitude", position.getLongitude()); insertPosition.setDouble("speed", position.getSpeed()); insertPosition.setDouble("course", position.getCourse()); + insertPosition.setDouble("power", position.getPower()); insertPosition.executeUpdate(); } diff --git a/src/org/traccar/helper/NamedParameterStatement.java b/src/org/traccar/helper/NamedParameterStatement.java index 63c31fb04..9464d86a8 100644 --- a/src/org/traccar/helper/NamedParameterStatement.java +++ b/src/org/traccar/helper/NamedParameterStatement.java @@ -5,6 +5,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.sql.Types; import java.util.Map; import java.util.HashMap; @@ -113,35 +114,51 @@ public class NamedParameterStatement { statement.close(); } - public void setInt(String name, int value) throws SQLException { + public void setInt(String name, Integer value) throws SQLException { List indexList = (List) indexMap.get(name); if (indexList != null) for (Object index: indexList) { - statement.setInt((Integer) index, value); + if (value != null) { + statement.setInt((Integer) index, value); + } else { + statement.setNull((Integer) index, Types.INTEGER); + } } } - public void setLong(String name, long value) throws SQLException { + public void setLong(String name, Long value) throws SQLException { List indexList = (List) indexMap.get(name); if (indexList != null) for (Object index: indexList) { - statement.setLong((Integer) index, value); + if (value != null) { + statement.setLong((Integer) index, value); + } else { + statement.setNull((Integer) index, Types.INTEGER); + } } } - public void setBoolean(String name, boolean value) throws SQLException { + public void setBoolean(String name, Boolean value) throws SQLException { List indexList = (List) indexMap.get(name); if (indexList != null) for (Object index: indexList) { - statement.setBoolean((Integer) index, value); + if (value != null) { + statement.setBoolean((Integer) index, value); + } else { + statement.setNull((Integer) index, Types.BOOLEAN); + } } } - public void setDouble(String name, double value) throws SQLException { + public void setDouble(String name, Double value) throws SQLException { List indexList = (List) indexMap.get(name); if (indexList != null) for (Object index: indexList) { - statement.setDouble((Integer) index, value); + if (value != null) { + statement.setDouble((Integer) index, value); + } else { + statement.setNull((Integer) index, Types.DOUBLE); + } } } @@ -149,9 +166,12 @@ public class NamedParameterStatement { List indexList = (List) indexMap.get(name); if (indexList != null) for (Object index: indexList) { - statement.setTimestamp( - (Integer) index, - new Timestamp(value.getTime())); + if (value != null) { + statement.setTimestamp( + (Integer) index, new Timestamp(value.getTime())); + } else { + statement.setNull((Integer) index, Types.TIMESTAMP); + } } } diff --git a/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java new file mode 100644 index 000000000..678d4c283 --- /dev/null +++ b/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java @@ -0,0 +1,175 @@ +/* + * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol.xexun2; + +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.regex.Pattern; +import java.util.regex.Matcher; +import java.text.ParseException; +import java.util.TimeZone; +import java.util.Timer; +import java.util.TimerTask; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; +import org.traccar.Position; +import org.traccar.DataManager; +import org.jboss.netty.channel.ChannelEvent; +import org.jboss.netty.channel.ChannelState; +import org.jboss.netty.channel.ChannelStateEvent; + +/** + * Xexun tracker protocol decoder + */ +public class Xexun2ProtocolDecoder extends OneToOneDecoder { + + /** + * Data manager + */ + private DataManager dataManager; + + /** + * Reset connection delay + */ + private Integer resetDelay; + + /** + * Init device table + */ + public Xexun2ProtocolDecoder(DataManager dataManager, Integer resetDelay) { + this.dataManager = dataManager; + this.resetDelay = resetDelay; + } + + /** + * Regular expressions pattern + */ + static private Pattern pattern = Pattern.compile( + "GPRMC," + + "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS) + "([AV])," + // Validity + "([\\d]{2})([\\d]{2}.[\\d]{4})," + // Latitude (DDMM.MMMM) + "([NS])," + + "([\\d]{3})([\\d]{2}.[\\d]{4})," + // Longitude (DDDMM.MMMM) + "([EW])," + + "([\\d]+.[\\d]+)," + // Speed + "([\\d]+.[\\d]+)?," + // Course + "([\\d]{2})([\\d]{2})([\\d]{2})," + // Date (DDMMYY) + ".*imei:" + + "([\\d]+),"); // IMEI + + /** + * Decode message + */ + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + // Parse message + String sentence = (String) msg; + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + throw new ParseException(null, 0); + } + + // Create new position + Position position = new Position(); + + Integer index = 1; + + // Time + Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++))); + time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MILLISECOND, Integer.valueOf(parser.group(index++))); + + // Validity + position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false); + + // Latitude + Double latitude = Double.valueOf(parser.group(index++)); + latitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("S") == 0) latitude = -latitude; + position.setLatitude(latitude); + + // Longitude + Double lonlitude = Double.valueOf(parser.group(index++)); + lonlitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude; + position.setLongitude(lonlitude); + + // Altitude + position.setAltitude(0.0); + + // Speed + position.setSpeed(Double.valueOf(parser.group(index++))); + + // Course + String course = parser.group(index++); + if (course != null) { + position.setCourse(Double.valueOf(course)); + } else { + position.setCourse(0.0); + } + + // Date + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++))); + position.setTime(time.getTime()); + + // Get device by IMEI + String imei = parser.group(index++); + position.setDeviceId(dataManager.getDeviceByImei(imei).getId()); + + return position; + } + + /** + * Disconnect channel + */ + class DisconnectTask extends TimerTask { + private Channel channel; + + public DisconnectTask(Channel channel) { + this.channel = channel; + } + + public void run() { + channel.disconnect(); + } + } + + /** + * Handle connect event + */ + @Override + public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent evt) throws Exception { + super.handleUpstream(ctx, evt); + + if (evt instanceof ChannelStateEvent) { + ChannelStateEvent event = (ChannelStateEvent) evt; + + if (event.getState() == ChannelState.CONNECTED && event.getValue() != null && resetDelay != 0) { + new Timer().schedule(new DisconnectTask(evt.getChannel()), resetDelay); + } + } + } + +} -- cgit v1.2.3