diff options
author | Anton Tananaev <anton@traccar.org> | 2023-04-22 09:11:06 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2023-04-22 09:11:06 -0700 |
commit | c2637180549e69fc302f91f4685036e2697ae7bf (patch) | |
tree | da7066ae24501623863d86995689736b36a4702b /src/main/java/org/traccar/schedule | |
parent | f92bde2088001c34186eb3897cece90171a319d1 (diff) | |
download | trackermap-server-c2637180549e69fc302f91f4685036e2697ae7bf.tar.gz trackermap-server-c2637180549e69fc302f91f4685036e2697ae7bf.tar.bz2 trackermap-server-c2637180549e69fc302f91f4685036e2697ae7bf.zip |
Fix report scheduling
Diffstat (limited to 'src/main/java/org/traccar/schedule')
-rw-r--r-- | src/main/java/org/traccar/schedule/TaskReports.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/org/traccar/schedule/TaskReports.java b/src/main/java/org/traccar/schedule/TaskReports.java index 004a6078c..176b6d537 100644 --- a/src/main/java/org/traccar/schedule/TaskReports.java +++ b/src/main/java/org/traccar/schedule/TaskReports.java @@ -18,7 +18,7 @@ package org.traccar.schedule; import com.google.inject.Injector; import com.google.inject.servlet.RequestScoper; import com.google.inject.servlet.ServletScopes; -import net.fortuna.ical4j.model.component.VEvent; +import net.fortuna.ical4j.model.Period; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.traccar.model.BaseModel; @@ -77,16 +77,14 @@ public class TaskReports implements ScheduleTask { Calendar calendar = storage.getObject(Calendar.class, new Request( new Columns.All(), new Condition.Equals("id", report.getCalendarId()))); - var lastEvents = calendar.findEvents(lastCheck); - var currentEvents = calendar.findEvents(currentCheck); + var lastEvents = calendar.findPeriods(lastCheck); + var currentEvents = calendar.findPeriods(currentCheck); if (!lastEvents.isEmpty() && currentEvents.isEmpty()) { - VEvent event = lastEvents.iterator().next(); - Date from = event.getStartDate().getDate(); - Date to = event.getEndDate().getDate(); + Period period = lastEvents.iterator().next(); RequestScoper scope = ServletScopes.scopeRequest(Collections.emptyMap()); try (RequestScoper.CloseableScope ignored = scope.open()) { - executeReport(report, from, to); + executeReport(report, period.getStart(), period.getEnd()); } } } |