Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-07 03:07:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix group commands

Browse Source
This commit is contained in:
Anton Tananaev 2023-04-19 06:29:50 -07:00
parent f982ed08a3
commit ab801e8565
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/traccar/api/resource/CommandResource.java
View File

@ -28,6 +28,7 @@ import org.traccar.model.Command;
import org.traccar.model.Device;
import org.traccar.model.Group;
import org.traccar.model.Position;
import org.traccar.model.QueuedCommand;
import org.traccar.model.Typed;
import org.traccar.model.User;
import org.traccar.model.UserRestrictions;
@ -121,8 +122,9 @@ public class CommandResource extends ExtendedObjectResource<Command> {
permissionsService.checkPermission(Group.class, getUserId(), groupId);
var devices = DeviceUtil.getAccessibleDevices(storage, getUserId(), List.of(), List.of(groupId));
for (Device device : devices) {
entity.setDeviceId(device.getId());
result = result && commandsManager.sendCommand(entity);
Command command = QueuedCommand.fromCommand(entity).toCommand();
command.setDeviceId(device.getId());
result = result && commandsManager.sendCommand(command);
}
} else {
permissionsService.checkPermission(Device.class, getUserId(), entity.getDeviceId());

4
tools/test-commands.py
View File

@ -6,9 +6,9 @@ import binascii
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(("localhost", 5001))
#s.send(binascii.unhexlify('68680f0504035889905831401700df1a00000d0a'))
s.send("imei:123456789012345,tracker,151030080103,,F,000101.000,A,5443.3834,N,02512.9071,E,0.00,0;")
s.send(b"imei:123456789012345,tracker,151030080103,,F,000101.000,A,5443.3834,N,02512.9071,E,0.00,0;")
while True:
print s.recv(1024)
print(s.recv(1024))
s.close()