Telecominfraproject/wlan-cloud-analytics
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-analytics.git synced 2026-01-27 10:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

https://telecominfraproject.atlassian.net/browse/WIFI-10547

Browse Source 
Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
This commit is contained in:
stephb9959
2022-08-29 10:38:39 -07:00
parent 5db6fc3027
commit 8dcfe04310
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
View File

@@ -120,15 +120,10 @@ namespace OpenWifi {
// sort by timestamp & serial number.
struct {
/* bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
if(lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
if(lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
return lhs.timestamp < rhs.timestamp;
*/
bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
if(lhs.timestamp < rhs.timestamp) return true;
if(lhs.timestamp > rhs.timestamp) return false;
return lhs.device_info.serialNumber < rhs.device_info.serialNumber;
if (lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
if (lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
return lhs.timestamp < rhs.timestamp;
}
} DeviceTimePoint_sort;
@@ -142,8 +137,7 @@ namespace OpenWifi {
struct {
bool operator()(const AnalyticsObjects::UETimePoint &lhs, const AnalyticsObjects::UETimePoint &rhs) const {
if(lhs.station < rhs.station) return true;
return false;
return (lhs.station < rhs.station);
}
} Association_sort;

2
src/storage/storage_timepoints.cpp
View File

@@ -71,7 +71,7 @@ namespace OpenWifi {
} else if (LastDate) {
WhereClause = fmt::format(" boardId='{}' and (timestamp <= {}) ", boardId, LastDate);
}
GetRecords(0,MaxRecords,Recs,WhereClause," order by timestamp ASC ");
GetRecords(0,MaxRecords,Recs,WhereClause," order by timestamp, serialNumber ASC ");
return true;
}