eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-15 10:18:45 +00:00
Code Activity

fixed refactoring issue around getLastFix and MultiTimeRange

Browse Source
This commit is contained in:
Axel Uhl
2025-01-09 18:51:22 +01:00
parent c98c3a1756
commit ca0c2cf323
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+5 -2
View File
@@ -456,6 +456,7 @@ import com.sap.sse.common.Bearing;
import com.sap.sse.common.CountryCode;
import com.sap.sse.common.Distance;
import com.sap.sse.common.Duration;
import com.sap.sse.common.MultiTimeRange;
import com.sap.sse.common.NoCorrespondingServiceRegisteredException;
import com.sap.sse.common.PairingListCreationException;
import com.sap.sse.common.RepeatablePart;
@@ -4262,6 +4263,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
remoteAddressByDeviceSerialNumber.put(serialNumber, connection.getSocketChannel().getRemoteAddress());
}
}
final MultiTimeRange infiniteTimeRange = MultiTimeRange.of(TimeRange.create(null, null));
return new ArrayList<>(Util.asList(getSecurityService().mapAndFilterByReadPermissionForCurrentUser(
riotServer.getDevices(),
device->{
@@ -4270,8 +4272,9 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
device,
lastHeartBeatsByDeviceSerialNumber.get(device.getSerialNumber()),
remoteAddressByDeviceSerialNumber.get(device.getSerialNumber()),
getPositionFromMessage(riotServer.getLastFix(device.getSerialNumber(), GpsLatLong.class, timeRanges)),
getBatteryPercentFromMessage(riotServer.getLastFix(device.getSerialNumber(), BatteryLevel.class, timeRanges)));
getPositionFromMessage(riotServer.getLastFix(device.getSerialNumber(), GpsLatLong.class,
infiniteTimeRange)),
getBatteryPercentFromMessage(riotServer.getLastFix(device.getSerialNumber(), BatteryLevel.class, infiniteTimeRange)));
} catch (org.json.simple.parser.ParseException | IOException e) {
throw new RuntimeException(e);
}