forked from traccar/traccar
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'traccar:master' into master
- Loading branch information
Showing
11 changed files
with
474 additions
and
297 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
524 changes: 256 additions & 268 deletions
524
src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
Large diffs are not rendered by default.
Oops, something went wrong.
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
78 changes: 78 additions & 0 deletions
78
src/main/java/org/traccar/reports/DevicesReportProvider.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,78 @@ | ||
| /* | ||
| * Copyright 2024 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.reports; | ||
|
|
||
| import jakarta.inject.Inject; | ||
| import org.jxls.util.JxlsHelper; | ||
| import org.traccar.config.Config; | ||
| import org.traccar.config.Keys; | ||
| import org.traccar.helper.model.PositionUtil; | ||
| import org.traccar.model.Device; | ||
| import org.traccar.model.Message; | ||
| import org.traccar.model.User; | ||
| import org.traccar.reports.common.ReportUtils; | ||
| import org.traccar.reports.model.DeviceReportItem; | ||
| import org.traccar.storage.Storage; | ||
| import org.traccar.storage.StorageException; | ||
| import org.traccar.storage.query.Columns; | ||
| import org.traccar.storage.query.Condition; | ||
| import org.traccar.storage.query.Request; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileInputStream; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.OutputStream; | ||
| import java.nio.file.Paths; | ||
| import java.util.Collection; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class DevicesReportProvider { | ||
|
|
||
| private final Config config; | ||
| private final ReportUtils reportUtils; | ||
| private final Storage storage; | ||
|
|
||
| @Inject | ||
| public DevicesReportProvider(Config config, ReportUtils reportUtils, Storage storage) { | ||
| this.config = config; | ||
| this.reportUtils = reportUtils; | ||
| this.storage = storage; | ||
| } | ||
|
|
||
| public Collection<DeviceReportItem> getObjects(long userId) throws StorageException { | ||
|
|
||
| var positions = PositionUtil.getLatestPositions(storage, userId).stream() | ||
| .collect(Collectors.toMap(Message::getDeviceId, p -> p)); | ||
|
|
||
| return storage.getObjects(Device.class, new Request( | ||
| new Columns.All(), | ||
| new Condition.Permission(User.class, userId, Device.class))).stream() | ||
| .map(device -> new DeviceReportItem(device, positions.get(device.getId()))) | ||
| .collect(Collectors.toUnmodifiableList()); | ||
| } | ||
|
|
||
| public void getExcel(OutputStream outputStream, long userId) throws StorageException, IOException { | ||
|
|
||
| File file = Paths.get(config.getString(Keys.TEMPLATES_ROOT), "export", "devices.xlsx").toFile(); | ||
| try (InputStream inputStream = new FileInputStream(file)) { | ||
| var context = reportUtils.initializeContext(userId); | ||
| context.putVar("items", getObjects(userId)); | ||
| JxlsHelper.getInstance().setUseFastFormulaProcessor(false) | ||
| .processTemplate(inputStream, outputStream, context); | ||
| } | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
src/main/java/org/traccar/reports/model/DeviceReportItem.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,48 @@ | ||
| /* | ||
| * Copyright 2024 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.reports.model; | ||
|
|
||
| import org.traccar.model.Device; | ||
| import org.traccar.model.Position; | ||
|
|
||
| public class DeviceReportItem { | ||
|
|
||
| public DeviceReportItem(Device device, Position position) { | ||
| this.device = device; | ||
| this.position = position; | ||
| } | ||
|
|
||
| private Device device; | ||
|
|
||
| public Device getDevice() { | ||
| return device; | ||
| } | ||
|
|
||
| public void setDevice(Device device) { | ||
| this.device = device; | ||
| } | ||
|
|
||
| private Position position; | ||
|
|
||
| public Position getPosition() { | ||
| return position; | ||
| } | ||
|
|
||
| public void setPosition(Position position) { | ||
| this.position = position; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.