community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kernel-4.6.x' into 'kernel-4.6.x'

Browse Source 
Fix location update timestamp overwrite issue

See merge request entgra/carbon-device-mgt!795
This commit is contained in:
Pahansith Gunathilake 2021-08-30 04:02:24 +00:00
commit d829ba8331
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/dao/impl/DeviceDetailsDAOImpl.java
View File

@ -286,7 +286,11 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
stmt.setString(8, deviceLocation.getState());
stmt.setString(9, deviceLocation.getCountry());
stmt.setString(10, GeoHashGenerator.encodeGeohash(deviceLocation));
stmt.setLong(11, System.currentTimeMillis());
if (deviceLocation.getUpdatedTime() == null) {
stmt.setLong(11, System.currentTimeMillis());
} else {
stmt.setLong(11, deviceLocation.getUpdatedTime().getTime());
}
stmt.setInt(12, enrollmentId);
stmt.setDouble(13, deviceLocation.getAltitude());
stmt.setFloat(14, deviceLocation.getSpeed());
@ -417,7 +421,11 @@ public class DeviceDetailsDAOImpl implements DeviceDetailsDAO {
stmt.setDouble(6, deviceLocation.getLongitude());
stmt.setFloat(7, deviceLocation.getSpeed());
stmt.setFloat(8, deviceLocation.getBearing());
stmt.setLong(9, System.currentTimeMillis());
if (deviceLocation.getUpdatedTime() == null) {
stmt.setLong(9, System.currentTimeMillis());
} else {
stmt.setLong(9, deviceLocation.getUpdatedTime().getTime());
}
stmt.setString(10, GeoHashGenerator.encodeGeohash(deviceLocation));
stmt.setString(11, device.getEnrolmentInfo().getOwner());
stmt.setDouble(12, deviceLocation.getAltitude());