scottk/wlan-cloud-analytics
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-analytics.git synced 2026-01-17 18:21:23 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Adding array of array for points delivery.

Browse Source
This commit is contained in:
stephb9959
2022-03-23 23:34:24 -07:00
parent 6a8a140b44
commit 7fe38bf226
1 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
View File

@@ -6,6 +6,54 @@
#include "StorageService.h"
namespace OpenWifi {
static auto find_number_of_buckets(std::vector<AnalyticsObjects::DeviceTimePoint> &p) {
uint32_t buckets=0,cur_buckets=0;
std::string current_serialNumber;
for(const auto &i:p) {
if(current_serialNumber.empty()) {
current_serialNumber = i.device_info.serialNumber;
cur_buckets=0;
}
if(current_serialNumber==i.device_info.serialNumber) {
cur_buckets++;
} else {
buckets = std::max(buckets,cur_buckets);
current_serialNumber=i.device_info.serialNumber;
cur_buckets=1;
}
}
return std::max(buckets,cur_buckets);
}
typedef std::vector< std::vector<AnalyticsObjects::DeviceTimePoint>> split_points;
static void split_in_buckets(uint32_t buckets,std::vector<AnalyticsObjects::DeviceTimePoint> &p,split_points &sp) {
std::string cur_sn;
uint32_t cur_bucket=0;
for(const auto &i:p) {
if(cur_sn.empty()) {
cur_bucket=1;
cur_sn=i.device_info.serialNumber;
}
if(cur_sn==i.device_info.serialNumber) {
if (cur_bucket>sp.size()) {
std::vector<AnalyticsObjects::DeviceTimePoint> tmp_p;
tmp_p.push_back(i);
sp.push_back(tmp_p);
cur_bucket++;
} else {
sp[cur_bucket-1].push_back(i);
cur_bucket++;
}
} else {
cur_bucket=1;
sp[cur_bucket-1].push_back(i);
cur_bucket++;
cur_sn=i.device_info.serialNumber;
}
}
}
void RESTAPI_board_timepoint_handler::DoGet() {
auto id = GetBinding("id","");
@@ -36,15 +84,32 @@ namespace OpenWifi {
StorageService()->TimePointsDB().SelectRecords(fromDate, endDate, maxRecords, Points.points);
// sort by timestamp & serial number.
std::sort( Points.points.begin(), Points.points.end());
// your first point's serial number is your separator. So you need to slice the points array
// into timestamp slots
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;
}
} custom_sort;
std::sort( Points.points.begin(), Points.points.end(), custom_sort);
auto BucketsNeeded = find_number_of_buckets(Points.points);
split_points sp;
split_in_buckets(BucketsNeeded,Points.points,sp);
Poco::JSON::Object Answer;
Points.to_json(Answer);
Poco::JSON::Array Outer;
for(const auto &i:sp) {
Poco::JSON::Array InnerArray;
for(const auto &j:i) {
Poco::JSON::Object O;
j.to_json(O);
InnerArray.add(O);
}
Outer.add(InnerArray);
}
Answer.set("points",Outer);
return ReturnObject(Answer);
}
}