diff options
| -rw-r--r-- | default.cfg | 6 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 13 | ||||
| -rw-r--r-- | src/org/traccar/protocol/SuntechProtocolDecoder.java | 114 | ||||
| -rw-r--r-- | test/org/traccar/protocol/SuntechProtocolDecoderTest.java | 46 |
4 files changed, 166 insertions, 13 deletions
diff --git a/default.cfg b/default.cfg index 47c9233c5..70abf19dc 100644 --- a/default.cfg +++ b/default.cfg @@ -106,9 +106,9 @@ <entry key='maxon.enable'>true</entry> <entry key='maxon.port'>5010</entry> - <!-- ST-210 server configuration --> - <entry key='st210.enable'>true</entry> - <entry key='st210.port'>5011</entry> + <!-- Suntech server configuration --> + <entry key='suntech.enable'>true</entry> + <entry key='suntech.port'>5011</entry> <!-- Progress server configuration --> <entry key='progress.enable'>true</entry> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index b5e061aee..4432ad07c 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -19,16 +19,9 @@ import java.io.FileInputStream; import java.io.IOException; import java.nio.ByteOrder; import java.sql.SQLException; -import java.text.DateFormat; -import java.text.FieldPosition; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Properties; -import java.util.logging.FileHandler; -import java.util.logging.Formatter; -import java.util.logging.LogRecord; import org.jboss.netty.bootstrap.ConnectionlessBootstrap; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.buffer.ChannelBuffers; @@ -113,7 +106,7 @@ public class ServerManager { initEnforaServer("enfora"); initMeiligaoServer("meiligao"); initMaxonServer("maxon"); - initST210Server("st210"); + initSuntechServer("suntech"); initProgressServer("progress"); initH02Server("h02"); initJt600Server("jt600"); @@ -359,7 +352,7 @@ public class ServerManager { } } - private void initST210Server(String protocol) throws SQLException { + private void initSuntechServer(String protocol) throws SQLException { if (isProtocolEnabled(properties, protocol)) { serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) { @Override @@ -368,7 +361,7 @@ public class ServerManager { pipeline.addLast("frameDecoder", new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectDecoder", new St210ProtocolDecoder(ServerManager.this)); + pipeline.addLast("objectDecoder", new SuntechProtocolDecoder(ServerManager.this)); } }); } diff --git a/src/org/traccar/protocol/SuntechProtocolDecoder.java b/src/org/traccar/protocol/SuntechProtocolDecoder.java new file mode 100644 index 000000000..bd7b882cd --- /dev/null +++ b/src/org/traccar/protocol/SuntechProtocolDecoder.java @@ -0,0 +1,114 @@ +/* + * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.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; + +import java.util.Calendar; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.BaseProtocolDecoder; +import org.traccar.ServerManager; +import org.traccar.helper.Log; +import org.traccar.model.ExtendedInfoFormatter; +import org.traccar.model.Position; + +public class SuntechProtocolDecoder extends BaseProtocolDecoder { + + public SuntechProtocolDecoder(ServerManager serverManager) { + super(serverManager); + } + + static private Pattern pattern = Pattern.compile( + "S.\\d{3}(?:\\w{3})?;" + // Header + "(?:[^;]+;)?" + + "(\\d{6});" + // Device ID + "(\\d+);" + // Version + "(\\d{4})(\\d{2})(\\d{2});" + // Date (YYYYMMDD) + "(\\d{2}):(\\d{2}):(\\d{2});" + // Time (HH:MM:SS) + "(?:(\\p{XDigit}+);)?" + // Cell + "([-\\+]\\d{2}.\\d+);" + // Latitude + "([-\\+]\\d{3}.\\d+);" + // Longitude + "(\\d{3}.\\d{3});" + // Speed + "(\\d{3}.\\d{2});" + // Course + ".*"); // Full format + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + String sentence = (String) msg; + + // Parse message + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + // Create new position + Position position = new Position(); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("suntech"); + int index = 1; + + // Identifier + String imei = parser.group(index++); + try { + position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + imei); + return null; + } + + // Version + extendedInfo.set("version", parser.group(index++)); + + // Date and Time + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.YEAR, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); + 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++))); + position.setTime(time.getTime()); + + // Cell + extendedInfo.set("cell", parser.group(index++)); + + // Coordinates + position.setLatitude(Double.valueOf(parser.group(index++))); + position.setLongitude(Double.valueOf(parser.group(index++))); + position.setValid(true); // wrong? + + // Speed + position.setSpeed(Double.valueOf(parser.group(index++)) * 0.539957); + + // Course + position.setCourse(Double.valueOf(parser.group(index++))); + + // Altitude + position.setAltitude(0.0); + + // Extended info + position.setExtendedInfo(extendedInfo.toString()); + + return position; + } + +} diff --git a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java new file mode 100644 index 000000000..a5b079fa8 --- /dev/null +++ b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java @@ -0,0 +1,46 @@ +package org.traccar.protocol; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import org.junit.Test; + +public class SuntechProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + SuntechProtocolDecoder decoder = new SuntechProtocolDecoder(null); + decoder.setDataManager(new TestDataManager()); + + assertNull(decoder.decode(null, null, "SA200ALV;317652")); + + assertNotNull(decoder.decode(null, null, + "SA200STT;317652;042;20120718;15:37:12;16d41;-15.618755;-056.083241;000.024;000.00;8;1;41548;12.17;100000;2;1979")); + + assertNotNull(decoder.decode(null, null, + "SA200STT;317652;042;20120721;19:04:30;16d41;-15.618743;-056.083221;000.001;000.00;12;1;41557;12.21;000000;1;3125")); + + assertNotNull(decoder.decode(null, null, + "SA200STT;317652;042;20120722;00:24:23;4f310;-15.618767;-056.083214;000.011;000.00;11;1;41557;12.21;000000;1;3205")); + + assertNotNull(decoder.decode(null, null, + "SA200STT;315198;042;20120808;20:37:34;3fac25;-15.618731;-056.083216;000.007;000.00;12;1;48;0.00;000000;1;0127")); + + assertNotNull(decoder.decode(null, null, + "SA200STT;315198;042;20120809;13:43:34;4f310;-15.618709;-056.083223;000.025;000.00;8;1;49;12.10;100000;2;0231")); + + assertNotNull(decoder.decode(null, null, + "SA200EMG;317652;042;20120718;15:35:41;16d41;-15.618740;-056.083252;000.034;000.00;8;1;41548;12.17;110000;1")); + + assertNotNull(decoder.decode(null, null, + "SA200ALT;317652;042;20120829;14:25:58;16d41;-15.618770;-056.083242;000.029;000.00;0;0;2404240;0.00;000000;10")); + + assertNotNull(decoder.decode(null, null, + "SA200STT;430070;133;20130615;22:22:32;151347;+02.860514;-060.653351;000.003;000.00;12;1;0;12.39;000000;1;0208")); + + assertNotNull(decoder.decode(null, null, + "ST910;Location;344506;017;20130727;14:10:00;-25.398714;-049.296818;000.187;000.00;1;4.32;1;1;0001")); + + } + +} |