-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
119 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?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.7"> | ||
|
|
||
| <changeSet author="author" id="changelog-5.7"> | ||
|
|
||
| <addColumn tableName="tc_notifications"> | ||
| <column name="commandid" type="INT" /> | ||
| </addColumn> | ||
|
|
||
| <addForeignKeyConstraint | ||
| baseTableName="tc_notifications" | ||
| baseColumnNames="commandid" | ||
| constraintName="fk_notifications_commandid" | ||
| referencedTableName="tc_commands" | ||
| referencedColumnNames="id" | ||
| onDelete="CASCADE" /> | ||
|
|
||
| </changeSet> | ||
|
|
||
| </databaseChangeLog> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
src/main/java/org/traccar/notificators/NotificatorCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright 2023 Anton Tananaev (anton@traccar.org) | ||
| * | ||
| * 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.notificators; | ||
|
|
||
| import org.traccar.database.CommandsManager; | ||
| import org.traccar.model.Command; | ||
| import org.traccar.model.Event; | ||
| import org.traccar.model.Notification; | ||
| import org.traccar.model.Position; | ||
| import org.traccar.model.User; | ||
| import org.traccar.notification.MessageException; | ||
| import org.traccar.storage.Storage; | ||
| import org.traccar.storage.query.Columns; | ||
| import org.traccar.storage.query.Condition; | ||
| import org.traccar.storage.query.Request; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Singleton; | ||
|
|
||
| @Singleton | ||
| public class NotificatorCommand implements Notificator { | ||
|
|
||
| private final Storage storage; | ||
| private final CommandsManager commandsManager; | ||
|
|
||
| @Inject | ||
| public NotificatorCommand(Storage storage, CommandsManager commandsManager) { | ||
| this.storage = storage; | ||
| this.commandsManager = commandsManager; | ||
| } | ||
|
|
||
| @Override | ||
| public void send(Notification notification, User user, Event event, Position position) throws MessageException { | ||
|
|
||
| if (notification == null || notification.getCommandId() <= 0) { | ||
| throw new MessageException("Saved command not provided"); | ||
| } | ||
|
|
||
| try { | ||
| Command command = storage.getObject(Command.class, new Request( | ||
| new Columns.All(), new Condition.Equals("id", notification.getCommandId()))); | ||
| command.setDeviceId(event.getDeviceId()); | ||
| commandsManager.sendCommand(command); | ||
| } catch (Exception e) { | ||
| throw new MessageException(e); | ||
| } | ||
| } | ||
|
|
||
| } |