From 81e7ae399eab4e93113af68de2361cea1b82b58b Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Wed, 10 Jun 2015 17:43:36 -0600 Subject: removing double quotes --- debug.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug.xml') diff --git a/debug.xml b/debug.xml index 8762825ea..7b0cf0724 100644 --- a/debug.xml +++ b/debug.xml @@ -162,7 +162,7 @@ - "SELECT userId, deviceId FROM user_device;" + SELECT userId, deviceId FROM user_device; -- cgit v1.2.3 From 5dc81b6197b9a1387adffdc2628c24ca483d2376 Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Wed, 10 Jun 2015 20:06:30 -0600 Subject: Begin implementing alerts --- debug.xml | 9 +++++ src/org/traccar/AlertHandler.java | 66 +++++++++++++++++++++++++++++++ src/org/traccar/BasePipelineFactory.java | 9 +++++ src/org/traccar/database/DataManager.java | 10 ++++- src/org/traccar/model/Alert.java | 29 ++++++++++++++ 5 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 src/org/traccar/AlertHandler.java create mode 100644 src/org/traccar/model/Alert.java (limited to 'debug.xml') diff --git a/debug.xml b/debug.xml index 7b0cf0724..b54b2e7de 100644 --- a/debug.xml +++ b/debug.xml @@ -24,6 +24,8 @@ true true 50--> + + true true all @@ -202,6 +204,13 @@ UPDATE device SET positionId = :id WHERE id = :deviceId; + + SELECT a.id, a.idTipo, av.idVehicle, a.idGeofence, a.emails, a.velMax, a.tiempoMinpar, a.nombre, a.odometro, av.odometro_inicial + FROM alerta a + INNER JOIN alerta_vehiculo av ON a.id = av.idAlerta + INNER JOIN vehicle v ON av.idVehicle = v.id + WHERE v.idDevice = :deviceId; + diff --git a/src/org/traccar/AlertHandler.java b/src/org/traccar/AlertHandler.java new file mode 100644 index 000000000..bfbcdcd1f --- /dev/null +++ b/src/org/traccar/AlertHandler.java @@ -0,0 +1,66 @@ +/* + * Copyright 2015 alexis. + * + * 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; + +import java.util.Collection; +import java.util.List; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; +import org.traccar.model.Alert; +import org.traccar.model.Device; +import org.traccar.model.Event; +import org.traccar.model.Position; + +/** + * + * @author alexis + */ +public class AlertHandler extends OneToOneDecoder { + + public AlertHandler() { + + } + + private void checkAlerts(Position p, Device d) throws Exception { + Long idDevice = p.getDeviceId(); + Collection alerts = Context.getDataManager().getAlertsByDevice(idDevice); + if (alerts != null && !alerts.isEmpty()) { + //int speed = (int) (p.getSpeed() * 1.852); + for (Alert alerta : alerts) { + + } + } + } + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + if (msg instanceof Position) { + Position position = (Position) msg; + + } else if (msg instanceof List) { + List positions = (List) msg; + for (Position position : positions) { + + } + } + + return msg; + } +} diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index fcb6266ef..1f18ce48e 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -32,6 +32,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { private final TrackerServer server; private FilterHandler filterHandler; + private AlertHandler alertHandler; private Integer resetDelay; private Boolean processInvalidPositions; @@ -93,6 +94,11 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { if (enableFilter != null && Boolean.valueOf(enableFilter)) { filterHandler = new FilterHandler(); } + + String enableAlerts = Context.getProps().getProperty("alert.enable"); + if(enableAlerts != null && Boolean.valueOf(enableAlerts)){ + alertHandler = new AlertHandler(); + } if (Context.getReverseGeocoder() != null) { // Default behavior is to process invalid positions (i.e., the "null" case) @@ -117,6 +123,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { if (filterHandler != null) { pipeline.addLast("filter", filterHandler); } + if (alertHandler != null) { + pipeline.addLast("alert", alertHandler); + } if (Context.getReverseGeocoder() != null) { pipeline.addLast("geocoder", new ReverseGeocoderHandler(Context.getReverseGeocoder(), processInvalidPositions)); } diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 9633ada58..35e9cff95 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -46,6 +46,7 @@ import org.traccar.model.Permission; import org.traccar.model.Position; import org.traccar.model.Server; import org.traccar.model.User; +import org.traccar.model.Alert; import com.mchange.v2.c3p0.ComboPooledDataSource; @@ -322,5 +323,10 @@ public class DataManager { .setObject(server) .executeUpdate(); } - -} + + public Collection getAlertsByDevice(Long deviceId) throws SQLException { + return QueryBuilder.create(dataSource, properties.getProperty("database.getAlertsByDevice")) + .setLong("deviceId", deviceId) + .executeQuery(new Alert()); + } +} \ No newline at end of file diff --git a/src/org/traccar/model/Alert.java b/src/org/traccar/model/Alert.java new file mode 100644 index 000000000..81964eaea --- /dev/null +++ b/src/org/traccar/model/Alert.java @@ -0,0 +1,29 @@ +/* + * Copyright 2015 alexis. + * + * 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.model; + +/** + * + * @author alexis + */ +public class Alert implements Factory { + + @Override + public Alert create() { + return new Alert(); + } + +} -- cgit v1.2.3