diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-13 18:49:01 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-13 18:49:01 -0700 |
commit | 8569e396f7bdafd49a974b35a2e83a57164c6c62 (patch) | |
tree | 139016fc661c0d152bbc077f7c256d35413e5477 /src/main/java/org/traccar/reports/StopsReportProvider.java | |
parent | e894c17cf14addb729a6c51712ef672cc2cd160b (diff) | |
download | trackermap-server-8569e396f7bdafd49a974b35a2e83a57164c6c62.tar.gz trackermap-server-8569e396f7bdafd49a974b35a2e83a57164c6c62.tar.bz2 trackermap-server-8569e396f7bdafd49a974b35a2e83a57164c6c62.zip |
Remove report template path key
Diffstat (limited to 'src/main/java/org/traccar/reports/StopsReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/StopsReportProvider.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/reports/StopsReportProvider.java b/src/main/java/org/traccar/reports/StopsReportProvider.java index 534ab7742..a6a9a94cc 100644 --- a/src/main/java/org/traccar/reports/StopsReportProvider.java +++ b/src/main/java/org/traccar/reports/StopsReportProvider.java @@ -18,6 +18,8 @@ package org.traccar.reports; import org.apache.poi.ss.util.WorkbookUtil; import org.traccar.Context; +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.Group; @@ -28,21 +30,25 @@ import org.traccar.storage.Storage; import org.traccar.storage.StorageException; import javax.inject.Inject; +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.ArrayList; import java.util.Collection; import java.util.Date; public class StopsReportProvider { + private final Config config; private final ReportUtils reportUtils; private final Storage storage; @Inject - public StopsReportProvider(ReportUtils reportUtils, Storage storage) { + public StopsReportProvider(Config config, ReportUtils reportUtils, Storage storage) { + this.config = config; this.reportUtils = reportUtils; this.storage = storage; } @@ -88,9 +94,9 @@ public class StopsReportProvider { deviceStops.setObjects(stops); devicesStops.add(deviceStops); } - String templatePath = Context.getConfig().getString("report.templatesPath", - "templates/export/"); - try (InputStream inputStream = new FileInputStream(templatePath + "/stops.xlsx")) { + + File file = Paths.get(config.getString(Keys.TEMPLATES_ROOT), "export", "stops.xlsx").toFile(); + try (InputStream inputStream = new FileInputStream(file)) { var context = reportUtils.initializeContext(userId); context.putVar("devices", devicesStops); context.putVar("sheetNames", sheetNames); |